From f3b8ee4f39640bf2799d81ad0107a6a1e1e1421d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 25 十一月 2022 16:02:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/images/index.vue | 2 +-
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 2 +-
src/components/myUpload/index.vue | 9 ---------
src/views/systemSetting/platform/portalSetting/index.vue | 2 +-
src/views/operate/message/myIndex/index.vue | 5 +++--
src/views/systemSetting/platform/cockpitManage/index.vue | 31 ++++++++++++++++++++++---------
src/views/operate/disposal/casepool/dispatch/index.vue | 6 +++---
7 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index 799794e..95d078f 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -93,15 +93,6 @@
}
},
props: {
- // 杩斿洖涓婁紶鎴愬姛鍥剧墖鍦板潃
- setPictureUrl:{
- type:Function,
- default:()=>{}
- },
- delPictureUrl:{
- type:Function,
- default:()=>{}
- },
pictureList: {
type: Array,
default: () => []
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index d844f2f..0105df6 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -72,7 +72,7 @@
<template slot-scope="scope">
<div class="operation">
<div class="btn">
- <span @click="opernDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
+ <span @click="openDialog(scope.row)">涓婁紶澶勭疆缁撴灉</span>
</div>
</div>
</template>
@@ -319,11 +319,11 @@
this.dialogView = true;
})
},
- async opernDialog(data) {
+ async openDialog(data) {
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
- this.imageResourceId = filesPictureVo.imageResources[0].id;
+ this.imageResourceId = filesPictureVo.imageResources[0]?.id;
})
.catch(err => this.$message.error(err))
this.dialogUpload = true;
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index dbf5693..7564035 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -104,8 +104,8 @@
}
},
created() {
- this.arrive = deepClone(this.arriveData);
if (this.arriveData) {
+ this.arrive = deepClone(this.arriveData);
this.arrive.situationPic = this.arriveData.situationPic.split(',');
}
},
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 75f17e9..8dd2d14 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -40,7 +40,7 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
+ <el-table-column prop="code" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
<template v-if="scope.row.category" slot-scope="scope">
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 5c5e69b..7053110 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -56,10 +56,10 @@
</el-table-column>
<el-table-column prop="createUser" label="鍙戝竷浜哄憳" min-width="15">
</el-table-column>
- <el-table-column prop="messageTypeName" label="娑堟伅鍒嗙被" min-width="10">
+ <el-table-column prop="messageTypeName" label="娑堟伅鏍忕洰" min-width="10">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template slot-scope="scope">
+ <template v-if="scope.row.status" slot-scope="scope">
{{scope.row.status === 0 ? '鏈彂甯�' :'宸插彂甯�'}}
</template>
</el-table-column>
@@ -254,6 +254,7 @@
startTime: this.datetime ? this.datetime[0] : null,
endTime: this.datetime ? this.datetime[1] : null
}
+ debugger
getMessageList(messageParam)
.then(({ records, total }) => {
this.tableData = records;
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index 7217eb3..ce70c66 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -12,7 +12,9 @@
<div class="search-item">
<span>鐘舵��:</span>
<div class="option">
- <el-input v-model="searchStatus" placeholder="閫夋嫨鐘舵��"></el-input>
+ <el-select v-model="searchStatus" placeholder="閫夋嫨鐘舵��">
+ <el-option v-for="{ label, value } in statusOptions" :key="value" :label="label" :value="value"></el-option>
+ </el-select>
</div>
</div>
<div class="findBtn">
@@ -134,7 +136,7 @@
import updateUser from "./updateUser";
import detailUser from "./detailUser";
import { deleteTeam, exportTeamInfo, importTeamInfo, searchTeamInfo } from "@/api/system/portal/teamConstruction";
-import {SUCCESS_CODE} from "@/utils";
+import { SUCCESS_CODE } from "@/utils";
import {downloadFile} from "@/utils/helper";
export default {
@@ -162,6 +164,20 @@
myIdx: 0,
preMyIdx: 0,
file: null,
+ statusOptions: [
+ {
+ value: 2,
+ label: '鍏ㄩ儴'
+ },
+ {
+ value: 1,
+ label: '鍚敤'
+ },
+ {
+ value: 0,
+ label: '绂佺敤'
+ }
+ ],
options: [
{
value: 0,
@@ -221,11 +237,6 @@
this.updateDepartmentData = data;
},
- // 鏌ョ湅
- showViewDialog() {
- this.dialogcheck = true;
- },
-
// 娣诲姞鐣岄潰
showAddDialog() {
this.dialogAdd = true;
@@ -234,7 +245,8 @@
// 瀵煎嚭
exportTable() {
- exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus })
+ const status = this.searchStatus === 2 ? null : this.searchStatus;
+ exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status })
.then(res => {
downloadFile(res);
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
@@ -345,8 +357,9 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getDepartmentList() {
+ const status = this.searchStatus === 2 ? null : this.searchStatus;
const searchInfo = {
- current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus
+ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status
};
searchTeamInfo(searchInfo)
.then(({ records, total }) => {
diff --git a/src/views/systemSetting/platform/portalSetting/index.vue b/src/views/systemSetting/platform/portalSetting/index.vue
index 4157562..dfcaa65 100644
--- a/src/views/systemSetting/platform/portalSetting/index.vue
+++ b/src/views/systemSetting/platform/portalSetting/index.vue
@@ -119,7 +119,7 @@
url: 'sccg/system/portal/logo/add',
data: icon
}).then(res => {
- if (res.code == 200) {
+ if (res.code === 200) {
this.$axios({
method: 'get',
url: 'sccg/system/portal/logo/search',
--
Gitblit v1.8.0