From 076a425a64e01b6e24ebde8fb1902fae17ee2797 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 一月 2023 17:25:56 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/dispatch/index.vue | 157 +++++++++++++++++++++++++++-------------------------
1 files changed, 81 insertions(+), 76 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index be6a3a7..65bf571 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -20,21 +20,20 @@
<main>
<div class="mainContent">
<div class="type-nav">
- <div @click="changeTypeChecked(index)" v-for="(item,index) in typeList" :key="item.name"
- :class="[item.checked ? 'is-active':'','type-item']">{{item.name}}</div>
+ <div @click="changeTypeChecked(index)" v-for="(item, index) in typeList" :key="item.name"
+ :class="[item.checked ? 'is-active' : '', 'type-item']">{{ item.name }}</div>
</div>
<!-- 鏁版嵁灞曠ず -->
- <el-table ref="multipleTable"
- :header-cell-style="{
- // background:'#06122c',
- 'font-weight':'650','line-height':'45px'}"
- :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
+ <el-table ref="multipleTable" :header-cell-style="{
+ // background:'#06122c',
+ 'font-weight': '650', 'line-height': '45px'
+ }" :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link>
+ <el-link @click="JumpView(scope.row)">{{ scope.row.code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
@@ -42,33 +41,35 @@
<span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡' }}</span>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'category' :'category'"
- :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'">
+ <el-table-column :prop="mystatus === 1 ? 'category' : 'category'"
+ :label="mystatus === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus === 1 ? '10' : '20'">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
+ <el-table-column :prop="mystatus === 1 ? 'type' : 'site'" :label="mystatus === 1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'"
min-width="10">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'"
- :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
+ <el-table-column :prop="mystatus === 1 ? 'actionCause' : 'communityId'"
+ :label="mystatus === 1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
- :min-width="mystatus===1?'10' :'20' ">
+ <el-table-column :prop="mystatus === 1 ? 'site' : ''" :label="mystatus === 1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'"
+ :min-width="mystatus === 1 ? '10' : '20'">
<template slot-scope="scope">
- <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+
- scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div>
- <div v-else>{{scope.row.site}}</div>
+ <div v-if="mystatus === 2"><span>{{
+ scope.row.buildingLength + '绫�' + '銆�' +
+ scope.row.buildingWidth + '绫�' + '銆�' + scope.row.buildingHigh + '绫�'
+ }}</span></div>
+ <div v-else>{{ scope.row.site }}</div>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'"
- :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
+ <el-table-column :prop="mystatus === 1 ? 'street' : 'buildingArea'"
+ :label="mystatus === 1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="12">
</el-table-column>
- <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1">
+ <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus === 1">
<template slot-scope="scope">
- <span>{{filterTime(scope.row.alarmTime)}}</span>
+ <span>{{ filterTime(scope.row.alarmTime) }}</span>
</template>
</el-table-column>
- <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'"
- :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
+ <el-table-column :prop="mystatus === 1 ? 'continueTime' : 'materials'"
+ :label="mystatus === 1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="12">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
@@ -81,19 +82,19 @@
</el-table-column>
</el-table>
<!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
- :before-close="handleClose">
- <MyDetail :info=info v-if="mystatus===1"></MyDetail>
+ <el-dialog :visible.sync="dialogView" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" :before-close="handleClose">
+ <MyDetail :info=info v-if="mystatus === 1"></MyDetail>
<MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
- <el-dialog :visible.sync="dialogUpload" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
- :before-close="handleClose">
- <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId" :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData"></uploadIll>
+ <el-dialog :visible.sync="dialogUpload" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload" :before-close="handleClose">
+ <uploadVio v-if="mystatus === 1" :imageResourceId="imageResourceId" :caseId="caseId"
+ :mycode="caseCode" :vioData="vioData" @closeDialog="closeDialog"></uploadVio>
+ <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog" :illData="illData">
+ </uploadIll>
</el-dialog>
<!-- tools -->
- <!-- <div class="tools">
+ <div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
@@ -102,7 +103,7 @@
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange" disabled>
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" :disabled="item.disabled">
</el-option>
@@ -114,7 +115,7 @@
:total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
- </div> -->
+ </div>
</div>
</main>
</div>
@@ -131,7 +132,7 @@
export default {
components: {
- uploadVio, uploadIll, MyDetail,MyIllDetail
+ uploadVio, uploadIll, MyDetail, MyIllDetail
},
data() {
return {
@@ -154,14 +155,14 @@
label: '鎵归噺鎿嶄綔',
disabled: true,
},
- {
- value: 1,
- label: '鎵归噺鍚敤',
- },
- {
- value: 2,
- label: '鎵归噺绂佺敤',
- },
+ // {
+ // value: 1,
+ // label: '鎵归噺鍚敤',
+ // },
+ // {
+ // value: 2,
+ // label: '鎵归噺绂佺敤',
+ // },
{
value: 3,
label: '鎵归噺鍒犻櫎',
@@ -202,14 +203,14 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- this.resource = value;
+ this.resource = value;
this.getUserList();
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
this.$axios({
method: 'delete',
- url: 'sccg/violations/batch_delete?ids=' + idArr,
+ url: 'sccg/base_case/batch_case_delete?ids=' + idArr,
}).then(res => {
this.getUserList();
this.$message({
@@ -237,7 +238,7 @@
tableChange(list) {
this.tempList = [];
list.forEach(item => {
- this.tempList.push(item.code);
+ this.tempList.push(item.id);
})
this.all = list.length === this.tableData.length;
},
@@ -268,23 +269,23 @@
this.getUserList();
})
})
- .catch(_ => { });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const params = {
- current: this.currentPage,
- state: this.statusArr[0] ?? null,
- size: this.pageSize,
- resource: this.resource,
- type: this.statusArr[1] ?? null
- }
- basecase.baseCasePoolList(params)
- .then(({ records, total }) => {
- this.tableData = records;
- this.totalNum = total;
- })
- .catch(err => this.$message.error(err))
+ const params = {
+ current: this.currentPage,
+ state: this.statusArr[0] ?? null,
+ size: this.pageSize,
+ resource: this.resource,
+ type: this.statusArr[1] ?? null
+ }
+ basecase.baseCasePoolList(params)
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message.error(err))
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
@@ -333,19 +334,19 @@
async openDialog(data) {
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
- this.vioData = currentSitVo;
- this.illData = currentSitVo;
- this.imageResourceId = filesPictureVo.imageResources[0]?.id;
+ this.vioData = currentSitVo;
+ this.illData = currentSitVo;
+ this.imageResourceId = filesPictureVo.imageResources[0]?.id;
})
.catch(err => this.$message.error(err))
- this.dialogUpload = true;
- this.caseId = data.id;
- this.caseCode = data.code;
+ this.dialogUpload = true;
+ this.caseId = data.id;
+ this.caseCode = data.code;
},
// 鍏抽棴涓婁紶鐣岄潰
closeDialog() {
- this.dialogUpload = false;
- this.getUserList();
+ this.dialogUpload = false;
+ this.getUserList();
},
// 澶勭悊鏃堕棿
filterTime(time) {
@@ -383,7 +384,7 @@
color: #1d3f57;
&::v-deep .el-input__inner {
- // background-color: #09152f;
+ background-color: #fff;
border: 1px solid #17324c;
}
}
@@ -414,7 +415,7 @@
&::v-deep .el-input__inner {
// background-color: #09152f;
- border: 1px solid #17324c;
+ // border: 1px solid #17324c;
}
main {
@@ -445,8 +446,8 @@
.is-active {
// background-color: #070f22;
border-radius: 4px;
- color: #333;
- font-size: 500;
+ color: #333;
+ font-size: 500;
}
}
@@ -455,9 +456,11 @@
justify-content: space-between;
align-items: center;
padding: 0 20px;
- .funs-sp{
+
+ .funs-sp {
border: 1px solid #17324c;
}
+
.funs {
display: flex;
@@ -477,6 +480,7 @@
.el-select {
width: 120px;
}
+
&:hover {
border: 1px solid #4b9bb7;
}
@@ -519,10 +523,11 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
- .el-checkbox{
- display: none;
+
+ .el-checkbox {
+ // display: none;
}
-
+
}
--
Gitblit v1.8.0