Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

.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_API_BASEURL = http://49.232.14.174:2226/api
-# VUE_APP_BASEURL = http://49.232.14.174:2226
+VUE_APP_BASEURL = http://49.232.14.174:2226
 # 
 # 本地端口
 VUE_APP_PORT = 2800

src/components/scTable/index.vue

@@ -26,7 +26,7 @@
             </template>
           </el-table-column>
         </template>
-        <el-table-column min-width="1"></el-table-column>
+        <!-- <el-table-column min-width="1"></el-table-column> -->
 
         <template #empty>
           <el-empty :description="emptyText" :image-size="100"></el-empty>

src/components/xSelect/index.vue

@@ -1,24 +1,33 @@
 <template>
 	<div>
-		<el-input
+		<el-input ref="inputRef0" style="display: none" v-model="inputValue">
-			ref="inputRef0"
-			:value-on-clear="null"
-			style="display: none"
-			v-model="inputValue"
-		>
 		</el-input>
-		<el-input
+		<el-input ref="inputRef" v-model="inputLabel" :readonly="true">
-			:value-on-clear="null"
+			<template #prefix>
-			:readonly="true"
+				<el-button
-			ref="inputRef"
+					text
-			suffix-icon="el-icon-search"
+					size="small"
-			v-model="inputLabel"
+					circle
-		>
+					icon="el-icon-search"
+                    @click="showPopover=true"
+				></el-button>
+			</template>
+
+			<template #suffix>
+				<el-button
+					text
+					size="small"
+					circle
+					icon="el-icon-close"
+					v-show="inputLabel && edit"
+					@click="handleClear"
+				></el-button>
+			</template>
 		</el-input>
 		<div v-if="edit">
 			<el-popover
 				v-model:visible="showPopover"
-				trigger="click"
+				trigger="manual"
 				virtual-triggering
 				:virtual-ref="inputRef"
 				:width="tableWidth"
@@ -102,4 +111,9 @@ const rowClick = (row) => {
 	inputValue.value = row[props.valueField];
 	showPopover.value = false;
 };
+
+const handleClear = () => {
+	inputLabel.value = "";
+	inputValue.value = null;
+};
 </script>

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;

src/views/home/testx.vue

@@ -2,11 +2,7 @@
 	<el-container>
         <el-aside width="200px">
             <el-menu>
-                <el-menu-item index="1" @click="currentM='二维码'">二维码</el-menu-item>
+                <el-menu-item v-for="item in menu" :key="item" :index="item" @click="currentM=item">{{item}}</el-menu-item>
-                <el-menu-item index="2" @click="currentM='带默认的选择'">带默认的选择</el-menu-item>
-                <el-menu-item index="3" @click="currentM='图标选择'">图标选择</el-menu-item>
-                <el-menu-item index="4" @click="currentM='xselect'">xselect</el-menu-item>
-                <el-menu-item index="5" @click="currentM='vue-echarts'">vue-echarts</el-menu-item>
             </el-menu>
         </el-aside>
 		<el-main>
@@ -31,10 +27,17 @@
           <el-table-column label="id" prop="id"></el-table-column>
           <el-table-column label="名称" prop="name"></el-table-column>
         </xSelect>
-                <!-- <el-button @click="showx2"></el-button> -->
+
+        <div>当前选择：{{ x2 }}  {{ x2_name }}</div>
 			</div>
             <div v-if="currentM=='vue-echarts'">
                 <v-chart :option="chartOption" autoresize  style="height: 400px; width: 400px"/>
+            </div>
+            <div v-if="currentM=='用户选择'">
+              <ehsUserSelect :multiple="true" @submit="getMember"/>
+            </div>
+            <div v-if="currentM=='员工选择'">
+              <ehsEpSelect :multiple="true" @submit="getMember"/>
             </div>
 		</el-main>
 	</el-container>
@@ -45,6 +48,15 @@ export default {
 	components: {},
 	data() {
 		return {
+      menu: [
+        '二维码',
+        '带默认的选择',
+        '图标选择',
+        'xselect',
+        'vue-echarts',
+        '用户选择',
+        '员工选择'
+      ],
       currentM: "",
 			apiObj: this.$API.system.dept.list,
 			x: "3607937377546706944",
@@ -103,6 +115,9 @@ export default {
 	},
 	mounted() {},
 	methods: {
+    getMember(data) {
+      console.log(data)
+    },
     showx2(){
             // console.log(this.x2)
         }

src/xui.js

@@ -1,7 +1,7 @@
 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'
+import xSelect from './components/xSelect/index.vue'
 export default {
 	install(app) {
 		app.component('ehsUserSelect', ehsUserSelect);