From a82d79851affba166693ba617fdeea43f1848e7f Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 09 十二月 2022 13:52:16 +0800
Subject: [PATCH] 接口参数修改
---
src/views/operate/disposal/casepool/pool/index.vue | 41 ++++----
src/views/operate/disposal/casepool/learn/index.vue | 35 ++++--
src/api/operate/basecase.js | 4
src/views/operate/disposal/casepool/escalation/index.vue | 99 ++++---------------
src/views/operate/disposal/casepool/notDeal/index.vue | 29 +++--
src/views/intelligentPatrol/studyJudge/index.vue | 2
src/views/operate/management/myIndex/index.vue | 2
src/utils/helper.js | 5 +
src/views/operate/disposal/casepool/dispatch/index.vue | 35 ++++--
9 files changed, 119 insertions(+), 133 deletions(-)
diff --git a/src/api/operate/basecase.js b/src/api/operate/basecase.js
index 434534e..9ab9043 100644
--- a/src/api/operate/basecase.js
+++ b/src/api/operate/basecase.js
@@ -1,6 +1,10 @@
import http from "@/http";
export default {
+ baseCasePoolList: (params) => {
+ return http.get('/sccg/base_case/query', params);
+ },
+
baseCaseQuery: (params) => {
return http.get('/sccg/base_case/query_case', params);
},
diff --git a/src/utils/helper.js b/src/utils/helper.js
index d79cabf..939573b 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -135,3 +135,8 @@
{ label: '涓婃姤', value: '01' },
{ label: '澶勭疆', value: '02' }
]
+
+export const RESOURCE_OPTIONS = [
+ { label: '浜哄伐涓婃姤', value: 1 },
+ { label: '瑙嗛宸℃煡', value: 2 }
+]
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 54ec2f1..ccf229d 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="study-judge">
<div class="study-judge-header">
- <span>鎮ㄦ湁{{ countData.register }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.review }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span>
+ <span>鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.register }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span>
</div>
<div class="study-judge-main">
<div class="sjm-header">
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 2984444..093a925 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>
@@ -124,6 +124,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 +183,9 @@
caseId: '',
caseCode: null,
vioData: null,
- illData: null
+ illData: null,
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
}
},
created() {
@@ -195,8 +200,7 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
+ this.resource = value;
this.getUserList();
},
// 鎵归噺鍒犻櫎
@@ -266,14 +270,19 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
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) {
diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue
index 36f0d2a..177901f 100644
--- a/src/views/operate/disposal/casepool/escalation/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/index.vue
@@ -8,12 +8,11 @@
<el-select
v-model="mystatus"
placeholder="杩濊"
- @change="setMystatus"
>
<el-option
- v-for="item in typeList"
+ v-for="item in resourceOptions"
:key="item.label"
- :label="item.name"
+ :label="item.label"
:value="item.value"
>
</el-option>
@@ -23,31 +22,11 @@
<el-button type="primary" @click="getUserList">鏌ヨ</el-button>
</div>
</div>
- <!-- <div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞</el-button>
- <el-dialog :before-close="handleClose" :visible.sync="dialogCreate" title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" width="45%"
- v-if="dialogCreate">
- <createUser @getPageProp=setDialog />
- </el-dialog>
- <el-dialog :before-close="handleClose" :visible.sync="dialogNewAdd"
- :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="60%" v-if="dialogNewAdd">
- <MyIll v-if="newAddType === 1" :mytype=newAddType @changeDialog=changeDialog />
- <myVio v-else :mytype=newAddType @changeDialog=changeDialog />
- </el-dialog>
- </div> -->
+
</div>
</header>
<main>
<div class="mainContent">
- <!-- 瀵艰埅鐘舵�佹爣绛� -->
- <!-- <div class="nav">
- <div @click="changeNavChecked(index)" :class="[item.checked ? 'is-active':'','nav-item']"
- v-for="(item,index) in tagList" :key="item.name">{{item.name}}</div>
- </div>
- <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> -->
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
@@ -90,19 +69,6 @@
</el-table-column>
<el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10">
</el-table-column>
- <!-- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
- <template slot-scope="scope">
- <div class="operation">
- <span @click="handleFind(scope.row)">涓婃姤</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">璋冨害</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍦ㄥ涔�</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鏆備笉澶勭悊</span>
- </div>
- </template>
- </el-table-column>-->
</el-table>
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog
@@ -163,31 +129,17 @@
</div>
</template>
<script>
-import { CATEGOTY, EVENT_SOURCE } from "@/utils/helper";
-// import updateUser from "./updateUser"
+import { RESOURCE_OPTIONS, EVENT_SOURCE } from "@/utils/helper";
import MyDetail from "@/components/detail";
-// import createUser from "./createUser"
-// import MyIll from './createUser/ill'
-// import MyVio from './createUser/vio'
+import basecase from "@/api/operate/basecase";
+
export default {
components: {
MyDetail,
},
data() {
return {
- tableData: [
- // {
- // code:1,
- // eventSource:1,
- // category:1,
- // type:1,
- // actionCause:'妗堢敱1111',
- // site:'浣犲ソ',
- // streetId:1,
- // alarmTime:'2022-21-20',
- // continueTime:'8灏忔椂',
- // }
- ],
+ tableData: [],
context: "",
dialogCreate: false,
dialogView: false,
@@ -262,6 +214,8 @@
],
mystatus: "",
statusArr: [],
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
};
},
created() {
@@ -278,11 +232,6 @@
this.getUserList();
},
methods: {
- setMystatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
- this.getUserList();
- },
setDialog({ flag, type }) {
this.dialogCreate = flag;
this.dialogNewAdd = true;
@@ -339,11 +288,7 @@
list.forEach((item) => {
this.tempList.push(item.code);
});
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false;
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -357,23 +302,27 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
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))
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return "warning-row";
} else {
return "success-row";
}
- return "";
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index a15e0d3..ecabb3f 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/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="杩濊" @change="setMystatus">
+ <el-option v-for="item in resourceList" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -122,6 +122,9 @@
import MyDetail from '@/components/detail'
import MyIllDetail from '@/components/illdetail'
import helper from '@/utils/mydate'
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+import basecase from "@/api/operate/basecase";
+
export default {
components: {
uploadVio, uploadIll, MyDetail, MyIllDetail
@@ -175,6 +178,8 @@
statusArr: [],
mystatus: 1,
caseId: '',
+ resource: null,
+ resourceList: RESOURCE_OPTIONS
}
},
created() {
@@ -189,9 +194,8 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
- this.getUserList();
+ this.resource = value;
+ this.getUserList();
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
@@ -260,14 +264,19 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
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) {
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 51c8459..9267ef7 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -6,7 +6,7 @@
<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-option v-for="item in resourceOptions" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -114,6 +114,9 @@
import MyDetail from '@/components/detail'
import helper from '@/utils/mydate'
import MyIllDetail from '@/components/illdetail'
+import basecase from "@/api/operate/basecase";
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+
export default {
components: {
uploadVio,uploadIll,MyDetail,MyIllDetail
@@ -123,7 +126,6 @@
tableData: [],
context: "",
dialogUpload:false,
- // dialogUpdate: false,
dialogView:false,
info: {},
totalNum: null,
@@ -168,6 +170,8 @@
statusArr:[],
mystatus:1,
caseId:'',
+ resource: null,
+ resourceOptions: RESOURCE_OPTIONS
}
},
created() {
@@ -253,14 +257,19 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
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) {
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index eeffed6..e4f43ae 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/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 clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">
+ <el-option v-for="item in eventSourceOptions" :key="item.label" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -59,7 +59,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'"
@@ -152,6 +152,9 @@
import MyVio from './createUser/vio'
import MyDispatch from '@/components/dispatch'
import helper from '@/utils/mydate'
+import { RESOURCE_OPTIONS } from "@/utils/helper";
+import basecase from "@/api/operate/basecase";
+
export default {
components: {
createUser, MyIll, MyVio, MyDetail, MyDispatch, MyIllDetail
@@ -231,10 +234,11 @@
checked: false,
},
],
+ eventSourceOptions: RESOURCE_OPTIONS,
mystatus: 1,
statusArr: [],
- baseId: 0
-
+ baseId: 0,
+ resource: null
}
},
created() {
@@ -255,11 +259,6 @@
handleDispatch(data) {
this.baseId = data.id;
this.dialogDispatch = true;
- },
- // 椤堕儴涓嬫媺妗�
- setMyStatus(value) {
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
},
// 閫夋嫨杩濊杩濆缓
setDialog({ flag, type }) {
@@ -327,17 +326,19 @@
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
- const { currentPage, pageSize, 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;
- })
- .catch(err => {
- this.tableData = [];
+ 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))
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index a2c15c5..151e216 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -253,7 +253,7 @@
const { currentPage, pageSize, instatus, myproblem } = this;
this.$axios({
method: 'get',
- url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&resource=2&type=${myproblem}`
+ url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&type=${myproblem}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
--
Gitblit v1.8.0