diff --git a/.env.development b/.env.development index 1eca0332..8ad6dbf4 100644 --- a/.env.development +++ b/.env.development @@ -16,17 +16,17 @@ VUE_APP_PJ = '' # VUE_APP_API_BASEURL = http://127.0.0.1:8887/api #测试环境 - VUE_APP_API_BASEURL = http://10.50.211.228:2250/api +# VUE_APP_API_BASEURL = http://10.50.211.228:2250/api #VUE_APP_API_BASEURL = http://127.0.0.1:2226/api - VUE_APP_BASEURL = http://10.50.211.228:2250/ +# VUE_APP_BASEURL = http://10.50.211.228:2250/ # VUE_APP_BASEURL = http://127.0.0.1:8887 #VUE_APP_BASEURL = http://127.0.0.1:2226 # #光子 -# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api -# VUE_APP_BASEURL = http://49.232.14.174:2226 +VUE_APP_API_BASEURL = http://49.232.14.174:2226/api +VUE_APP_BASEURL = http://49.232.14.174:2226 # # 本地端口 VUE_APP_PORT = 2800 diff --git a/src/components/ehsSelect/xselect.vue b/src/components/ehsSelect/xselect.vue deleted file mode 100644 index ada217b6..00000000 --- a/src/components/ehsSelect/xselect.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/src/ehs.js b/src/ehs.js deleted file mode 100644 index 4ccca94b..00000000 --- a/src/ehs.js +++ /dev/null @@ -1,12 +0,0 @@ -import ehsUserSelect from './components/ehsSelect/userselect' -import ehsEpSelect from './components/ehsSelect/epselect' -import ehsSelect from './components/ehsSelect/select' -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('xSelect', xSelect); - } -} diff --git a/src/main.js b/src/main.js index c4954c90..0badb4e9 100644 --- a/src/main.js +++ b/src/main.js @@ -3,7 +3,7 @@ import ElementPlus from "element-plus"; import "element-plus/dist/index.css"; import "element-plus/theme-chalk/display.css"; import scui from "./scui"; -import ehsui from "./ehs"; +import xui from "./xui"; import i18n from "./locales"; import router from "./router"; import store from "./store"; @@ -29,7 +29,7 @@ app.use(ElementPlus); app.use(Cesium); app.use(i18n); app.use(scui); -app.use(ehsui); +app.use(xui); app.use(preventReClick); app.use(Print); app.use(Xlsx); @@ -40,9 +40,6 @@ app.component('v-chart', ECharts); //挂载app app.mount("#app"); -for (const [key, component] of Object.entries(ElementPlusIconsVue)) { - app.component(key, component); -} const debounce = (fn, delay) => { let timer = null; diff --git a/src/views/home/testx.vue b/src/views/home/testx.vue index 9a0fff9d..eabf0b06 100644 --- a/src/views/home/testx.vue +++ b/src/views/home/testx.vue @@ -2,11 +2,7 @@ - 二维码 - 带默认的选择 - 图标选择 - xselect - vue-echarts + {{item}} @@ -28,13 +24,20 @@ - - - - + + + + + 当前选择:{{ x2 }} {{ x2_name }} + + + + + + @@ -45,7 +48,16 @@ export default { components: {}, data() { return { - currentM: "", + menu: [ + '二维码', + '带默认的选择', + '图标选择', + 'xselect', + 'vue-echarts', + '用户选择', + '员工选择' + ], + currentM: "", apiObj: this.$API.system.dept.list, x: "3607937377546706944", x_name: "光芯科技", @@ -103,7 +115,10 @@ export default { }, mounted() {}, methods: { - showx2(){ + getMember(data) { + console.log(data) + }, + showx2(){ // console.log(this.x2) } },