From 758fd83ac2d398f5a7e5aafc5be1934951a586fd Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期五, 25 十一月 2022 15:51:54 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/device/bayonet/index.vue | 3 +
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 | 2
src/views/systemSetting/platform/cockpitManage/index.vue | 31 +++++++++++----
src/views/systemSetting/device/bayonet/create/index.vue | 24 ++++++++----
src/views/operate/disposal/casepool/dispatch/index.vue | 6 +-
8 files changed, 46 insertions(+), 33 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/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 80da3a4..7053110 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -59,7 +59,7 @@
<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>
diff --git a/src/views/systemSetting/device/bayonet/create/index.vue b/src/views/systemSetting/device/bayonet/create/index.vue
index 0f490db..6e144b3 100644
--- a/src/views/systemSetting/device/bayonet/create/index.vue
+++ b/src/views/systemSetting/device/bayonet/create/index.vue
@@ -4,8 +4,8 @@
<!-- 鍗″彛鍚嶇О -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鍗″彛鍚嶇О:" prop="name">
- <el-input v-model="bayonet.name" placeholder="璇峰～鍐欏崱鍙ｅ悕绉�"></el-input>
+ <el-form-item label="鍗″彛鍚嶇О:" prop="bayonetName">
+ <el-input v-model="bayonet.bayonetName" placeholder="璇峰～鍐欏崱鍙ｅ悕绉�"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -25,8 +25,8 @@
<!-- 鎵�灞炲尯鍩� -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鎵�灞炲尯鍩�:" prop="belong_area">
- <el-input v-model="bayonet.belong_area" placeholder="璇峰～鍐欏尯鍩熷悕绉�"></el-input>
+ <el-form-item label="鎵�灞炲尯鍩�:" prop="belongArea">
+ <el-input v-model="bayonet.belongArea" placeholder="璇峰～鍐欏尯鍩熷悕绉�"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -103,10 +103,10 @@
data() {
return {
bayonet: {
- name: '',
+ bayonetName: '',
latitude: '',
longitude: '',
- belong_area: '',
+ belongArea: '',
ipAddress: '',
port: '',
frontEndType: '',
@@ -114,10 +114,10 @@
description: ''
},
rules: {
- name: [{ required: true, trigger: 'blur', message: '璇峰～鍐欏崱鍙ｅ悕绉�' }],
+ bayonetName: [{ required: true, trigger: 'blur', message: '璇峰～鍐欏崱鍙ｅ悕绉�' }],
latitude: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欑含搴︿綅缃�' }],
longitude: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欑粡搴︿綅缃�' }],
- belong_area: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏尯鍩熷悕绉�' }],
+ belongArea: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏尯鍩熷悕绉�' }],
ipAddress: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏煙鍚嶆垨鑰匢P' }],
port: [{ required: true, trigger: ['blur', 'change'], message: '璇疯緭鍏ョ鍙ｅ彿' }],
frontEndType: [{ required: true, trigger: ['blur', 'change'], message: '璇疯緭鍏ュ墠绔被鍨�' }],
@@ -127,11 +127,19 @@
}
},
+ created() {
+ this.bayonet = deepClone(this.originalBayonet);
+ },
+
methods: {
onSubmit() {
this.$refs.device.validate(valid => {
if (valid) {
const copyBayonet = deepClone(this.bayonet);
+ delete copyBayonet.id;
+ copyBayonet.longitude = Number(copyBayonet.longitude);
+ copyBayonet.latitude = Number(copyBayonet.latitude);
+ copyBayonet.inOutCityType = Number(copyBayonet.inOutCityType);
if (!this.isEdit) {
bayonet.addBayonet(this.bayonet)
.then(() => {
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index e9c4a90..6bb7e8b 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -135,6 +135,7 @@
closeDialog() {
this.isShowDialog = false;
+ this.getBayonetListData();
},
handleExport() {
@@ -150,7 +151,7 @@
showDialog(isEdit, data) {
this.isShowDialog = true;
this.isEdit = isEdit;
- this.originalBayonet = data;
+ this.originalBayonet = data.info.row;
}
}
}
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