From 0e944bfc16136c0a749fc6022e0dfc7f2b4af010 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 15 十月 2024 18:16:17 +0800 Subject: [PATCH] 工单图片样式调整、取消考核页面人脸和车辆的公安部按钮 --- src/views/system/check/result/detail/detail.vue | 3 src/views/system/data-manage/data-detail/list.js | 180 ++++++++++++++++++++++---------------------- src/views/system/work-order/detail/index.vue | 18 ++-- src/views/system/data-manage/equipment/index.vue | 5 src/views/system/check/result/detail/index.vue | 7 + 5 files changed, 108 insertions(+), 105 deletions(-) diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue index 56792d9..cd5733a 100644 --- a/src/views/system/check/result/detail/detail.vue +++ b/src/views/system/check/result/detail/detail.vue @@ -5,7 +5,7 @@ > <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item> <el-menu-item index="1">鍖哄幙鑰冩牳</el-menu-item> - <el-menu-item index="2">鍏畨閮ㄨ�冩牳</el-menu-item> + <el-menu-item index="2" v-if ="examineCategory==1">鍏畨閮ㄨ�冩牳</el-menu-item> </el-menu> </div> <el-container> @@ -335,6 +335,7 @@ if(this.$route.query.deptId){ this.queryParams.deptId = this.$route.query.deptId; } + this.examineCategory = this.$route.query.examineCategory; let examineTag = this.$route.query.examineTag; this.activeIndex = examineTag; this.queryParams.examineTag = examineTag; diff --git a/src/views/system/check/result/detail/index.vue b/src/views/system/check/result/detail/index.vue index 3456ba0..895d76d 100644 --- a/src/views/system/check/result/detail/index.vue +++ b/src/views/system/check/result/detail/index.vue @@ -72,7 +72,7 @@ size="mini" type="text" icon="el-icon-view" - @click="handleDetail(scope.row.id)" + @click="handleDetail(scope.row)" >璇︾粏 </el-button> </div> @@ -246,12 +246,13 @@ handleCurrentChange(val) { console.log(`褰撳墠椤�: ${val}`); }, - handleDetail(id) { + handleDetail(row) { this.$router.push({ path: '/check/detail/detail', query: { - id: id, + id: row.id, examineTag: this.activeIndex, + examineCategory: row.examineCategory, deptId: this.queryParamsList.deptId } }) diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js index 77560a1..74f009e 100644 --- a/src/views/system/data-manage/data-detail/list.js +++ b/src/views/system/data-manage/data-detail/list.js @@ -4799,153 +4799,153 @@ index: 'view_zc_manage', columns: [ { - label: "璁惧缂栫爜", - align: "center", - prop: "serialNumber" + "label": "璁惧缂栫爜", + "align": "center", + "prop": "serialNumber" }, { - label: "璁惧鍚嶇О", - align: "center", - prop: "name" + "label": "璁惧鍚嶇О", + "align": "center", + "prop": "name" }, { - label: "鐩戞帶鐐逛綅绫诲瀷", - align: "center", - prop: "siteType" + "label": "鐩戞帶鐐逛綅绫诲瀷", + "align": "center", + "prop": "siteType" }, { - label: "Mac鍦板潃", - align: "center", - prop: "macAddr" + "label": "Mac鍦板潃", + "align": "center", + "prop": "macAddr" }, { - label: "IPV4/IPV6", - align: "center", - prop: "ip" + "label": "IPV4/IPV6", + "align": "center", + "prop": "ip" }, { - label: "鎽勫儚鏈哄姛鑳界被鍨�", - align: "center", - prop: "cameraFunType" + "label": "鎽勫儚鏈哄姛鑳界被鍨�", + "align": "center", + "prop": "cameraFunType" }, { - label: "缁忓害", - align: "center", - prop: "longitude" + "label": "缁忓害", + "align": "center", + "prop": "longitude" }, { - label: "绾害", - align: "center", - prop: "latitude" + "label": "绾害", + "align": "center", + "prop": "latitude" }, { - label: "鎽勫儚鏈洪噰闆嗗尯鍩�", - align: "center", - prop: "cameraCaptureArea" + "label": "鎽勫儚鏈洪噰闆嗗尯鍩�", + "align": "center", + "prop": "cameraCaptureArea" }, { - label: "璁惧鐘舵��", - align: "center", - prop: "onState" + "label": "璁惧鐘舵��", + "align": "center", + "prop": "onState" }, { - label: "琛屾斂鍖哄煙", - align: "center", - prop: "civilCode" + "label": "琛屾斂鍖哄煙", + "align": "center", + "prop": "civilCode" }, { - label: "鏄惁闆嗘垚璁惧", - align: "center", - prop: "integratedDevice" + "label": "鏄惁闆嗘垚璁惧", + "align": "center", + "prop": "integratedDevice" }, { - label: "鎽勫儚鏈哄搧鐗�", - align: "center", - prop: "cameraBrand" + "label": "鎽勫儚鏈哄搧鐗�", + "align": "center", + "prop": "cameraBrand" }, { - label: "瀹夎鍦板潃", - align: "center", - prop: "address" + "label": "瀹夎鍦板潃", + "align": "center", + "prop": "address" }, { - label: "鑱旂綉灞炴��", - align: "center", - prop: "netWorking" + "label": "鑱旂綉灞炴��", + "align": "center", + "prop": "netWorking" }, { - label: "鎵�灞炶緰鍖哄叕瀹夋満鍏�", - align: "center", - prop: "publicSecurity" + "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�", + "align": "center", + "prop": "publicSecurity" }, { - label: "瀹夎鏃堕棿", - align: "center", - prop: "installedTime" + "label": "瀹夎鏃堕棿", + "align": "center", + "prop": "installedTime" }, { - label: "绠$悊鍗曚綅", - align: "center", - prop: "managementUnit" + "label": "绠$悊鍗曚綅", + "align": "center", + "prop": "managementUnit" }, { - label: "绠$悊鍗曚綅鑱旂郴鏂瑰紡", - align: "center", - prop: "muContactInfo" + "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡", + "align": "center", + "prop": "muContactInfo" }, { - label: "褰曞儚淇濆瓨澶╂暟", - align: "center", - prop: "storageDays" + "label": "褰曞儚淇濆瓨澶╂暟", + "align": "center", + "prop": "storageDays" }, { - label: "鐩戣鏂逛綅", - align: "center", - prop: "monitorAzimuth" + "label": "鐩戣鏂逛綅", + "align": "center", + "prop": "monitorAzimuth" }, { - label: "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL", - align: "center", - prop: "scenePhotoAddr" + "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL", + "align": "center", + "prop": "scenePhotoAddr" }, { - label: "璁惧鍨嬪彿", - align: "center", - prop: "model" + "label": "璁惧鍨嬪彿", + "align": "center", + "prop": "model" }, { - label: "鐐逛綅淇楃О", - align: "center", - prop: "siteVulgo" + "label": "鐐逛綅淇楃О", + "align": "center", + "prop": "siteVulgo" }, { - label: "鎽勫儚鏈虹被鍨�", - align: "center", - prop: "cameraType" + "label": "鎽勫儚鏈虹被鍨�", + "align": "center", + "prop": "cameraType" }, { - label: "琛ュ厜灞炴��", - align: "center", - prop: "cameraLightType" + "label": "琛ュ厜灞炴��", + "align": "center", + "prop": "cameraLightType" }, { - label: "鎽勫儚鏈虹紪鐮佹牸寮�", - align: "center", - prop: "encodedFormat" + "label": "鎽勫儚鏈虹紪鐮佹牸寮�", + "align": "center", + "prop": "encodedFormat" }, { - label: "鎵�灞為儴闂�/琛屼笟", - align: "center", - prop: "cameraDept" + "label": "鎵�灞為儴闂�/琛屼笟", + "align": "center", + "prop": "cameraDept" }, { - label: "琛屼笟缂栫爜", - align: "center", - prop: "hybm" + "label": "琛屼笟缂栫爜", + "align": "center", + "prop": "hybm" }, { - label: "绫诲瀷缂栫爜", - align: "center", - prop: "lxbm" + "label": "绫诲瀷缂栫爜", + "align": "center", + "prop": "lxbm" } ], card: [ diff --git a/src/views/system/data-manage/equipment/index.vue b/src/views/system/data-manage/equipment/index.vue index 019fd03..f2634d2 100644 --- a/src/views/system/data-manage/equipment/index.vue +++ b/src/views/system/data-manage/equipment/index.vue @@ -105,7 +105,7 @@ <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/> <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/> <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/> - <el-table-column label="鍖哄煙" align="center" prop="address" width="180" v-if="columns[1].visible"/> + <el-table-column label="鍖哄煙" align="center" prop="cameraCaptureArea" width="180" v-if="columns[1].visible"/> <el-table-column label="璁惧鐘舵��" align="center" prop="onState" v-if="columns[2].visible"> <template slot-scope="scope"> <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/> @@ -250,7 +250,6 @@ created() { this.getVideoCount(); this.getList(); - this.getDyColumn() }, methods: { getDyColumn() { @@ -269,7 +268,7 @@ /** 鏌ヨ璁惧璧勪骇鍒楄〃 */ getList() { this.loading = true; - this.getDyColumn() + // this.getDyColumn() dataCenter('assetManagement', this.queryParams).then(response => { this.monitorList = response.data; this.total = response.total; diff --git a/src/views/system/work-order/detail/index.vue b/src/views/system/work-order/detail/index.vue index fa52718..71d323d 100644 --- a/src/views/system/work-order/detail/index.vue +++ b/src/views/system/work-order/detail/index.vue @@ -156,12 +156,13 @@ <div class="img-info" v-for="(img, index) in workOrderInfo.imgList" :key="index"> <div> <el-image - style="width: 160px; height: 100px" + style="width: 100%; height: auto" :src="getImgUrl(img.imgUrl)" - :preview-src-list="getImgUrl(img.imgUrl)"> + :preview-src-list="workOrderInfo.imgList.map(i => getImgUrl(i.imgUrl))" + > </el-image> </div> - <div style="margin-top: 8px">{{img.createTime}}</div> + <div style="margin-top: 8px;text-align: center">{{img.createTime}}</div> </div> </div> @@ -288,14 +289,15 @@ <style scoped> .img-info { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - padding: 0 5px; + flex: 0 0 calc(20% - 8px); /* 姣忚浜斾釜锛屾墍浠ユ瘡涓崰20%锛屽噺鍘婚棿璺� */ + box-sizing: border-box; } + .work-order-img { margin-top: 15px; + display: flex; + flex-wrap: wrap; + gap: 8px; /* 鍙�夛細璁剧疆鍥剧墖涔嬮棿鐨勯棿璺� */ } .work-order-info { width: 100%; -- Gitblit v1.8.0