From 8dc5f14cb31b82de76e7d5be262d1a9c5e6e994e Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 24 八月 2024 18:44:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/system/contract/score/index.vue | 4 src/views/system/data-manage/data-detail/list.js | 53 ++++++++++ src/views/system/data-manage/data-detail/index.vue | 105 ++++++++++++-------- src/views/screen/newPage/index.vue | 4 src/api/platform/resource-security.js | 28 +++++ src/views/system/check/result/index.vue | 2 src/views/screen/components/screen-examine/components/video-chart.vue | 61 +----------- src/views/system/report/index.vue | 11 + src/views/system/work-order/index.vue | 19 +-- 9 files changed, 164 insertions(+), 123 deletions(-) diff --git a/src/api/platform/resource-security.js b/src/api/platform/resource-security.js new file mode 100644 index 0000000..65a6d99 --- /dev/null +++ b/src/api/platform/resource-security.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 鏌ヨplatform鍒楄〃 +export function listSecurity(query) { + return request({ + url: '/platform/resourceSecurity/list', + method: 'get', + params: query + }) +} + +// 鏌ヨplatform璇︾粏 +export function getSecurity(id) { + return request({ + url: '/platform/resourceSecurity/' + id, + method: 'get' + }) +} + +// 淇敼platform +export function updateSecurity(data) { + return request({ + url: '/platform/resourceSecurity', + method: 'put', + data: data + }) +} + diff --git a/src/views/screen/components/screen-examine/components/video-chart.vue b/src/views/screen/components/screen-examine/components/video-chart.vue index 1e44dc7..2e6a938 100644 --- a/src/views/screen/components/screen-examine/components/video-chart.vue +++ b/src/views/screen/components/screen-examine/components/video-chart.vue @@ -55,7 +55,7 @@ // "keyCommandImageOnline": 96.41, //鏈堣繍琛岀巼 // "operatingRate": 96.07 //閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜� this.dataList = []; - + let item = { value: 0, name: "", id: 0, routerUrl: "" } item.value = this.videoList.platformOnline item.name = "骞冲彴鍦ㄧ嚎鐜�" @@ -141,69 +141,18 @@ this.dataList.push(item11) let item12 = { value: 0, name: "", id: 0, routerUrl: "" } - item12.value = this.videoList.keyCommandImageInspection - item12.name = "閲嶇偣鎸囨尌鍥惧儚宸℃缁撴灉" + item12.value = this.videoList.keyCommandImageOnline + item12.name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�" item12.id = 13 item12.routerUrl = "" this.dataList.push(item12) let item13 = { value: 0, name: "", id: 0, routerUrl: "" } - item13.value = this.videoList.keyCommandImageDirectoryTree - item13.name = "閲嶇偣鎸囨尌鍥惧儚鐩綍鏍�" + item13.value = this.videoList.imageResourceSecurity + item13.name = "鍥惧儚璧勬簮瀹夊叏绠$悊" item13.id = 14 item13.routerUrl = "" this.dataList.push(item13) - - let item14 = { value: 0, name: "", id: 0, routerUrl: "" } - item14.value = this.videoList.onlineInspectionPlatform - item14.name = "骞冲彴閮ㄧ讲鍙婅繍琛岀巼" - item14.id = 15 - item14.routerUrl = "" - this.dataList.push(item14) - - let item15 = { value: 0, name: "", id: 0, routerUrl: "" } - item15.value = this.videoList.videoTransmissionAssetsAccuracy - item15.name = "璧勪骇鍑嗙‘鐜�" - item15.id = 16 - item15.routerUrl = "" - this.dataList.push(item15) - - let item16 = { value: 0, name: "", id: 0, routerUrl: "" } - item16.value = this.videoList.videoTransmissionAssetsWeakPasswordScore - item16.name = "璧勪骇寮卞彛浠ゅ緱鍒嗘瘮鐜�" - item16.id = 17 - item16.routerUrl = "" - this.dataList.push(item16) - - let item17 = { value: 0, name: "", id: 0, routerUrl: "" } - item17.value = this.videoList.videoTransmissionDangerousAssetsScore - item17.name = "鍗遍櫓璧勪骇寰楀垎姣旈噸" - item17.id = 18 - item17.routerUrl = "" - this.dataList.push(item17) - - let item18 = { value: 0, name: "", id: 0, routerUrl: "" } - item18.value = this.videoList.videoTransmissionBoundaryIntegrityDetection - item18.name = "杈圭晫瀹屾暣鎬ф娴嬫墸鍒嗛」" - item18.id = 19 - item18.routerUrl = "" - this.dataList.push(item18) - - let item19 = { value: 0, name: "", id: 0, routerUrl: "" } - item19.value = this.videoList.keyCommandImageOnline - item19.name = "鏈堣繍琛岀巼" - item19.id = 20 - item19.routerUrl = "" - this.dataList.push(item19) - - let item20 = { value: 0, name: "", id: 0, routerUrl: "" } - item20.value = this.videoList.operatingRate - item20.name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�" - item20.id = 21 - item20.routerUrl = "" - this.dataList.push(item20) - - }, } }; diff --git a/src/views/screen/newPage/index.vue b/src/views/screen/newPage/index.vue index e05723c..298f604 100644 --- a/src/views/screen/newPage/index.vue +++ b/src/views/screen/newPage/index.vue @@ -86,9 +86,8 @@ overflow: hidden; overflow-x: auto; margin-top: -9px; - height: 90%; "> - <div style="width: 750px"> + <div style="width: 780px"> <CarChart class="wrapper-item" :carList="carList"></CarChart> </div> </div> @@ -100,7 +99,6 @@ <div style=" overflow: auto; margin-top: -9px; - height: 90%; "> <div style="width: 1100px"> <VideoChart class="wrapper-item" :videoList="videoList"></VideoChart> diff --git a/src/views/system/check/result/index.vue b/src/views/system/check/result/index.vue index b052177..451a168 100644 --- a/src/views/system/check/result/index.vue +++ b/src/views/system/check/result/index.vue @@ -204,7 +204,7 @@ }, yAxis: { - min: 60 + min: 0 }, series: [ { diff --git a/src/views/system/contract/score/index.vue b/src/views/system/contract/score/index.vue index 399a0bb..2ef8338 100644 --- a/src/views/system/contract/score/index.vue +++ b/src/views/system/contract/score/index.vue @@ -28,10 +28,6 @@ v-hasPermi="['platform:score:add']">鏂板</el-button> </el-col> <el-col :span="1.5"> - <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['platform:score:edit']">淇敼</el-button> - </el-col> - <el-col :span="1.5"> <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['platform:score:remove']">鍒犻櫎</el-button> </el-col> diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue index 60e3395..7db03b7 100644 --- a/src/views/system/data-manage/data-detail/index.vue +++ b/src/views/system/data-manage/data-detail/index.vue @@ -1,6 +1,6 @@ <template> <div class="app-container"> - <el-card class="box-card"> + <el-card class="box-card" v-show="index !== 'image_resource_security'"> <el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between"> <div v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px" :key="card.label"> <div> @@ -22,73 +22,80 @@ </el-row> </el-card> - <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> - <el-form-item label="鍗″彛缂栧彿" prop="bayonetNumber"> - <el-input v-model="queryParams.bayonetNumber" placeholder="璇疯緭鍏ュ崱鍙g紪鍙�" clearable - @keyup.enter.native="handleQuery" /> - </el-form-item> - <el-form-item label="鍗″彛鍚嶇О" prop="bayonetName"> - <el-input v-model="queryParams.bayonetName" placeholder="璇疯緭鍏ュ崱鍙e悕绉�" clearable @keyup.enter.native="handleQuery" /> - </el-form-item> - <el-form-item> - <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button> - <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button> - </el-form-item> - </el-form> + <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">--> + <!-- <el-form-item label="鍗″彛缂栧彿" prop="bayonetNumber">--> + <!-- <el-input v-model="queryParams.bayonetNumber" placeholder="璇疯緭鍏ュ崱鍙g紪鍙�" clearable--> + <!-- @keyup.enter.native="handleQuery" />--> + <!-- </el-form-item>--> + <!-- <el-form-item label="鍗″彛鍚嶇О" prop="bayonetName">--> + <!-- <el-input v-model="queryParams.bayonetName" placeholder="璇疯緭鍏ュ崱鍙e悕绉�" clearable @keyup.enter.native="handleQuery" />--> + <!-- </el-form-item>--> + <!-- <el-form-item>--> + <!-- <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>--> + <!-- <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>--> + <!-- </el-form-item>--> + <!-- </el-form>--> - <el-row :gutter="10" class="mb8"> - <el-col :span="1.5"> - <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['platform:platform:add']">鏂板</el-button> - </el-col> - <el-col :span="1.5"> - <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['platform:platform:edit']">淇敼</el-button> - </el-col> - <el-col :span="1.5"> - <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['platform:platform:remove']">鍒犻櫎</el-button> - </el-col> + <el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'"> + <!-- <el-col :span="1.5">--> + <!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"--> + <!-- v-hasPermi="['platform:platform:add']">鏂板</el-button>--> + <!-- </el-col>--> + <!-- <el-col :span="1.5">--> + <!-- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"--> + <!-- v-hasPermi="['platform:platform:edit']">淇敼</el-button>--> + <!-- </el-col>--> + <!-- <el-col :span="1.5">--> + <!-- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"--> + <!-- v-hasPermi="['platform:platform:remove']">鍒犻櫎</el-button>--> + <!-- </el-col>--> + <!-- <el-col :span="1.5">--> + <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"--> + <!-- v-hasPermi="['platform:platform:export']">瀵煎嚭</el-button>--> + <!-- </el-col>--> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['platform:platform:export']">瀵煎嚭</el-button> + v-hasPermi="['platform:platform:export']">瀵煎叆 + </el-button> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="platformList" @selection-change="handleSelectionChange"> - <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" /> + <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index"/> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['platform:platform:edit']">淇敼</el-button> + v-hasPermi="['platform:platform:edit']">淇敼 + </el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" - v-hasPermi="['platform:platform:remove']">鍒犻櫎</el-button> + v-hasPermi="['platform:platform:remove']">鍒犻櫎 + </el-button> </template> </el-table-column> </el-table> <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getList" /> + @pagination="getList"/> <!-- 娣诲姞鎴栦慨鏀瑰崱鍙h繃杞︽暟鎹竴鑷存�у璇濇 --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="鍗″彛鍚嶇О" prop="bayonetName"> - <el-input v-model="form.bayonetName" placeholder="璇疯緭鍏ュ崱鍙e悕绉�" /> + <el-input v-model="form.bayonetName" placeholder="璇疯緭鍏ュ崱鍙e悕绉�"/> </el-form-item> <el-form-item label="鍗″彛缂栧彿" prop="bayonetNumber"> - <el-input v-model="form.bayonetNumber" placeholder="璇疯緭鍏ュ崱鍙g紪鍙�" /> + <el-input v-model="form.bayonetNumber" placeholder="璇疯緭鍏ュ崱鍙g紪鍙�"/> </el-form-item> <el-form-item label="杩囪溅鏁版嵁閲�" prop="vehicleDataNumber"> - <el-input v-model="form.vehicleDataNumber" placeholder="璇疯緭鍏ヨ繃杞︽暟鎹噺" /> + <el-input v-model="form.vehicleDataNumber" placeholder="璇疯緭鍏ヨ繃杞︽暟鎹噺"/> </el-form-item> <el-form-item label="涓嶅敮涓�鏁版嵁 " prop="notUniqueData"> - <el-input v-model="form.notUniqueData" placeholder="璇疯緭鍏ヤ笉鍞竴鏁版嵁 " /> + <el-input v-model="form.notUniqueData" placeholder="璇疯緭鍏ヤ笉鍞竴鏁版嵁 "/> </el-form-item> <el-form-item label="涓嶅敮涓�鏁版嵁閲�" prop="notUniqueDataNumber"> - <el-input v-model="form.notUniqueDataNumber" placeholder="璇疯緭鍏ヤ笉鍞竴鏁版嵁閲�" /> + <el-input v-model="form.notUniqueDataNumber" placeholder="璇疯緭鍏ヤ笉鍞竴鏁版嵁閲�"/> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -100,8 +107,8 @@ </template> <script> -import { dataCenter } from "@/api/platform/data-center"; -import { videoData, carData, faceData, equipment } from "./list"; +import {dataCenter} from "@/api/platform/data-center"; +import {videoData, carData, faceData, equipment} from "./list"; import store from '@/store'; export default { @@ -143,14 +150,15 @@ // 琛ㄥ崟鏍¢獙 rules: { bayonetName: [ - { required: true, message: "鍗″彛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" } + {required: true, message: "鍗″彛鍚嶇О涓嶈兘涓虹┖", trigger: "blur"} ], bayonetNumber: [ - { required: true, message: "鍗″彛缂栧彿涓嶈兘涓虹┖", trigger: "blur" } + {required: true, message: "鍗″彛缂栧彿涓嶈兘涓虹┖", trigger: "blur"} ], }, tableHead: [], - cardList: [] + cardList: [], + index: null }; }, beforeRouteEnter(to, from, next) { @@ -158,11 +166,12 @@ next(); }, created() { + this.index = this.$route.query.index; if (this.$route.query.type === '1') { let data = videoData.table.filter(item => item.index === this.$route.query.index)[0] this.tableHead = data.columns; this.cardList = data.card; - }; + } if (this.$route.query.type === '2') { let data = carData.table.filter(item => item.index === this.$route.query.index)[0] this.tableHead = data.columns; @@ -179,8 +188,15 @@ this.cardList = data.card; } this.getList(); + if (this.index === 'image_resource_security') { + this.getSecurityCard() + } }, methods: { + /** 鏌ヨ鍥惧儚璧勬簮瀹夊叏褰撴湀閰嶇疆淇℃伅 */ + getSecurityCard() { + + }, /** 鏌ヨ鍗″彛杩囪溅鏁版嵁涓�鑷存�у垪琛� */ getList() { let url = this.$route.query.url; @@ -272,7 +288,8 @@ }).then(() => { this.getList(); this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => { }); + }).catch(() => { + }); }, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js index bcf2ac9..ebc023f 100644 --- a/src/views/system/data-manage/data-detail/list.js +++ b/src/views/system/data-manage/data-detail/list.js @@ -1968,7 +1968,58 @@ ] } ] - } + }, + { + title: "瑙嗛鍥惧儚璧勬簮瀹夊叏绠$悊", + index: 'image_resource_security', + columns: [ + { + label: "ip", + align: "center", + prop: "ip" + }, + { + label: "閮ㄩ棬", + align: "center", + prop: "deptName" + }, + { + label: "鎶ヨ绫诲瀷", + align: "center", + prop: "alarmCategory" + }, + { + label: "鎶ヨ绾у埆", + align: "center", + prop: "alarmLevel" + }, + { + label: "娆℃暟", + align: "center", + prop: "num" + }, + { + label: "鎶ヨ鏃堕棿", + align: "center", + prop: "alarmTime" + }, + ], + card: [ + { + icon: 'el-icon-truck', + dataList: [ + { + value: 1999, + label: '杩囪溅鏁版嵁鎬婚噺' + }, + { + value: 1999, + label: '涓嶅敮涓�鏁版嵁閲�' + }, + ] + } + ] + }, ] }; diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue index 23cd7f8..3e386a8 100644 --- a/src/views/system/report/index.vue +++ b/src/views/system/report/index.vue @@ -412,6 +412,7 @@ }, // 琛ㄥ崟閲嶇疆 reset() { + this.daterangeCreateTime = []; this.form = { id: null, unitId: null, @@ -423,9 +424,9 @@ reportContent: null, reportMaterials: null, deleted: null, - errorType: null + errorType: null, }; - this.resetForm("form"); + // this.resetForm("form"); }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { @@ -450,14 +451,14 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - this.addOrImport = 'add' + this.addOrImport = 'add'; this.open = true; this.title = "娣诲姞鎶ュ"; }, /** 瀵煎叆鎸夐挳鎿嶄綔 */ handleImport() { this.reset(); - this.addOrImport = 'import' + this.addOrImport = 'import'; this.open = true; this.title = "瀵煎叆鎶ュ"; }, @@ -473,6 +474,7 @@ this.daterangeCreateTime = [response.data.beginCreateTime, response.data.endCreateTime] this.form = response.data; this.form.errorType = this.form.errorType.split(','); + this.addOrImport = 'add'; this.open = true; this.title = "淇敼鎶ュ"; }); @@ -500,6 +502,7 @@ }, /** 鎻愪氦鎸夐挳 */ submitForm() { + this.form.pointId = this.form.pointId ? this.form.pointId : this.form.serialNumber; this.$refs["form"].validate(valid => { if (valid) { this.form.beginCreateTime = this.daterangeCreateTime[0] diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index d2b73ee..e2eab08 100644 --- a/src/views/system/work-order/index.vue +++ b/src/views/system/work-order/index.vue @@ -12,9 +12,7 @@ </el-form-item> <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList"> <el-select v-model="queryParams.errorTypeList" multiple placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery"> - <el-option v-for="dict in dict.type.error_type" - :value="dict.value" - :label="dict.label"/> + <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" /> </el-select> </el-form-item> <el-form-item label="宸ュ崟鐘舵��" prop="status"> @@ -44,7 +42,7 @@ </el-col> </el-row> - <el-row v-if="workOrderList && workOrderList.length > 0" :gutter="20" v-loading="loading"> + <el-row :gutter="20" v-loading="loading"> <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id"> <div class="my-col"> <div style="padding-left: 10px; padding-top: 8px"> @@ -130,7 +128,7 @@ </el-col> </el-row> - <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty> + <el-empty v-if="empty" description="鏆傛棤鏁版嵁"></el-empty> <pagination v-show="total>0" @@ -240,9 +238,7 @@ > <el-form-item label="鏁呴殰绫诲瀷" prop="errorType"> <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="鏁呴殰绫诲瀷"> - <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" - :key="index" - ></el-option> + <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" /> </el-select> </el-form-item> <el-form-item label="瀹℃牳璇存槑" prop="auditingRemark"> @@ -381,7 +377,6 @@ getYwAuditingList } from '@/api/platform/work-order' import { addReport } from '@/api/platform/report' -import { getDicts } from '@/api/system/dict/data' export default { name: 'Work-order', @@ -389,8 +384,8 @@ components: {}, data() { return { + empty: false, openShowCurrent: null, - errorTypeOptions: [], ywConditions: [], batchAuditingVisible: false, batchAuditingWorkOrder: { @@ -653,6 +648,7 @@ }, /** 鏌ヨ杩愮淮宸ュ崟鍒楄〃 */ getList() { + this.empty = false; this.loading = true this.queryParams.params = {} this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null @@ -669,6 +665,9 @@ this.workOrderList = response.data this.total = response.total this.loading = false + if (this.total === 0) { + this.empty = true + } }) }, // 鍙栨秷鎸夐挳 -- Gitblit v1.8.0