zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
shijing 2024-10-25 11:15:18 +08:00
parent f53ab995fd 49f6158bf0
commit 13ce3ccc83
6 changed files with 62 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env.development
View File

@ -16,17 +16,17 @@ VUE_APP_PJ = ''
# VUE_APP_API_BASEURL = http://127.0.0.1:8887/api # 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_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:8887
#VUE_APP_BASEURL = http://127.0.0.1:2226 #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 VUE_APP_PORT = 2800

2
src/components/scTable/index.vue
View File

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

42
src/components/ehsSelect/xselect.vue → src/components/xSelect/index.vue
View File

@ -1,24 +1,33 @@
<template> <template>
<div> <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 <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> </el-input>
<div v-if="edit"> <div v-if="edit">
<el-popover <el-popover
v-model:visible="showPopover" v-model:visible="showPopover"
trigger="click" trigger="manual"
virtual-triggering virtual-triggering
:virtual-ref="inputRef" :virtual-ref="inputRef"
:width="tableWidth" :width="tableWidth"
@ -102,4 +111,9 @@ const rowClick = (row) => {
inputValue.value = row[props.valueField]; inputValue.value = row[props.valueField];
showPopover.value = false; showPopover.value = false;
}; };
const handleClear = () => {
inputLabel.value = "";
inputValue.value = null;
};
</script> </script>

7
src/main.js
View File

@ -3,7 +3,7 @@ import ElementPlus from "element-plus";
import "element-plus/dist/index.css"; import "element-plus/dist/index.css";
import "element-plus/theme-chalk/display.css"; import "element-plus/theme-chalk/display.css";
import scui from "./scui"; import scui from "./scui";
import ehsui from "./ehs"; import xui from "./xui";
import i18n from "./locales"; import i18n from "./locales";
import router from "./router"; import router from "./router";
import store from "./store"; import store from "./store";
@ -29,7 +29,7 @@ app.use(ElementPlus);
app.use(Cesium); app.use(Cesium);
app.use(i18n); app.use(i18n);
app.use(scui); app.use(scui);
app.use(ehsui); app.use(xui);
app.use(preventReClick); app.use(preventReClick);
app.use(Print); app.use(Print);
app.use(Xlsx); app.use(Xlsx);
@ -40,9 +40,6 @@ app.component('v-chart', ECharts);
//挂载app //挂载app
app.mount("#app"); app.mount("#app");
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
app.component(key, component);
}
const debounce = (fn, delay) => { const debounce = (fn, delay) => {
let timer = null; let timer = null;

37
src/views/home/testx.vue
View File

@ -2,11 +2,7 @@
<el-container> <el-container>
<el-aside width="200px"> <el-aside width="200px">
<el-menu> <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-menu>
</el-aside> </el-aside>
<el-main> <el-main>
@ -28,13 +24,20 @@
</div> </div>
<div v-if="currentM=='xselect'"> <div v-if="currentM=='xselect'">
<xSelect :apiObj="apiObj" v-model="x2" v-model:label="x2_name" style="width: 200px"> <xSelect :apiObj="apiObj" v-model="x2" v-model:label="x2_name" style="width: 200px">
<el-table-column label="id" prop="id"></el-table-column> <el-table-column label="id" prop="id"></el-table-column>
<el-table-column label="名称" prop="name"></el-table-column> <el-table-column label="名称" prop="name"></el-table-column>
</xSelect> </xSelect>
<!-- <el-button @click="showx2"></el-button> -->
<div>当前选择：{{ x2 }} {{ x2_name }}</div>
</div> </div>
<div v-if="currentM=='vue-echarts'"> <div v-if="currentM=='vue-echarts'">
<v-chart :option="chartOption" autoresize style="height: 400px; width: 400px"/> <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> </div>
</el-main> </el-main>
</el-container> </el-container>
@ -45,7 +48,16 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
currentM: "", menu: [
'二维码',
'带默认的选择',
'图标选择',
'xselect',
'vue-echarts',
'用户选择',
'员工选择'
],
currentM: "",
apiObj: this.$API.system.dept.list, apiObj: this.$API.system.dept.list,
x: "3607937377546706944", x: "3607937377546706944",
x_name: "光芯科技", x_name: "光芯科技",
@ -103,7 +115,10 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
showx2(){ getMember(data) {
console.log(data)
},
showx2(){
// console.log(this.x2) // console.log(this.x2)
} }
}, },

2
src/ehs.js → src/xui.js
View File

@ -1,7 +1,7 @@
import ehsUserSelect from './components/ehsSelect/userselect' import ehsUserSelect from './components/ehsSelect/userselect'
import ehsEpSelect from './components/ehsSelect/epselect' import ehsEpSelect from './components/ehsSelect/epselect'
import ehsSelect from './components/ehsSelect/select' import ehsSelect from './components/ehsSelect/select'
import xSelect from './components/ehsSelect/xselect.vue' import xSelect from './components/xSelect/index.vue'
export default { export default {
install(app) { install(app) {
app.component('ehsUserSelect', ehsUserSelect); app.component('ehsUserSelect', ehsUserSelect);