From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/views/system/work-order/threshold/index.vue | 685 ++++++++++++++------------------------------------------
1 files changed, 179 insertions(+), 506 deletions(-)
diff --git a/src/views/system/work-order/threshold/index.vue b/src/views/system/work-order/threshold/index.vue
index 8754259..345e441 100644
--- a/src/views/system/work-order/threshold/index.vue
+++ b/src/views/system/work-order/threshold/index.vue
@@ -14,8 +14,8 @@
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
- <el-col :span="8">
- <el-card style="margin-bottom: 20px; height: 340px; margin-right: 20px">
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">瑙嗛</div>
<div>
@@ -24,11 +24,15 @@
type="text"
icon="el-icon-edit"
v-hasPermi="['ycl:threshold:edit']"
- @click="a()"
- v-if="!ifEdit"
+ @click="showEdit('video')"
+ v-if="!ifEditVideo"
>淇敼
</el-button>
- <el-button size="mini" type="primary" @click="a()" v-if="ifEdit"
+ <el-button
+ size="mini"
+ type="primary"
+ @click="saveEdit('video')"
+ v-if="ifEditVideo"
>淇濆瓨
</el-button>
</div>
@@ -37,99 +41,70 @@
style="
margin: 20px;
display: flex;
- width: 350px;
+ width: 400px;
justify-content: space-between;
"
>
<div>
- <span style="font-size: small">宸ュ崟闃堝��</span>
+ <div
+ style="
+ font-size: small;
+ display: flex;
+ flex-direction: row-reverse;
+ width: 192px;
+ "
+ >
+ 宸ュ崟闃堝��
+ </div>
<div>
- <el-form label-width="100px">
- <el-form-item label="鍥惧儚璐ㄩ噺">
+ <el-form label-width="140px">
+ <el-form-item
+ v-for="(item, index) in thresholdList.video"
+ :label="item.name + '锛�'"
+ :key="item.id"
+ >
<el-input
- v-model="videoList.imageQuality"
+ v-model="videoList[index].value"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditVideo"
></el-input>
- <span v-else>{{
- thresholdList[0].imageQuality
- }}</span></el-form-item
- >
- <el-form-item label="瑙嗛璐ㄩ噺">
- <el-input
- v-model="videoList.videoQuality"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{
- thresholdList[0].videoQuality
- }}</span></el-form-item
- >
- <el-form-item label="鏍囨敞鍑嗙‘鐜�">
- <el-input
- v-model="videoList.annotationAccuracy"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{
- thresholdList[0].annotationAccuracy
- }}</span></el-form-item
- >
+ <span v-else>{{ item.value }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item>
</el-form>
</div>
</div>
<div>
<span style="font-size: small">涓嬪彂闃堝��</span>
<div>
- <el-form
- ref="form"
- :model="thresholdList[0]"
- label-width="100px"
- >
- <el-form-item label="鍥惧儚璐ㄩ噺">
+ <el-form ref="form">
+ <el-form-item
+ v-for="(item, index) in thresholdList.video"
+ label=""
+ :key="item.id"
+ >
<el-input
- v-model="videoList.imageQualityAuto"
+ v-model="videoList[index].valueAuto"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditVideo"
></el-input>
- <span v-else>{{
- thresholdList[0].imageQualityAuto
- }}</span></el-form-item
- >
- <el-form-item label="瑙嗛璐ㄩ噺">
- <el-input
- v-model="videoList.videoQualityAuto"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{
- thresholdList[0].videoQualityAuto
- }}</span></el-form-item
- >
- <el-form-item label="鏍囨敞鍑嗙‘鐜�">
- <el-input
- v-model="videoList.annotationAccuracyAuto"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{
- thresholdList[0].annotationAccuracyAuto
- }}</span></el-form-item
- >
+ <span v-else>{{ item.valueAuto }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item>
</el-form>
</div>
</div>
</div>
</el-card>
</el-col>
- <el-col :span="8">
- <el-card style="margin-bottom: 20px; height: 340px; margin-right: 20px">
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">浜鸿劯</div>
<div>
@@ -138,11 +113,15 @@
type="text"
icon="el-icon-edit"
v-hasPermi="['ycl:threshold:edit']"
- @click="a()"
- v-if="!ifEdit"
+ @click="showEdit('face')"
+ v-if="!ifEditFace"
>淇敼
</el-button>
- <el-button size="mini" type="primary" @click="a()" v-if="ifEdit"
+ <el-button
+ size="mini"
+ type="primary"
+ @click="saveEdit('face')"
+ v-if="ifEditFace"
>淇濆瓨
</el-button>
</div>
@@ -151,134 +130,62 @@
style="
margin: 20px;
display: flex;
- width: 350px;
+ width: 400px;
justify-content: space-between;
"
>
<div>
- <span style="font-size: small">宸ュ崟闃堝��</span>
+ <div
+ style="
+ font-size: small;
+ display: flex;
+ flex-direction: row-reverse;
+ width: 190px;
+ "
+ >
+ 宸ュ崟闃堝��
+ </div>
<div>
- <el-form label-width="100px">
- <el-form-item label="鎶撴媿閲�">
+ <el-form label-width="140px">
+ <el-form-item
+ v-for="(item, index) in thresholdList.face"
+ :label="item.name + '锛�'"
+ :key="item.id"
+ >
<el-input
- v-model="faceList.captureNum"
+ v-model="faceList[index].value"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditFace"
></el-input>
- <span v-else>{{ thresholdList[1].captureNum }}</span></el-form-item
- >
- <el-form-item label="鍙婃椂鐜�">
- <el-input
- v-model="faceList.timelyRate"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ thresholdList[1].timelyRate }}</span></el-form-item
- >
- <el-form-item label="寤惰繜閲�">
- <el-input
- v-model="faceList.delayAmount"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ thresholdList[1].delayAmount }}</span></el-form-item
- >
- <el-form-item label="璁惧娲昏穬鐜�">
- <el-input
- v-model="faceList.deviceActiveRate"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ thresholdList[1].deviceActiveRate }}</span></el-form-item
- >
- <el-form-item label="鎶撴媿鍙婃椂鐜�">
- <el-input
- v-model="faceList.name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ thresholdList[1].deviceActiveRate }}</span></el-form-item
- >
- <el-form-item label="鏃堕挓鍑嗙‘鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
+ <span v-else>{{ item.value }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item>
</el-form>
</div>
</div>
<div>
<span style="font-size: small">涓嬪彂闃堝��</span>
<div>
- <el-form
- ref="form"
- :model="thresholdList[0]"
- label-width="100px"
- >
- <el-form-item label="鎶撴媿閲�">
- <el-input
- v-model="thresholdList[1].captureNum"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{
- thresholdList[1].captureNum
- }}</span></el-form-item
+ <el-form ref="form">
+ <el-form-item
+ v-for="(item, index) in thresholdList.face"
+ label=""
+ :key="item.id"
>
- <el-form-item label="鍙婃椂鐜�">
<el-input
- v-model="thresholdList[0].name"
+ v-model="faceList[index].valueAuto"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditFace"
></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="寤惰繜閲�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="璁惧娲昏穬鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鎶撴媿鍙婃椂鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鏃堕挓鍑嗙‘鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
+ <span v-else>{{ item.valueAuto }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item
>
</el-form>
</div>
@@ -286,8 +193,8 @@
</div>
</el-card></el-col
>
- <el-col :span="8">
- <el-card style="margin-bottom: 20px; height: 340px; margin-right: 20px">
+ <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
+ <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px">
<div style="display: flex; justify-content: space-between">
<div class="header鈥攖ext">杞﹁締</div>
<div>
@@ -296,11 +203,15 @@
type="text"
icon="el-icon-edit"
v-hasPermi="['ycl:threshold:edit']"
- @click="a()"
- v-if="!ifEdit"
+ @click="showEdit('car')"
+ v-if="!ifEditCar"
>淇敼
</el-button>
- <el-button size="mini" type="primary" @click="a()" v-if="ifEdit"
+ <el-button
+ size="mini"
+ type="primary"
+ @click="saveEdit('car')"
+ v-if="ifEditCar"
>淇濆瓨
</el-button>
</div>
@@ -309,137 +220,62 @@
style="
margin: 20px;
display: flex;
- width: 350px;
+ width: 400px;
justify-content: space-between;
"
>
<div>
- <span style="font-size: small">宸ュ崟闃堝��</span>
+ <div
+ style="
+ font-size: small;
+ display: flex;
+ flex-direction: row-reverse;
+ width: 232px;
+ "
+ >
+ 宸ュ崟闃堝��
+ </div>
<div>
- <el-form
- ref="form"
- :model="thresholdList[0]"
- label-width="120px"
- >
- <el-form-item label="杩囪溅鏁版嵁閲�">
+ <el-form ref="form" label-width="180px">
+ <el-form-item
+ v-for="(item, index) in thresholdList.car"
+ :label="item.name + '锛�'"
+ :key="item.id"
+ >
<el-input
- v-model="thresholdList[0].name"
+ v-model="carList[index].value"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditCar"
></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="杩囪溅缂哄け鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鏈夋晥杩囪溅鏁版嵁閲�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="璁惧娲昏穬鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鎶撴媿鍙婃椂鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鏃堕挓鍑嗙‘鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
+ <span v-else>{{ item.value }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item>
</el-form>
</div>
</div>
<div>
<span style="font-size: small">涓嬪彂闃堝��</span>
<div>
- <el-form
- ref="form"
- :model="thresholdList[0]"
- label-width="120px"
- >
- <el-form-item label="杩囪溅鏁版嵁閲�">
+ <el-form ref="form">
+ <el-form-item
+ v-for="(item, index) in thresholdList.car"
+ label=""
+ :key="item.id"
+ >
<el-input
- v-model="thresholdList[0].name"
+ v-model="carList[index].valueAuto"
size="mini"
style="width: 100px"
- v-if="ifEdit"
+ :type="item.countType=='int'?'number':''"
+ v-if="ifEditCar"
></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="杩囪溅缂哄け鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鏈夋晥杩囪溅鏁版嵁閲�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="璁惧娲昏穬鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鎶撴媿鍙婃椂鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
- <el-form-item label="鏃堕挓鍑嗙‘鐜�">
- <el-input
- v-model="thresholdList[0].name"
- size="mini"
- style="width: 100px"
- v-if="ifEdit"
- ></el-input>
- <span v-else>{{ 10 }}</span></el-form-item
- >
+ <span v-else>{{ item.valueAuto }}</span>
+ <span v-if="item.countType=='percent'">%</span>
+ <span v-if="item.countType=='second'">绉�</span>
+ </el-form-item>
</el-form>
</div>
</div>
@@ -447,203 +283,6 @@
</el-card></el-col
>
</el-row>
-
- <!-- <el-table
- v-loading="loading"
- :data="thresholdList"
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁惧绫诲瀷" align="center" prop="monitorType">
- <template slot-scope="scope">
- <span v-show="scope.row['monitorType'] === 'face'">浜鸿劯</span>
- <span v-show="scope.row['monitorType'] === 'car'">杞﹁締</span>
- <span v-show="scope.row['monitorType'] === 'video'">瑙嗛</span>
- </template>
- </el-table-column>
- <el-table-column label="宸ュ崟闃堝��" align="center">
- <template slot-scope="scope">
- <template v-if="scope.row.monitorType === 'face'">
- <div class="table-row">
- <div class="table-row-item">鎶撴媿閲�</div>
- <div class="table-row-item">{{ scope.row.captureNum }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鍙婃椂鐜�</div>
- <div class="table-row-item">{{ scope.row.timelyRate }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">寤惰繜閲�</div>
- <div class="table-row-item">{{ scope.row.delayAmount }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">璁惧娲昏穬鐜�</div>
- <div class="table-row-item">{{ scope.row.deviceActiveRate }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鎶撴媿鍙婃椂鐜�</div>
- <div class="table-row-item">{{ scope.row.timelyCapture }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏃堕挓鍑嗙‘鐜�</div>
- <div class="table-row-item">{{ scope.row.timeAccuracy }}</div>
- </div>
- </template>
- <template v-else-if="scope.row.monitorType === 'car'">
- <div class="table-row">
- <div class="table-row-item">杩囪溅鏁版嵁閲�</div>
- <div class="table-row-item">{{ scope.row.passCarNum }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">杩囪溅缂哄け鐜�</div>
- <div class="table-row-item">{{ scope.row.passCarMissRate }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏈夋晥杩囪溅鏁版嵁閲�</div>
- <div class="table-row-item">
- {{ scope.row.passCarEffectiveNum }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">璁惧娲昏穬鐜�</div>
- <div class="table-row-item">{{ scope.row.deviceActiveRate }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鎶撴媿鍙婃椂鐜�</div>
- <div class="table-row-item">{{ scope.row.timelyCapture }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏃堕挓鍑嗙‘鐜�</div>
- <div class="table-row-item">{{ scope.row.timeAccuracy }}</div>
- </div>
- </template>
- <template v-else-if="scope.row.monitorType === 'video'">
- <div class="table-row" style="display: flex; flex-direction: row">
- <div class="table-row-item">鍥惧儚璐ㄩ噺</div>
- <div class="table-row-item">{{ scope.row.imageQuality }}</div>
- </div>
- <div class="table-row" style="display: flex; flex-direction: row">
- <div class="table-row-item">瑙嗛璐ㄩ噺</div>
- <div class="table-row-item">{{ scope.row.videoQuality }}</div>
- </div>
- <div class="table-row" style="display: flex; flex-direction: row">
- <div class="table-row-item">鏍囨敞鍑嗙‘鐜�</div>
- <div class="table-row-item">
- {{ scope.row.annotationAccuracy }}
- </div>
- </div>
- </template>
- </template>
- </el-table-column>
- <el-table-column label="涓嬪彂闃堝��" align="center">
- <template slot-scope="scope">
- <template v-if="scope.row.monitorType === 'face'">
- <div class="table-row">
- <div class="table-row-item">鎶撴媿閲�</div>
- <div class="table-row-item">{{ scope.row.captureNumAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鍙婃椂鐜�</div>
- <div class="table-row-item">{{ scope.row.timelyRateAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">寤惰繜閲�</div>
- <div class="table-row-item">{{ scope.row.delayAmountAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">璁惧娲昏穬鐜�</div>
- <div class="table-row-item">
- {{ scope.row.deviceActiveRateAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鎶撴媿鍙婃椂鐜�</div>
- <div class="table-row-item">
- {{ scope.row.timelyCaptureAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏃堕挓鍑嗙‘鐜�</div>
- <div class="table-row-item">{{ scope.row.timeAccuracyAuto }}</div>
- </div>
- </template>
- <template v-else-if="scope.row.monitorType === 'car'">
- <div class="table-row">
- <div class="table-row-item">杩囪溅鏁版嵁閲�</div>
- <div class="table-row-item">{{ scope.row.passCarNumAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">杩囪溅缂哄け鐜�</div>
- <div class="table-row-item">
- {{ scope.row.passCarMissRateAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏈夋晥杩囪溅鏁版嵁閲�</div>
- <div class="table-row-item">
- {{ scope.row.passCarEffectiveNumAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">璁惧娲昏穬鐜�</div>
- <div class="table-row-item">
- {{ scope.row.deviceActiveRateAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鎶撴媿鍙婃椂鐜�</div>
- <div class="table-row-item">
- {{ scope.row.timelyCaptureAuto }}
- </div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏃堕挓鍑嗙‘鐜�</div>
- <div class="table-row-item">{{ scope.row.timeAccuracyAuto }}</div>
- </div>
- </template>
- <template v-else-if="scope.row.monitorType === 'video'">
- <div class="table-row">
- <div class="table-row-item">鍥惧儚璐ㄩ噺</div>
- <div class="table-row-item">{{ scope.row.imageQualityAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">瑙嗛璐ㄩ噺</div>
- <div class="table-row-item">{{ scope.row.videoQualityAuto }}</div>
- </div>
- <div class="table-row">
- <div class="table-row-item">鏍囨敞鍑嗙‘鐜�</div>
- <div class="table-row-item">
- {{ scope.row.annotationAccuracyAuto }}
- </div>
- </div>
- </template>
- </template>
- </el-table-column>
- <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"
- v-hasPermi="['ycl:threshold:edit']"
- @click="updateWho(scope.row)"
- >淇敼
- </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"
- /> -->
<!-- 浜鸿劯闃堝�� -->
<el-dialog
@@ -984,7 +623,7 @@
import {
listThreshold,
getThreshold,
- editVideo,
+ updateThreshold,
} from "@/api/platform/threshold";
import {
editCar,
@@ -999,7 +638,9 @@
name: "Threshold",
data() {
return {
- ifEdit: false,
+ ifEditVideo: false,
+ ifEditFace: false,
+ ifEditCar: false,
indicators: [],
// 閬僵灞�
loading: true,
@@ -1014,9 +655,10 @@
// 鎬绘潯鏁�
total: 0,
// 杩愮淮闃堝�艰〃鏍兼暟鎹�
- thresholdList: [],
+ thresholdList: {},
videoList: [],
faceList: [],
+ carList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -1104,9 +746,38 @@
this.getList();
},
methods: {
- a() {
- this.ifEdit = true;
- console.log(this.ifEdit);
+ showEdit(value) {
+ if (value == "video") {
+ this.videoList = JSON.parse(JSON.stringify(this.thresholdList.video));
+ this.ifEditVideo = true;
+ }
+ if (value == "face") {
+ this.faceList = JSON.parse(JSON.stringify(this.thresholdList.face));
+ this.ifEditFace = true;
+ }
+ if (value == "car") {
+ this.carList = JSON.parse(JSON.stringify(this.thresholdList.car));
+ this.ifEditCar = true;
+ }
+ },
+ saveEdit(value) {
+ let data = []
+ if (value == "video") {
+ data = this.videoList;
+ this.ifEditVideo = false;
+ }
+ if (value == "face") {
+ data = this.faceList;
+ this.ifEditFace = false;
+ }
+ if (value == "car") {
+ data = this.carList;
+ this.ifEditCar = false;
+ }
+ updateThreshold(data).then((response) => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.getList();
+ });
},
showContent(row) {
if (row.monitorType === "car") {
@@ -1161,8 +832,10 @@
getList() {
this.loading = true;
listThreshold(this.queryParams).then((response) => {
- this.thresholdList = response.rows;
- this.videoList = thresholdList[0];
+ this.thresholdList = response.data;
+ this.videoList = JSON.parse(JSON.stringify(this.thresholdList.video));
+ this.faceList = JSON.parse(JSON.stringify(this.thresholdList.face));
+ this.carList = JSON.parse(JSON.stringify(this.thresholdList.car));
this.total = response.total;
this.loading = false;
});
--
Gitblit v1.8.0