From 24712d1fa40f157892f3d0546572953ca696ebc2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:42:10 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/viewEvent/index.vue | 10
src/views/operate/sms/smsTemplate/index.vue | 5
src/views/intelligentPatrol/studyJudge/index.vue | 160 +++++++------------
src/views/operate/message/myIndex/update/index.vue | 18 +
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 180 ++++++++++-----------
src/views/operate/management/message/index.vue | 58 +++----
src/views/systemSetting/platform/cockpitManage/index.vue | 3
src/views/operate/management/message/checkSms/index.vue | 33 +--
8 files changed, 214 insertions(+), 253 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 b90f6a5..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
@@ -1,111 +1,105 @@
<template>
- <div class="vio">
- <!-- 鍒拌揪鐜板満鎯呭喌 -->
- <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
- <!-- 璋冩煡鍙栬瘉 -->
- <MyEvidence
- ref="evidence"
- :evidenceData="evidenceData"
- :mytype="1"
- :mycode="mycode"
- ></MyEvidence>
- <!-- 搴曢儴鎸夐挳 -->
- <div class="footer">
- <el-button @click="handleSubmit" type="primary">纭畾</el-button>
- <el-button @click="handleBack">杩斿洖</el-button>
+ <div class="vio">
+ <!-- 鍒拌揪鐜板満鎯呭喌 -->
+ <MyArrive ref="arrive" :arriveData="arriveData"></MyArrive>
+ <!-- 璋冩煡鍙栬瘉 -->
+ <MyEvidence ref="evidence" :evidenceData="evidenceData" :mytype="1" :mycode="mycode"></MyEvidence>
+ <!-- 搴曢儴鎸夐挳 -->
+ <div class="footer">
+ <el-button @click="handleSubmit" type="primary">纭畾</el-button>
+ <el-button @click="handleBack">杩斿洖</el-button>
+ </div>
</div>
- </div>
</template>
<script>
-import MyArrive from "../components/arrive";
-import MyEvidence from "../components/evidence";
+import MyArrive from '../components/arrive'
+import MyEvidence from "../components/evidence"
import casequery from "@/api/operate/basecase";
export default {
- components: {
- MyArrive,
- MyEvidence,
- },
- data() {
- return {
- arriveData: null,
- evidenceData: null,
- };
- },
- props: ["caseId", "closeDialog", "mycode", "vioData", "imageResourceId"],
- created() {
- this.arriveData = this.vioData.arrivalSituation;
- this.evidenceData = this.vioData.investigation;
- },
- methods: {
- handleSubmit() {
- const { arrive, evidence } = this.$refs;
- const { arriveForm } = arrive.$refs;
- const { evidenceForm } = evidence.$refs;
- arriveForm.validate((valid) => {
- if (valid) {
- evidenceForm.validate((flag) => {
- if (flag) {
- const arriveData = Object.assign({}, arrive.arrive);
- const evidenceData = Object.assign({}, evidence.evidence);
- const { partyInfo } = evidenceData;
- const arrivalSituationId = arriveData.id;
- const investigationId = evidenceData.id;
- const partyInfoId = partyInfo ? partyInfo.id : 0;
- const evidencePic = evidenceData.pic.join(",");
- const situationPic = arriveData.situationPic.join(",");
- delete evidenceData.id;
- delete evidenceData.partyInfo;
- delete evidenceData.pic;
- delete arriveData.situationPic;
- delete arriveData.id;
- casequery
- .updateDisposeResult({
- caseId: this.caseId,
- imageResourceId: this.imageResourceId,
- pic: evidencePic,
- arrivalSituationId,
- situationPic,
- partyInfoId,
- investigationId,
- ...arriveData,
- ...evidenceData,
- ...partyInfo,
- })
- .then(() => {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.$emit("closeDialog");
- })
- .catch((err) => {
- this.$message.error(err);
- });
- } else {
- return false;
- }
- });
- } else {
- evidenceForm.validate((flag) => {
- if (!flag) {
- return false;
- }
- });
- return false;
+ components: {
+ MyArrive, MyEvidence
+ },
+ data() {
+ return {
+ arriveData: null,
+ evidenceData: null
}
- });
},
- handleBack() {
- this.$emit("closeDialog", { flag: false });
+ props: ['caseId', 'closeDialog','mycode', 'vioData', 'imageResourceId'],
+ created() {
+ this.arriveData = this.vioData.arrivalSituation;
+ this.evidenceData = this.vioData.investigation;
},
- },
-};
+ methods: {
+ handleSubmit() {
+ const { arrive, evidence } = this.$refs;
+ const { arriveForm } = arrive.$refs;
+ const { evidenceForm } = evidence.$refs;
+ arriveForm.validate((valid) => {
+ if (valid) {
+ evidenceForm.validate((flag) => {
+ if (flag) {
+ const arriveData = Object.assign({}, arrive.arrive);
+ const evidenceData = Object.assign({}, evidence.evidence);
+ const { partyInfo } = evidenceData;
+ const arrivalSituationId = arriveData.id;
+ const investigationId = evidenceData.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;
+ casequery.updateDisposeResult({
+ caseId: this.caseId,
+ imageResourceId: this.imageResourceId,
+ pic: evidencePic,
+ arrivalSituationId,
+ situationPic,
+ partyInfoId,
+ investigationId,
+ ...arriveData,
+ ...evidenceData,
+ ...partyInfo
+ })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.$emit('closeDialog');
+ })
+ .catch(err => {
+ this.$message.error(err);
+ })
+ } else {
+ return false;
+ }
+ })
+ } else {
+ evidenceForm.validate((flag) => {
+ if (!flag) {
+ return false;
+ }
+ })
+ return false;
+ }
+ })
+ },
+ handleBack(){
+ this.$emit('closeDialog',{flag:false});
+ }
+ }
+}
</script>
<style lang="scss" scoped>
.vio {
- padding: 20px 200px 100px;
+ padding: 20px 200px 100px;
}
.footer {
- display: flex;
- justify-content: flex-end;
+ display: flex;
+ justify-content: flex-end;
}
</style>
\ No newline at end of file
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;
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 9b7265b..ed4ba27 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -9,9 +9,10 @@
:model="role"
:rules="createRoleRules"
label-position="right"
+ :disabled="edit"
>
<!-- 鎻愰啋鏂瑰紡 -->
- <el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode">
+ <el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode" >
<el-radio-group v-model="role.channelCode">
<el-radio label="01">绔欏唴淇�</el-radio>
<el-radio label="03">閭欢</el-radio>
@@ -84,21 +85,24 @@
type="primary"
@click.native.prevent="handleSubmit(0)"
class="btn save"
+ v-if="this.type=='update'||this.type=='create'"
>淇濆瓨
</el-button>
<el-button
type="primary"
@click.native.prevent="handleSubmit(1)"
class="btn submit"
+ v-if="this.type=='update'||this.type=='create'"
>鍙戝竷
</el-button>
<el-button
type="primary"
@click.native.prevent="handleView"
class="btn submit"
+ v-if="this.type=='update'||this.type=='create'"
>棰勮
</el-button>
- <el-button class="btn cancel" @click.native.prevent="handleReset"
+ <el-button class="btn cancel" @click.native.prevent="handleReset" v-if="this.type=='update'||this.type=='create'"
>閲嶇疆</el-button
>
</div>
@@ -174,6 +178,7 @@
},
],
},
+ edit: false,
colList: [],
departList: [],
typeList: [],
@@ -193,6 +198,9 @@
this.getColumnList();
this.getDepartList();
this.getLoginUserInfo();
+ if(this.type=="view"){
+ this.edit=true;
+ }
if (this.type !== "create" && this.myDataRow) {
getMessageById(this.myDataRow.id)
.then(res => {
@@ -209,6 +217,7 @@
if (this.type !== 'create') {
this.$refs.edit.editor.txt.append(this.myDataRow.body);
}
+
},
methods: {
// 鍏抽棴寮圭獥
@@ -235,7 +244,10 @@
this.getColumnList();
}
},
-
+ getType(){
+ debugger
+ return this.type;
+ },
// 鑾峰彇閮ㄩ棬鏍�
async getDepartList() {
await this.$axios({
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index c25ad5f..cd54a9b 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -182,6 +182,9 @@
},
// 閲嶇疆
handleReset(){
+ this.context="";
+ this.messageStatus=0;
+ this.getMessageList();
},
// 鏌ョ湅
handleView(data){
@@ -211,7 +214,7 @@
},
// 鑾峰彇娑堟伅鏁版嵁
getMessageList() {
- SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, context: this.context, type: this.messageType })
+ SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, title: this.context, type: this.messageStatus })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 03e5da3..b98d707 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -4,25 +4,25 @@
<div class="headerTitle">杩愯惀绠＄悊 >> 妗堝嵎鏌ヨ</div>
<div class="headerContent">
<div class="contentItem">
- <span>鎸夌紪鍙�: </span>
+ <div style="width: 80px;">鎸夌紪鍙�: </div>
<div>
<el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="searchData.number"></el-input>
</div>
</div>
<div class="contentItem">
- <span>鎸夌被鍨�: </span>
+ <div style="width: 80px;">鎸夌被鍨�: </div>
<div class="search">
<el-input placeholder=" 璇疯緭鍏ョ被鍨�" v-model="searchData.categories"></el-input>
</div>
</div>
<div class="contentItem">
- <span>鎸夌ぞ鍖�: </span>
+ <div style="width: 80px;">鎸夌ぞ鍖�: </div>
<div class="search">
<el-input placeholder=" 璇疯緭鍏ョぞ鍖�" v-model="searchData.communityId"></el-input>
</div>
</div>
<div class="contentItem">
- <span>鎸変簨鍙戝湴鐐�: </span>
+ <div style="width: 150px;">鎸変簨鍙戝湴鐐�: </div>
<div class="search">
<el-input placeholder=" 璇疯緭鍏ヤ簨鍙戝湴鐐�" v-model="searchData.site"></el-input>
</div>
@@ -34,7 +34,7 @@
</div>
</div>
<div class="headerContent">
- <span>鏃堕棿: </span>
+ <div style="width: 60px;">鏃堕棿: </div>
<el-date-picker
v-model="datepick"
type="daterange"
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index 3a7c19d..64dc551 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -68,6 +68,9 @@
<el-table-column prop="reviewOrLawsuitNumber" label="澶嶈鎴栬瘔璁兼暟" min-width="15" v-if="mystatus === 1">
</el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="15" v-if="mystatus === 1">
+ <template slot-scope="scope">
+ <span>{{scope.row. status=== 1? '鍚姩' : '绂佺敤'}}</span>
+ </template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
--
Gitblit v1.8.0