From 1ec00a645693dbc08b7ea70855451bbd72c43a6a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 08 十二月 2022 16:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/writManager/writTemplate/index.vue | 2
src/views/operate/management/myIndex/components/closure/index.vue | 24 +--
src/views/operate/viewEvent/index.vue | 52 ++++---
src/views/operate/rectification/surveyList/components/viewInterface/index.vue | 10 -
src/views/intelligentPatrol/studyJudge/index.vue | 47 ++++--
src/views/operate/management/myIndex/components/examine/index.vue | 18 -
src/views/operate/rectification/surveyList/index.vue | 25 ---
src/views/layout/components/Header/index.vue | 9
src/views/operate/myWait/index.vue | 6
src/views/operate/writManager/writ/index.vue | 10 -
src/views/operate/disposal/casepool/dispatch/index.vue | 2
src/views/operate/video/updateInterface/index.vue | 20 --
src/components/detail/index.vue | 18 +-
src/components/scene/index.vue | 4
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 8
src/views/operate/viewEvent/components/illExamine/index.vue | 26 ---
src/views/operate/viewEvent/components/examine/index.vue | 36 ----
src/views/operate/viewEvent/components/closure/index.vue | 38 +----
src/views/operate/rectification/taskList/components/viewInterface/index.vue | 11 -
src/views/operate/video/index.vue | 3
20 files changed, 117 insertions(+), 252 deletions(-)
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 6922398..14aeb40 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -12,7 +12,7 @@
<label class="data-title">
澶х被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</div>
</div>
<div class="data-item">
@@ -20,13 +20,13 @@
<label class="data-title">
灏忕被鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.typeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.typeText}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
浜嬩欢绛夌骇:
</label>
- <span class="data-detail">{{baseCase.violations.gradeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span>
</div>
</div>
<div class="data-item">
@@ -34,7 +34,7 @@
<label class="data-title">
妗堢敱:
</label>
- <span class="data-detail">{{baseCase.violations.actionCause}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.actionCause}}</span>
</div>
</div>
<div class="data-item">
@@ -64,7 +64,7 @@
<label class="data-title">
鍏宠仈鍟嗛摵鍚嶇О:
</label>
- <span class="data-detail">{{baseCase.violations.shopName}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.shopName}}</span>
</div>
</div>
<div class="data-item">
@@ -72,7 +72,7 @@
<label class="data-title">
闂鎻忚堪:
</label>
- <span class="data-detail">{{baseCase.violations.description}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.description}}</span>
</div>
</div>
<div class="data-user">
@@ -81,13 +81,13 @@
<label class="data-title">
鍙嶆槧浜�:
</label>
- <span class="data-detail">{{baseCase.violations.informant}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informant}}</span>
</div>
<div class="data-item__right">
<label class="data-title">
鑱旂郴鏂瑰紡:
</label>
- <span class="data-detail">{{baseCase.violations.informantPhoneCode}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informantPhoneCode}}</span>
</div>
</div>
<div class="data-item">
@@ -95,7 +95,7 @@
<label class="data-title">
韬唤璇佸彿:
</label>
- <span class="data-detail">{{baseCase.violations.informantIdCard}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informantIdCard}}</span>
</div>
</div>
</div>
diff --git a/src/components/scene/index.vue b/src/components/scene/index.vue
index 13a2f54..d29b5cc 100644
--- a/src/components/scene/index.vue
+++ b/src/components/scene/index.vue
@@ -161,8 +161,8 @@
this.arrivalSituation.situationPic = mylist.situationPic.split(",")
}
this.mybaseCase = baseCase;
- if (baseCase.violations) {
- this.type = baseCase.violations.typeText;
+ if (baseCase.violationsVO) {
+ this.type = baseCase.violationsVO.typeText;
} else {
this.type = baseCase.illegalBuilding.categoryText;
}
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index f0c9402..5872fd5 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>鎮ㄦ湁{{ eventList.length }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫0鏉�,鍐嶅涔爗{ countData.review }}鏉�</span>
+ <span>鎮ㄦ湁{{ countData.register }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.review }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span>
</div>
<div class="study-judge-main">
<div class="sjm-header">
@@ -39,10 +39,10 @@
<span>{{ currentEvent.grade }}</span>
</el-form-item>
<el-form-item label="棣栨鎶ヨ鏃堕棿:">
- <span>{{ currentEvent.firstTime }}</span>
+ <span>{{ currentEvent.alarmTime }}</span>
</el-form-item>
<el-form-item label="鏈�杩戞姤璀︽椂闂�:">
- <span>{{ currentEvent.recentTime }}</span>
+ <span>{{ currentEvent.currentAlarmTime }}</span>
</el-form-item>
<el-form-item label="鎸佺画鏃堕棿:">
<span>{{ currentEvent.conntinueTime }}</span>
@@ -55,9 +55,9 @@
<el-form-item v-if="eventInfoData.store" label="搴楅摵寰楀垎:">
<span>{{ selectStoreChange(eventInfoData.store).storeScore }}</span>
</el-form-item>
- <el-form-item label="澶勭悊鎰忚:" prop="advice">
- <el-radio-group v-model="eventInfoData.advice">
- <el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
+ <el-form-item label="澶勭悊鎰忚:" prop="state">
+ <el-radio-group v-model="eventInfoData.state">
+ <el-radio :label="item.id" v-for="item in stateList" :key="item.id">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:" prop="categoryId">
@@ -144,12 +144,13 @@
}
};
return {
- eventList: [],
countData: {
- review: 0
+ study: 0,
+ review: 0,
+ register: 0
},
currentEvent: {},
- adviceList: [
+ stateList: [
{
id: 2,
label: '涓婃姤',
@@ -169,7 +170,7 @@
],
eventInfoData: null,
rules:{
- advice:[
+ state:[
{
required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
},
@@ -208,10 +209,17 @@
getInspectionData() {
basecase.getInspectionData({ current: this.currentPage })
.then(({ records }) => {
- this.eventList = records;
- this.currentEvent = this.eventList[0];
+ this.currentEvent = records[0];
if (this.currentEvent?.picData) {
this.imageList = this.currentEvent.picData.split(',').map(item => `${FILE_ORIGINAL_URL}${item}`);
+ }
+ if (this.currentEvent?.alarmTime || this.currentEvent?.currentAlarmTime) {
+ const { alarmTime, currentAlarmTime } = this.currentEvent;
+ const continueAlarmTime = new Date().getTime() -
+ (currentAlarmTime ? new Date(currentAlarmTime).getTime() : new Date(alarmTime).getTime());
+ const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
+ const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
+ this.currentEvent.conntinueTime = `${parseInt(CONTINUE_DAY)}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
}
})
.catch(err => this.$message.error(err))
@@ -221,10 +229,10 @@
handleConfirm(){
this.$refs.currentEvent.validate((flag)=>{
if(flag){
- this.eventInfoData.baseId = this.currentEvent.code;
+ this.eventInfoData.baseId = this.currentEvent.baseId;
// 璋冨害
- if (this.eventInfoData.advice === 6) {
+ if (this.eventInfoData.state === 6) {
this.isShowDialog = true;
} else {
this.confirmInspection();
@@ -239,7 +247,7 @@
this.eventInfoData = {
baseId: null,
store: null,
- advice: null,
+ state: null,
categoryId: null,
typeId: null,
carNumber: null,
@@ -254,7 +262,12 @@
},
confirmInspection(data) {
- basecase.confirmInspection({ ...this.eventInfoData, ...data })
+ if (data) {
+ data.baseCaseId = data.id;
+ }
+ const eventParams = Object.assign({}, this.eventInfoData);
+ delete eventParams.store;
+ basecase.confirmInspection({ ...eventParams, ...data })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛');
this.getInspectionData();
@@ -269,7 +282,7 @@
selectStoreChange(id) {
const selectedStore = this.storeList.find(store => store.id === id);
- this.eventInfoData.shopName = selectedStore.storeName;
+ this.eventInfoData.shopName = selectedStore.id;
this.eventInfoData.linkShop = 1;
return selectedStore;
}
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 015a5b4..dde7c97 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -4,7 +4,7 @@
<!-- 宸︿晶鑿滃崟 -->
<div class="header-left">
<div class="menu-left__item" v-for="(item, index) in menuLeftList" :key="item.id" @click="changeActive(index)">
- <span :class="item.checked ? 'my-active' : ''">{{ item.label }}</span>
+ <span :class="item.checked ? 'my-active' : ''" @click="menuChange(item)">{{ item.label }}</span>
</div>
</div>
<!-- 鍙充晶鑿滃崟 -->
@@ -210,6 +210,11 @@
})
})
.catch(err => this.$message.error(`${err}`))
+ },
+ menuChange(data) {
+ if (data.id === '1f') {
+ window.open('http://121.37.167.200:28081/cockpit-pub/pc-board?boardId=zfu0LsJ9', '_blank');
+ }
}
}
};
@@ -226,14 +231,12 @@
.el-header {
background-color: #071a38;
- color: #333;
text-align: center;
line-height: 60px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 20px;
- // width: 100%;
color: #4b9bb7;
.header-left {
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index 7300527..a3049d4 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -323,6 +323,8 @@
await casequery.getBaseCaseDetail(data.code)
.then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => {
this.vioData = currentSitVo;
+ this.illData = currentSitVo;
+ debugger;
this.imageResourceId = filesPictureVo.imageResources[0]?.id;
})
.catch(err => this.$message.error(err))
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
index ecd2735..128ee4e 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue
@@ -29,11 +29,11 @@
writ: null
}
},
- props: ['caseId','closeDialog', 'vioData', 'illegalType', 'imageResourceId'],
+ props: ['caseId','closeDialog', 'illData', 'illegalType', 'imageResourceId'],
created() {
- this.arriveData = this.vioData.arrivalSituation;
- this.evidenceData = this.vioData.investigation;
- this.writ = this.vioData.writ;
+ this.arriveData = this.illData.arrivalSituation;
+ this.evidenceData = this.illData.investigation;
+ this.writ = this.illData.writ;
},
methods: {
handleSubmit() {
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index d66a448..dd16953 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -25,18 +25,18 @@
}}</span>
</el-form-item>
<el-form-item label="浜嬩欢绛夌骇:">
- <span class="data-detail">{{ baseCase.violations.gradeText }}</span>
+ <span class="data-detail">{{ baseCase.violationsVO.gradeText }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="澶х被鍚嶇О:">
<span class="data-detail">{{
- baseCase.violations.categoryText
+ baseCase.violationsVO.categoryText
}}</span>
</el-form-item>
<el-form-item label="灏忕被鍚嶇О:">
<span class="data-detail">{{
- baseCase.violations.categoryText
+ baseCase.violationsVO.categoryText
}}</span>
</el-form-item>
</div>
@@ -58,42 +58,34 @@
<span class="data-detail">{{ baseCase.site }}</span>
</el-form-item>
<el-form-item label="杞︾墝鍙�:">
- <span class="data-detail">{{ baseCase.violations.carNumber }}</span>
+ <span class="data-detail">{{ baseCase.violationsVO.carNumber }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鍏宠仈鍟嗛摵鍚嶇О:">
- <span class="data-detail">{{ baseCase.violations.shopName }}</span>
+ <span class="data-detail">{{ baseCase.violationsVO.shopName }}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="闂鎻忚堪:">
<span class="data-detail">{{
- baseCase.violations.description
+ baseCase.violationsVO.description
}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鍙嶆槧浜�:">
- <span class="data-detail">{{ baseCase.violations.informant }}</span>
+ <span class="data-detail">{{ baseCase.violationsVO.informant }}</span>
</el-form-item>
<el-form-item label="鑱旂郴鏂瑰紡:">
<span class="data-detail">{{
- baseCase.violations.informantPhoneCode
+ baseCase.violationsVO.informantPhoneCode
}}</span>
</el-form-item>
</div>
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<span class="data-detail">{{ baseCase.auditOpinion }}</span>
</el-form-item>
- <!-- 瀹℃牳鎰忚
- <el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
- <el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
- </el-form-item>
- <div class="el-form-footer">
- <el-button @click.native.prevent="handleSubmit(0)">椹冲洖</el-button>
- <el-button type="primary" @click.native.prevent="handleSubmit(1)">閫氳繃</el-button>
- </div> -->
</el-form>
</div>
<div class="view-process">
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index fdeae01..df1a2a1 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -15,26 +15,23 @@
<span class="data-detail">{{baseCase.category === 1 ? '杩濊' : '杩濆缓'}}</span>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="灏忕被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.typeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.typeText}}</span>
</el-form-item>
<el-form-item label="浜嬩欢绛夌骇:">
- <span class="data-detail">{{baseCase.violations.gradeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="妗堢敱:">
- <span class="data-detail">{{baseCase.violations.actionCause}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.actionCause}}</span>
</el-form-item>
</div>
<div class="data-item">
- <!-- <el-form-item label="鎵�灞炲尯鍘�:">
- <span class="data-detail">xxxx</span>
- </el-form-item> -->
<el-form-item label="鎵�灞炶閬�:">
<span class="data-detail">{{baseCase.streetText}}</span>
</el-form-item>
@@ -42,11 +39,6 @@
<span class="data-detail">{{baseCase.communityText}}</span>
</el-form-item>
</div>
- <!-- <div class="data-item">
- <el-form-item label="鎵�灞炵ぞ鍖�:">
- <span class="data-detail">{{baseCase.communityText}}</span>
- </el-form-item>
- </div> -->
<div class="data-item">
<el-form-item label="浜嬪彂鍦扮偣:">
<span class="data-detail">{{baseCase.site}}</span>
@@ -54,7 +46,7 @@
</div>
<div class="data-item">
<el-form-item label="闂鎻忚堪:">
- <span class="data-detail">{{baseCase.violations.description}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.description}}</span>
</el-form-item>
</div>
<!-- 瀹℃牳鎰忚 -->
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 75bcda1..d970add 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -206,9 +206,9 @@
methods: {
getTableData() {
myWait
- .getMybackLog({ num: this.context })
- .then((res) => {
- this.tableData = res;
+ .getMybackLog({ num: this.context, current: this.currentPage, pageSize: this.pageSize })
+ .then(({ records }) => {
+ this.tableData = records;
this.tableData = this.tableData.filter((item) => !!item);
})
.catch((err) => this.$message({ type: "error", message: err }));
diff --git a/src/views/operate/rectification/surveyList/components/viewInterface/index.vue b/src/views/operate/rectification/surveyList/components/viewInterface/index.vue
index 286fcf4..5fb4f62 100644
--- a/src/views/operate/rectification/surveyList/components/viewInterface/index.vue
+++ b/src/views/operate/rectification/surveyList/components/viewInterface/index.vue
@@ -101,16 +101,6 @@
}
}
};
- const validatePhone = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欐墜鏈哄彿鐮�"));
- } else {
- const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/;
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- }
- }
- };
return {
myInterface: {},
createmyInterfaceRules: {
diff --git a/src/views/operate/rectification/surveyList/index.vue b/src/views/operate/rectification/surveyList/index.vue
index 0a967d2..95e368f 100644
--- a/src/views/operate/rectification/surveyList/index.vue
+++ b/src/views/operate/rectification/surveyList/index.vue
@@ -29,11 +29,6 @@
>
</el-date-picker>
</div>
- <!-- <div class="mydate">
- <el-input placeholder="璇疯緭鍏ュ紑濮嬫椂闂�"></el-input>
- <div class="line">鈥斺�斺�� 鈥斺�斺��</div>
- <el-input placeholder="璇疯緭鍏ョ粨鏉熸椂闂�"></el-input>
- </div> -->
</div>
<div class="search">
<el-input placeholder="璇疯緭鍏ユ爣棰樻垨鑰呬换鍔＄紪鍙�"></el-input>
@@ -44,7 +39,6 @@
</div>
</div>
<div class="mainContent">
- <!-- @selection-change="handleSelectionChange" -->
<!-- 鏁版嵁娓叉煋 -->
<el-table
ref="multipleTable"
@@ -60,8 +54,6 @@
}"
:row-class-name="tableRowClassName"
>
- <!-- <el-table-column type="selection" width="55">
- </el-table-column> -->
<el-table-column label="浠诲姟缂栧彿" prop="num" min-width="10">
</el-table-column>
<el-table-column prop="type" label="闂绫诲瀷" min-width="10">
@@ -86,13 +78,6 @@
</template>
</el-table-column>
</el-table>
- <!-- 鍒嗛〉 -->
- <!-- <div class="pagination">
- <el-pagination background :current-page="currentPage" layout="prev, pager, next" :total="totalNum"
- :page-size="pageSize" @current-change="changeCurrentPage" @prev-click="handlePrev"
- @next-click="handleNext">
- </el-pagination>
- </div> -->
</div>
</main>
<footer>
@@ -169,9 +154,6 @@
date: "",
beginTime: "",
endTime: "",
- // totalNum: 200,
- // pageSize: 10,
- // currentPage: 1,
};
},
created() {
@@ -181,23 +163,21 @@
// 鑾峰彇鎺ュ彛鍒楄〃
getUserList() {
const that = this;
- // const { currentPage, pageSize, search } = this;
this.dialogCreate = false;
this.$axios.get("sccg/system/portal/thirdApp/search").then((res) => {
const { code, data } = res;
- if (code == 200) {
+ if (code === 200) {
this.tableData = data;
}
});
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return "warning-row";
} else {
return "success-row";
}
- return "";
},
// 鎵撳紑鏂板鐣岄潰
handleAdd() {
@@ -214,7 +194,6 @@
.catch((_) => {});
},
closeDialog({ flag, index }) {
- index === 1 ? "" : "";
this.dialogCreate = flag;
},
// 鍒涘缓鏌ョ湅寮圭獥
diff --git a/src/views/operate/rectification/taskList/components/viewInterface/index.vue b/src/views/operate/rectification/taskList/components/viewInterface/index.vue
index f15b866..08ba6a0 100644
--- a/src/views/operate/rectification/taskList/components/viewInterface/index.vue
+++ b/src/views/operate/rectification/taskList/components/viewInterface/index.vue
@@ -73,16 +73,6 @@
}
}
};
- const validatePhone = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欐墜鏈哄彿鐮�"));
- } else {
- const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- }
- }
- };
return {
myInterface: {
},
@@ -106,7 +96,6 @@
}
},
created() {
- const that = this;
const {userInfo} = this;
this.myInterface = JSON.parse(JSON.stringify(userInfo));
},
diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue
index e813e4d..a3f605a 100644
--- a/src/views/operate/video/index.vue
+++ b/src/views/operate/video/index.vue
@@ -17,9 +17,6 @@
<div class="findBtn">
<el-button type="primary" @click="searchVideoList">鏌ヨ</el-button>
</div>
- <!-- <div class="findBtn">
- <el-button class="button-addition" type="primary" @click="handleOpera(null, 'create')">娣诲姞</el-button>
- </div> -->
</div>
</div>
</header>
diff --git a/src/views/operate/video/updateInterface/index.vue b/src/views/operate/video/updateInterface/index.vue
index 60805da..fa0743c 100644
--- a/src/views/operate/video/updateInterface/index.vue
+++ b/src/views/operate/video/updateInterface/index.vue
@@ -1,26 +1,6 @@
<template>
<div class="updateUser">
<el-form label-position="right" label-width="150px" :model="videoData" :rules="rules" :disabled="isDisabled" ref="user">
- <!-- <el-form-item prop="belongToId" label="鎵�灞炰簨浠剁紪鍙�">
- <el-input v-model="videoData.belongToId"></el-input>
- </el-form-item>
- <el-form-item prop="eventSource" label="浜嬩欢鏉ユ簮">
- <el-input v-model="videoData.eventSource"></el-input>
- </el-form-item>
- <el-form-item prop="category" label="闂绫诲埆">
- <el-input v-model="videoData.category"></el-input>
- </el-form-item>
- <el-form-item prop="type" label="绫诲瀷">
- <el-select v-model="videoData.type">
- <el-option v-for="item in getResourceType()" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item prop="regionName" label="绀惧尯鍚嶇О">
- <el-input v-model="videoData.regionName"></el-input>
- </el-form-item>
- <el-form-item prop="id" label="瑙嗛Id">
- <el-input v-model="videoData.id"></el-input>
- </el-form-item> -->
<el-form-item prop="url" label="瑙嗛" min-width="8">
<template v-if="videoList" >
<div class="video-cover" v-for="video in videoList" :key="video">
diff --git a/src/views/operate/viewEvent/components/closure/index.vue b/src/views/operate/viewEvent/components/closure/index.vue
index aeb2684..0a7f4e1 100644
--- a/src/views/operate/viewEvent/components/closure/index.vue
+++ b/src/views/operate/viewEvent/components/closure/index.vue
@@ -15,15 +15,15 @@
<span class="data-detail">{{baseCase.category === 1 ? '杩濊' : '杩濆缓'}}</span>
</el-form-item>
<el-form-item label="浜嬩欢绛夌骇:">
- <span class="data-detail">{{baseCase.violations.gradeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="澶х被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</el-form-item>
<el-form-item label="灏忕被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</el-form-item>
</div>
<div class="data-item">
@@ -44,35 +44,27 @@
<span class="data-detail">{{baseCase.site}}</span>
</el-form-item>
<el-form-item label="杞︾墝鍙�:">
- <span class="data-detail">{{baseCase.violations.carNumber}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.carNumber}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鍏宠仈鍟嗛摵鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.shopName}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.shopName}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="闂鎻忚堪:">
- <span class="data-detail">{{baseCase.violations.description}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.description}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="鍙嶆槧浜�:">
- <span class="data-detail">{{baseCase.violations.informant}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informant}}</span>
</el-form-item>
<el-form-item label="鑱旂郴鏂瑰紡:">
- <span class="data-detail">{{baseCase.violations.informantPhoneCode}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.informantPhoneCode}}</span>
</el-form-item>
</div>
- <!-- 瀹℃牳鎰忚
- <el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
- <el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
- </el-form-item>
- <div class="el-form-footer">
- <el-button @click.native.prevent="handleSubmit(0)">椹冲洖</el-button>
- <el-button type="primary" @click.native.prevent="handleSubmit(1)">閫氳繃</el-button>
- </div> -->
</el-form>
</div>
<div class="view-process">
@@ -225,20 +217,6 @@
return false;
}
})
- },
- // 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
- getUserLoginInfo() {
- // 鑾峰彇鐧诲綍鍚�;
- const username = sessionStorage.getItem('name');
- this.$axios({
- method: 'get',
- url: 'sccg/admin/info',
- data: {
- name: 'username'
- }
- })
- .then(res => {
- })
}
},
props: ['info', 'closeDialog']
diff --git a/src/views/operate/viewEvent/components/examine/index.vue b/src/views/operate/viewEvent/components/examine/index.vue
index 0eb5df1..517a8c3 100644
--- a/src/views/operate/viewEvent/components/examine/index.vue
+++ b/src/views/operate/viewEvent/components/examine/index.vue
@@ -15,20 +15,20 @@
<span class="data-detail">{{baseCase.category === 1 ? '杩濊' : '杩濆缓'}}</span>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.categoryText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.categoryText}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="灏忕被鍚嶇О:">
- <span class="data-detail">{{baseCase.violations.typeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.typeText}}</span>
</el-form-item>
<el-form-item label="浜嬩欢绛夌骇:">
- <span class="data-detail">{{baseCase.violations.gradeText}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.gradeText}}</span>
</el-form-item>
</div>
<div class="data-item">
<el-form-item label="妗堢敱:">
- <span class="data-detail">{{baseCase.violations.actionCause}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.actionCause}}</span>
</el-form-item>
</div>
<div class="data-item">
@@ -51,19 +51,9 @@
</div>
<div class="data-item">
<el-form-item label="闂鎻忚堪:">
- <span class="data-detail">{{baseCase.violations.description}}</span>
+ <span class="data-detail">{{baseCase.violationsVO.description}}</span>
</el-form-item>
</div>
- <!-- <div class="data-item">
- <el-form-item label="澶勭疆鏂瑰紡:">
- <span class="data-detail">xxxxxxx</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="澶勭疆鎵嬫:">
- <span class="data-detail">xxxxxxx</span>
- </el-form-item>
- </div>-->
<!-- 瀹℃牳鎰忚 -->
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
@@ -186,21 +176,7 @@
return false;
}
})
- },
- // 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
- getUserLoginInfo() {
- // 鑾峰彇鐧诲綍鍚�;
- const username = sessionStorage.getItem('name');
- this.$axios({
- method: 'get',
- url: 'sccg/admin/info',
- data: {
- name: 'username'
- }
- })
- .then(res => {
- })
- },
+ }
},
props: ['info', 'closeDialog']
}
diff --git a/src/views/operate/viewEvent/components/illExamine/index.vue b/src/views/operate/viewEvent/components/illExamine/index.vue
index a473092..8b3ba69 100644
--- a/src/views/operate/viewEvent/components/illExamine/index.vue
+++ b/src/views/operate/viewEvent/components/illExamine/index.vue
@@ -53,16 +53,6 @@
<span class="data-detail">{{baseCase.illegalBuilding.description}}</span>
</el-form-item>
</div>
- <!-- <div class="data-item">
- <el-form-item label="澶勭疆鏂瑰紡:">
- <span class="data-detail">xxxxxxx</span>
- </el-form-item>
- </div>
- <div class="data-item">
- <el-form-item label="澶勭疆鎵嬫:">
- <span class="data-detail">xxxxxxx</span>
- </el-form-item>
- </div> -->
<!-- 瀹℃牳鎰忚 -->
<el-form-item label="瀹℃牳鎰忚" prop="auditOpinion">
<el-input type="textarea" placeholder="璇疯緭鍏ュ鏍告剰瑙�" v-model="baseCase.auditOpinion"></el-input>
@@ -186,21 +176,7 @@
return false;
}
})
- },
- // 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
- getUserLoginInfo() {
- // 鑾峰彇鐧诲綍鍚�;
- const username = sessionStorage.getItem('name');
- this.$axios({
- method: 'get',
- url: 'sccg/admin/info',
- data: {
- name: 'username'
- }
- })
- .then(res => {
- })
- },
+ }
},
props: ['info', 'closeDialog']
}
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 24ec25a..cb544e7 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -15,19 +15,16 @@
<div class="contentItem">
<div style="width: 80px">鎸夌被鍨�:</div>
<div class="search">
- <el-input
- placeholder=" 璇疯緭鍏ョ被鍨�"
- v-model="searchData.categories"
- ></el-input>
+ <el-select clearable v-model="searchData.categories" placeholder=" 璇烽�夋嫨绫诲瀷">
+ <el-option v-for="option in categoryOptions" :key="option.id" :label="option.label" :value="option.value"></el-option>
+ </el-select>
</div>
</div>
<div class="contentItem">
<div style="width: 80px">鎸夌ぞ鍖�:</div>
<div class="search">
- <el-input
- placeholder=" 璇疯緭鍏ョぞ鍖�"
- v-model="searchData.communityId"
- ></el-input>
+ <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="璇烽�夋嫨绀惧尯">
+ </el-cascader>
</div>
</div>
<div class="contentItem">
@@ -186,6 +183,7 @@
import helper from "@/utils/mydate";
import casequery from "@/api/operate/basecase";
import { CATEGOTY } from "@/utils/helper";
+import department from "@/api/system/department";
export default {
components: {
@@ -207,24 +205,18 @@
totalNum: null,
pageSize: 10,
currentPage: 1,
- typeList: [
- {
- name: "杩濊",
- value: 1,
- checked: true,
- },
- {
- name: "杩濆缓",
- value: 2,
- checked: false,
- },
- ],
+ categoryOptions: CATEGOTY,
+ communityOptions: [],
+ communityProps: {
+ label: 'regionName',
+ value: 'id'
+ },
myproblem: 1,
number: "",
searchData: {
categories: null,
number: null,
- communityId: null,
+ community: null,
endTime: null,
site: null,
startTime: null,
@@ -233,15 +225,21 @@
},
created() {
this.getList();
+ this.getCommunityOptions();
},
methods: {
// 鑾峰彇鍒楄〃
getList() {
+ const searchData = Object.assign({}, this.searchData);
+ if (this.searchData.community) {
+ searchData.communityId = searchData.community[1];
+ }
+ delete searchData.community;
casequery
.baseCaseQuery({
current: this.currentPage,
pageSize: this.pageSize,
- ...this.searchData,
+ ...searchData,
})
.then((res) => {
this.tableData = res.records;
@@ -251,6 +249,16 @@
this.tableData = [];
});
},
+
+ // 鑾峰彇绀惧尯鍜岃閬�
+ getCommunityOptions() {
+ department.getDepartmentList()
+ .then(res => {
+ this.communityOptions = res;
+ })
+ .catch(err => this.$message.error(err))
+ },
+
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 === 0) {
diff --git a/src/views/operate/writManager/writ/index.vue b/src/views/operate/writManager/writ/index.vue
index 2334231..242589e 100644
--- a/src/views/operate/writManager/writ/index.vue
+++ b/src/views/operate/writManager/writ/index.vue
@@ -13,11 +13,6 @@
</header>
<main>
<div class="main-content">
- <!-- <div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="handleAdd"
- >娣诲姞</el-button
- >
- </div> -->
<!-- 鏁版嵁灞曠ず -->
<el-table
ref="multipleTable"
@@ -213,12 +208,11 @@
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return "warning-row";
} else {
return "success-row";
}
- return "";
},
// 寮圭獥鍏抽棴
handleClose(done) {
@@ -268,7 +262,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-content {
padding: 0 40px;
@@ -302,7 +295,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/writManager/writTemplate/index.vue b/src/views/operate/writManager/writTemplate/index.vue
index 2d03c33..cf891c5 100644
--- a/src/views/operate/writManager/writTemplate/index.vue
+++ b/src/views/operate/writManager/writTemplate/index.vue
@@ -165,7 +165,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-content {
padding: 0 40px;
@@ -199,7 +198,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.main-title {
line-height: 60px;
--
Gitblit v1.8.0