From e1ac04b42be89ca26ff5f94c17c4e2eebe52a0a2 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 03 一月 2023 09:52:39 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/operate/disposal/casepool/dispatch/index.vue | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index c3dec03..be6a3a7 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -5,8 +5,8 @@
<div class="search">
<span>绛涢�夋潯浠�:</span>
<div class="option">
- <el-select v-model="mystatus" placeholder="杩濊" @change="setMystatus">
- <el-option v-for="item in typeList" :key="item.label" :label="item.name"
+ <el-select v-model="resource" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in resourceOptions" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -25,7 +25,9 @@
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
- :header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
+ :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">
@@ -37,7 +39,7 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
<template slot-scope="scope">
- <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span>
+ <span>{{ scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛宸℃煡' }}</span>
</template>
</el-table-column>
<el-table-column :prop="mystatus === 1 ? 'category' :'category'"
@@ -79,19 +81,19 @@
</el-table-column>
</el-table>
<!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ <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" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
+ <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>
@@ -112,7 +114,7 @@
:total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
- </div>
+ </div> -->
</div>
</main>
</div>
@@ -124,6 +126,9 @@
import MyIllDetail from '@/components/illdetail'
import casequery from "@/api/operate/basecase";
import helper from '@/utils/mydate'
+import basecase from "@/api/operate/basecase";
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+
export default {
components: {
uploadVio, uploadIll, MyDetail,MyIllDetail
@@ -180,7 +185,9 @@
caseId: '',
caseCode: null,
vioData: null,
- illData: null
+ illData: null,
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
}
},
created() {
@@ -195,8 +202,7 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
+ this.resource = value;
this.getUserList();
},
// 鎵归噺鍒犻櫎
@@ -262,18 +268,23 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const { currentPage, pageSize, context, statusArr } = this;
- this.$axios({
- method: 'get',
- url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
- }).then(res => {
- this.totalNum = res.data.total;
- this.tableData = res.data.records;
- })
+ 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) {
@@ -323,6 +334,7 @@
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
+ this.illData = currentSitVo;
this.imageResourceId = filesPictureVo.imageResources[0]?.id;
})
.catch(err => this.$message.error(err))
@@ -349,7 +361,7 @@
color: #4b9bb7;
header {
- background-color: #09152f;
+ // background-color: #09152f;
.headerContent {
padding: 0 40px;
@@ -371,7 +383,7 @@
color: #1d3f57;
&::v-deep .el-input__inner {
- background-color: #09152f;
+ // background-color: #09152f;
border: 1px solid #17324c;
}
}
@@ -401,12 +413,12 @@
}
&::v-deep .el-input__inner {
- background-color: #09152f;
+ // background-color: #09152f;
border: 1px solid #17324c;
}
main {
- background-color: #09152f;
+ // background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
@@ -431,9 +443,10 @@
}
.is-active {
- background-color: #070f22;
+ // background-color: #070f22;
border-radius: 4px;
- color: #fff;
+ color: #333;
+ font-size: 500;
}
}
@@ -486,7 +499,7 @@
&::v-deep li,
&::v-deep .btn-prev,
&::v-deep .btn-next {
- background-color: #071f39;
+ // background-color: #071f39;
color: #4b9bb7;
}
@@ -499,13 +512,17 @@
}
.el-table {
- color: #4b9bb7;
- font-size: 10px;
+ // color: #4b9bb7;
+ // font-size: 10px;
&::v-deep .cell {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
+ .el-checkbox{
+ display: none;
+ }
+
}
--
Gitblit v1.8.0