From ff976e18177e246bab800e814db4e0e166967bca Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sun, 12 May 2024 17:06:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 +- .../dialogCompnnents/member-count-list.vue | 7 ++- .../dialogCompnnents/safe-hidden.vue | 54 +++++++++++++------ 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/.env.development b/.env.development index 35105fa..f0d54df 100644 --- a/.env.development +++ b/.env.development @@ -3,10 +3,9 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -# VITE_API_URL = 'http://192.168.34.221:9111' -# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 -VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程 VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 +# VITE_API_URL = 'http://jxj.zhgdyun.com:61212' #杰哥远程 # VITE_API_URL = 'http://192.168.34.155:19111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' diff --git a/src/views/commandScreen/dialogCompnnents/member-count-list.vue b/src/views/commandScreen/dialogCompnnents/member-count-list.vue index edded0b..32f6845 100644 --- a/src/views/commandScreen/dialogCompnnents/member-count-list.vue +++ b/src/views/commandScreen/dialogCompnnents/member-count-list.vue @@ -124,6 +124,7 @@
序号
+
危大工程名称
旁站记录
图片
记录人
@@ -132,6 +133,7 @@
{{index + 1}}
+
{{item.engineeringName}}
{{item.buildSituation}}
{ // if(activeName.value === 'first') console.log('1') // if(activeName.value === 'second') console.log('2') // if(activeName.value === 'third') console.log('3') + if(tab.index == activeIndex.value) return; activeIndex.value = tab.index partyMemberList.value = []; getMemberCountList('search') @@ -488,7 +491,7 @@ onMounted(async () => { margin-top: 2%; div { text-align: center; - width: 20%; + width: 17%; } } .listBox { @@ -521,7 +524,7 @@ onMounted(async () => { } } div { - width: 20%; + width: 17%; white-space: nowrap; //单行 overflow: hidden; text-overflow: ellipsis; diff --git a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue index 239997e..0a1dd90 100644 --- a/src/views/commandScreen/dialogCompnnents/safe-hidden.vue +++ b/src/views/commandScreen/dialogCompnnents/safe-hidden.vue @@ -44,6 +44,7 @@ v-model="searchForm.status" :clearable="true" style="width: 150px" + @change="conditionSearch" > @@ -57,8 +58,9 @@ v-model="searchForm.level" :clearable="true" style="width: 150px" + @change="conditionSearch" > - +
@@ -67,11 +69,12 @@ class="m-2" placeholder="请选择" size="small" - v-model="searchForm.inspectId" + v-model="searchForm.inspectManId" :clearable="true" style="width: 150px" + @change="conditionSearch" > - +
@@ -83,8 +86,9 @@ v-model="searchForm.changeId" :clearable="true" style="width: 150px" + @change="conditionSearch" > - +
@@ -96,6 +100,7 @@ v-model="searchForm.enterpriseId" :clearable="true" style="width: 150px" + @change="conditionSearch" > @@ -118,14 +123,22 @@
{{index + 1}}
-
{{statusList[item.status].name}}
+
{{item.status?textFilter(item.status):''}}
{{item.level?levelListData[item.level - 1].name:''}}
{{item.regionName}}
-
{{item.dangerItemContent}}
-
{{item.changeLimitTime}}
+
+ + {{item.dangerItemContent}} + +
+
+ + {{item.changeLimitTime}} + +
{{item.inspectManName}}
{{item.inspectTime}}
-
{{item.changeId}}
+
{{item.changeName}}
{{item.enterpriseName}}
@@ -149,18 +162,18 @@ const BASEURL = import.meta.env.VITE_API_URL; const inspectList = ref([] as any); const enterpriseListData = ref([] as any); const levelListData = ref([ - { name: "重大隐患", value: 1 }, - { name: "较大隐患", value: 2 }, - { name: "一般隐患", value: 3 }, - { name: "低隐患", value: 4 } + { name: "一级", value: 1 }, + { name: "二级", value: 2 }, + { name: "三级", value: 3 }, + { name: "四级", value: 4 } ]) const statusList = ref([ - { name: "无需整改", value: 1 }, + // { name: "无需整改", value: 1 }, { name: "待整改", value: 2 }, { name: "待复查", value: 3 }, { name: "待核验", value: 4 }, { name: "合格", value: 5 }, - { name: "不合格", value: 6 }, + // { name: "不合格", value: 6 }, { name: "超期未关闭", value: 7 }, ]); let pageNo = ref(1 as any); @@ -168,13 +181,24 @@ let moreScroll = ref(true as any); const refScrollbar = ref(null as any); // 绑定到滚动的盒子上 const searchForm = ref({ status: '', - inspectId: '', + inspectManId: '', changeId: '', enterpriseId: '', level: '' }); const topDangerList = ref([] as any) const partyMemberList = ref({} as any); +// 文本处理 +const textFilter = (val:any) => { + let findItem:any = statusList.value.find(item => { + return item.value == val; + }) + return findItem.name +} +// 条件查询 +const conditionSearch = async () => { + getMemberCountList('search') +} // 获取整改人、检查人 const getSystemUserFn = async () => { let data = {