diff --git a/package.json b/package.json
index 1a17ce14..204bc5ef 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
"dagre": "^0.8.5",
"dagre-d3": "^0.6.4",
"dhtmlx-gantt": "^8.0.6",
- "echarts": "5.4.1",
+ "echarts": "^5.5.1",
"element-plus": "^2.7.4",
"file-saver": "^2.0.5",
"html2canvas": "^1.4.1",
@@ -42,6 +42,7 @@
"three": "^0.155.0",
"tinymce": "6.3.2",
"vue": "3.2.47",
+ "vue-echarts": "^7.0.3",
"vue-i18n": "9.2.2",
"vue-router": "4.1.6",
"vuedraggable": "4.0.3",
diff --git a/src/components/ehsSelect/xselect.vue b/src/components/ehsSelect/xselect.vue
new file mode 100644
index 00000000..ada217b6
--- /dev/null
+++ b/src/components/ehsSelect/xselect.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
diff --git a/src/ehs.js b/src/ehs.js
index 601e3ef8..4ccca94b 100644
--- a/src/ehs.js
+++ b/src/ehs.js
@@ -1,12 +1,12 @@
import ehsUserSelect from './components/ehsSelect/userselect'
import ehsEpSelect from './components/ehsSelect/epselect'
import ehsSelect from './components/ehsSelect/select'
-import ehsTableSelect from './components/ehsSelect/tableSelect'
+import xSelect from './components/ehsSelect/xselect.vue'
export default {
install(app) {
app.component('ehsUserSelect', ehsUserSelect);
app.component('ehsEpSelect', ehsEpSelect);
app.component('ehsSelect', ehsSelect);
- app.component('ehsTableSelect', ehsTableSelect);
+ app.component('xSelect', xSelect);
}
}
diff --git a/src/main.js b/src/main.js
index 04e3c147..c4954c90 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,9 @@ import htmlToPdf from "./utils/htmlToPdf";
import * as Cesium from "cesium";
+import "echarts";
+import ECharts from 'vue-echarts';
+
const app = createApp(App);
app.use(store);
@@ -33,6 +36,7 @@ app.use(Xlsx);
app.use(htmlToPdf);
app.use(jsBarCode);
app.use(DataVVue3);
+app.component('v-chart', ECharts);
//挂载app
app.mount("#app");
diff --git a/src/views/home/testx.vue b/src/views/home/testx.vue
index 2efb0ea9..9a0fff9d 100644
--- a/src/views/home/testx.vue
+++ b/src/views/home/testx.vue
@@ -1,38 +1,111 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 二维码
+ 带默认的选择
+ 图标选择
+ xselect
+ vue-echarts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+};
+