From 8dec2d9d155d46e7dbba49a350f6b561ab4a4f4a Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 15:31:55 +0800
Subject: [PATCH] 上传处置修改
---
src/views/intelligentPatrol/studyJudge/index.vue | 160 ++++++++++++-------------------
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 3
src/views/operate/management/message/index.vue | 58 +++++------
src/views/operate/management/message/checkSms/index.vue | 33 ++---
4 files changed, 102 insertions(+), 152 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 29b44c5..63dc317 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>鎮ㄦ湁1111鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫0鏉�,鍐嶅涔爗{ currentEvent.review }}鏉�</span>
+ <span>鎮ㄦ湁{{ eventList.length }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫0鏉�,鍐嶅涔爗{ countData.review }}鏉�</span>
</div>
<div class="study-judge-main">
<div class="sjm-header">
@@ -16,20 +16,10 @@
</div>
<div class="sjm-content">
<div class="sjm-content-left">
- <div class="img-item">
+ <div class="img-item" v-for="(item, index) in imageList" :key="item.id">
<span>鎶ヨ鍥剧墖</span>
- <img :src="currentEvent.picData">
- <span>鎶ヨ鏃堕棿锛�2022-09-08 14:23:34</span>
- </div>
- <div class="img-item">
- <img
- src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__67d4d15bfc501319f8377f2ce37bf441.svg"
- alt="">
- </div>
- <div class="img-item">
- <img
- src="https://axure-file.lanhuapp.com/90466432-c999-4bf0-80b8-ee3f96a2099e__67d4d15bfc501319f8377f2ce37bf441.svg"
- alt="">
+ <img :src="item">
+ <span v-if="index === 0">鎶ヨ鏃堕棿锛歿{ currentEvent.alarmTime }}</span>
</div>
</div>
<div class="sjm-content-center">
@@ -62,25 +52,22 @@
<el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="闂绫诲瀷:" prop="type">
- <el-input v-model="currentEvent.type" placeholder="璇烽�夋嫨闂绫诲瀷"></el-input>
+ <el-form-item label="澶х被鍚嶇О:" prop="categoryId">
+ <el-input v-model="currentEvent.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О"></el-input>
</el-form-item>
- <el-form-item label="澶х被鍚嶇О:" prop="bigKind">
- <el-input v-model="currentEvent.bigKind" placeholder="璇烽�夋嫨澶х被鍚嶇О"></el-input>
- </el-form-item>
- <el-form-item label="灏忕被鍚嶇О:" prop="smallKind">
- <el-input v-model="currentEvent.smallKind" placeholder="璇烽�夋嫨灏忕被鍚嶇О"></el-input>
+ <el-form-item label="灏忕被鍚嶇О:" prop="typeId">
+ <el-input v-model="currentEvent.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О"></el-input>
</el-form-item>
<el-form-item label="杞︾墝鍙�:" prop="carNumber">
<el-input v-model="currentEvent.carNumber" placeholder="璇峰～鍐欒溅鐗屽彿鐮�"></el-input>
</el-form-item>
- <el-form-item label="澶囨敞:">
- <el-input type="textarea" :rows="5" v-model="currentEvent.tip"></el-input>
+ <el-form-item label="澶囨敞:" prop="description">
+ <el-input type="textarea" :rows="5" v-model="currentEvent.description"></el-input>
</el-form-item>
<el-form-item>
- <el-button>涓婁竴鏉�</el-button>
+ <el-button @click="pageChange('prev')">涓婁竴鏉�</el-button>
<el-button @click.native.prevent="handleConfirm">纭</el-button>
- <el-button>涓嬩竴鏉�</el-button>
+ <el-button @click="pageChange('next')">涓嬩竴鏉�</el-button>
</el-form-item>
</el-form>
</div>
@@ -96,72 +83,20 @@
export default {
created() {
- basecase.getInspectionData({ current: 1 })
- .then(({ records }) => {
- this.eventList = records;
- this.currentEvent = this.eventList[0];
- if (this.currentEvent.picData) {
- this.currentEvent.picData = `${FILE_ORIGINAL_URL}${this.currentEvent.picData}`;
- }
- })
- .catch(err => this.$message.error(err))
-
+ this.getInspectionData();
basecase.getInspectionCountData()
.then(res => {
- this.currentEvent.review = res.review;
+ this.countData = res;
})
.catch(err => this.$message.error(err))
},
data() {
- const validateAdvice = (rule,value,callback)=>{
- if(value){
- callback()
- }else{
- callback(new Error('澶勭悊鎰忚涓嶈兘涓虹┖'))
- }
- }
- const validateType = (rule,value,callback)=>{
- if(value){
- callback()
- }else{
- callback(new Error('闂绫诲瀷涓嶈兘涓虹┖'))
- }
- }
- const validateBigKind = (rule,value,callback)=>{
- console.log(value)
- if(value){
- callback()
- }else{
- callback(new Error('澶х被鍚嶇О涓嶈兘涓虹┖'))
- }
- }
- const validateSmallKind = (rule,value,callback)=>{
- if(value){
- callback()
- }else{
- callback(new Error('灏忕被鍚嶇О涓嶈兘涓虹┖'))
- }
- }
- const validateCarNumber = (rule,value,callback)=>{
- if(value){
- callback()
- }else{
- callback(new Error('杞︾墝鍙蜂笉鑳戒负绌�'))
- }
- }
return {
eventList: [],
- currentEvent: {
- code: null,
- grade: null,
- picData: null,
- street: null,
- urlAddress: null,
- name: null,
- latitude: null,
- longitude: null,
+ countData: {
review: 0
},
+ currentEvent: {},
adviceList: [
{
id: 1,
@@ -183,42 +118,70 @@
rules:{
advice:[
{
- trigger:'blur',validator:validateAdvice
+ required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
},
],
- type:[
+ categoryId:[
{
- trigger:'blur',validator:validateType
+ required: true, trigger:['blur', 'change'], message: '澶х被鍚嶇О涓嶈兘涓虹┖'
}
],
- bigKind:[
+ typeId:[
{
- trigger:'blur',validator:validateBigKind
- }
- ],
- smallKind:[
- {
- trigger:'blur',validator:validateSmallKind
+ required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
}
],
carNumber:[
{
- trigger:'blur',validator:validateCarNumber
+ required: true, trigger:['blur', 'change'], message: '杞︾墝鍙蜂笉鑳戒负绌�'
}
]
- }
+ },
+ imageList: [],
+ currentPage: 1
}
},
methods:{
+ pageChange(type) {
+ if (this.eventList.length === this.currentPage) {
+ this.$message.warning('褰撳墠宸叉槸鏈�鍚庝竴椤�');
+ return;
+ }
+ if (type === 'next') {
+ this.currentPage += 1;
+ } else {
+ this.currentPage -= 1;
+ }
+ this.currentEvent = this.eventList[this.currentPage - 1];
+ },
+
+ getInspectionData() {
+ basecase.getInspectionData({ current: this.currentPage })
+ .then(({ records }) => {
+ this.eventList = records;
+ this.eventList.forEach(item => {
+ if (item.picData) {
+ const imageUrls = item.picData.split(',');
+ this.imageList = imageUrls.map(url => `${FILE_ORIGINAL_URL}${url}`);
+ }
+ })
+ this.currentEvent = this.eventList[this.currentPage - 1];
+ })
+ .catch(err => this.$message.error(err))
+ },
+
// 纭鐐瑰嚮浜嬩欢
handleConfirm(){
- console.log(this.$refs.currentEvent)
this.$refs.currentEvent.validate((flag)=>{
- console.log(flag)
if(flag){
-
- }else{
- return false
+ basecase.confirmInspection(this.currentEvent)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getInspectionData();
+ })
+ .catch(err => this.$message.error(err))
+ } else {
+ this.$message.warning('璇锋鏌ュ繀濉」')
}
})
}
@@ -297,7 +260,6 @@
.el-form {
::v-deep .el-form-item {
- // margin-bottom: 10px;
}
::v-deep .el-form-item__label {
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
index fe069fd..c37e09c 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -45,11 +45,12 @@
const { partyInfo } = evidenceData;
const arrivalSituationId = arriveData.id;
const investigationId = evidenceData.id;
- const partyInfoId = partyInfo.id;
+ const partyInfoId = this.evidenceData ? partyInfo.id : null;
const evidencePic = evidenceData.pic.join(',');
const situationPic = arriveData.situationPic.join(',');
delete evidenceData.id;
delete evidenceData.partyInfo;
+ delete evidenceData.userInfo;
delete evidenceData.pic;
delete arriveData.situationPic;
delete arriveData.id;
diff --git a/src/views/operate/management/message/checkSms/index.vue b/src/views/operate/management/message/checkSms/index.vue
index a296de8..188c115 100644
--- a/src/views/operate/management/message/checkSms/index.vue
+++ b/src/views/operate/management/message/checkSms/index.vue
@@ -4,17 +4,17 @@
<el-form :model="sms" label-position="right" ref="viewForm" :rules="Rules" label-width="100px">
<div class="data-item">
<el-form-item label="ID:">
- <span class="data-detail">{{sms.messageId}}</span>
+ <span class="data-detail">{{ sms.messageId }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鐭俊鏍囬:">
- <span class="data-detail">{{sms.title}}</span>
+ <span class="data-detail">{{ sms.title }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鐭俊鍐呭:">
- <span class="data-detail">{{sms.body}}</span>
+ <span class="data-detail">{{ sms.body }}</span>
</el-form-item>
</div>
<!-- 瀹℃牳鎰忚 -->
@@ -56,11 +56,7 @@
}
},
created() {
- const {sms} = this;
- console.log(this.messageData);
- console.log(this.messageData.info);
- this.sms = this.messageData.info.row;
-
+ this.sms = this.messageData;
},
methods: {
changeComponent(index) {
@@ -68,18 +64,17 @@
},
// 鎻愪氦瀹℃牳鎰忚
handleSubmit(index) {
- const { sms } = this;
this.$refs.viewForm.validate((valid) => {
if (valid) {
this.$axios({
method: 'post',
url: 'sccg/message_audit/checkSms',
data: {
- id:sms.id,
- messageId: sms.messageId,
- status:index,
- auditOpinion:sms.auditOpinion,
- result:index === 0 ? '涓嶅悓鎰�':'鍚屾剰'
+ id: this.sms.id,
+ messageId: this.sms.messageId,
+ status: index,
+ auditOpinion: this.sms.auditOpinion,
+ result: index === 0 ? '涓嶅悓鎰�':'鍚屾剰'
}
})
.then(res => {
@@ -89,13 +84,13 @@
message: '瀹℃牳鎴愬姛'
})
this.$emit('closeDialog', { flag: false, index: 1 });
-
+ } else {
+ this.$message.error(res.message);
}
-
})
- .catch(err => { console.log(err) });
- }else{
- return false;
+ .catch(err => { this.$message.error(err) });
+ } else {
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
})
},
diff --git a/src/views/operate/management/message/index.vue b/src/views/operate/management/message/index.vue
index df8baf6..9325b12 100644
--- a/src/views/operate/management/message/index.vue
+++ b/src/views/operate/management/message/index.vue
@@ -9,13 +9,13 @@
</div>
<div class="status">
<span>鐭俊鐘舵��:</span>
- <el-radio-group v-model="status">
+ <el-radio-group v-model="status" @input="getMessageAuditList">
<el-radio :label="0">寰呭鏍�</el-radio>
<el-radio :label="1">宸插鏍�</el-radio>
</el-radio-group>
</div>
<div class="btns">
- <el-button type="primary" icon="el-icon-search" @click="handleSearch"
+ <el-button type="primary" icon="el-icon-search" @click="getMessageAuditList"
>鏌ヨ</el-button
>
<el-button icon="el-icon-delete-solid" @click="handleReset"
@@ -68,12 +68,12 @@
:visible.sync="dialogCheckSms"
width="80%"
title="娑堟伅璇︽儏"
- v-if="dialogCheckSms"
:before-close="handleClose"
>
<MyCheckSms
- :messageData="messageData"
- @closeDialog="closeDialog"
+ v-if="dialogCheckSms"
+ :messageData="messageData"
+ @closeDialog="closeDialog"
></MyCheckSms>
</el-dialog>
</div>
@@ -156,39 +156,33 @@
};
},
created() {
- const { setTableData } = this;
- this.setTableData();
+ this.getMessageAuditList()
},
methods: {
- handleSearch() {
- this.setTableData();
- },
// 閲嶇疆
- handleReset() {},
- // 璁剧疆琛ㄦ牸鏁版嵁
- async setTableData() {
- const arr = await this.getMessageAuditList();
- this.tableData = arr.records;
- this.totalNum = arr.total;
+ handleReset() {
+ this.context = '';
+ this.status = 0;
+ this.getMessageAuditList();
},
// 鑾峰彇娑堟伅鏁版嵁
- async getMessageAuditList() {
- let arr = [];
- const { currentPage, pageSize, context, status } = this;
- await this.$axios({
+ getMessageAuditList() {
+ this.$axios({
method: "post",
url: "sccg/message_audit/list",
data: {
- messageId: context,
- auditId:this.auditId,
- auditStatus: status,
- current: currentPage,
- pageSize: pageSize,
+ messageId: this.context,
+ auditId: this.auditId,
+ auditStatus: this.status,
+ current: this.currentPage,
+ pageSize: this.pageSize,
},
}).then((res) => {
- arr = res.data;
- });
- return arr;
+ const { records, total } = res.data;
+ this.tableData = records;
+ this.totalNum = total;
+ }).catch(err => this.$message.error(err))
+
},
// 寮圭獥鍏抽棴
handleClose(done) {
@@ -199,12 +193,12 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.setTableData();
+ this.getMessageAuditList();
},
// 鍘诲鏍�
handleCheckSms(info) {
- this.messageData = info;
- if (this.messageData.info.row.auditStatus === 1) {
+ this.messageData = info.info.row;
+ if (info.info.row.auditStatus === 1) {
this.$message({ message: "璇ユ秷鎭凡琚鏍革紒" });
this.dialogCheckSms = false;
} else {
@@ -247,7 +241,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-title {
line-height: 40px;
padding: 0 20px;
@@ -285,7 +278,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.main-title {
line-height: 60px;
--
Gitblit v1.8.0