From 184acd5b0b7b91eac0ee6c028f50437dbd087573 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期四, 08 十二月 2022 10:41:41 +0800
Subject: [PATCH] 我的待办参数修改，案卷查询搜索参数修改
---
src/views/operate/writManager/writTemplate/index.vue | 2
src/views/operate/viewEvent/index.vue | 40 +++++-----
src/views/operate/rectification/surveyList/components/viewInterface/index.vue | 10 --
src/views/intelligentPatrol/studyJudge/index.vue | 12 +-
src/views/operate/rectification/surveyList/index.vue | 25 -----
src/views/operate/myWait/index.vue | 6
src/views/operate/writManager/writ/index.vue | 10 --
src/views/operate/video/updateInterface/index.vue | 20 -----
src/views/operate/viewEvent/components/illExamine/index.vue | 26 ------
src/views/operate/viewEvent/components/examine/index.vue | 26 ------
src/views/operate/viewEvent/components/closure/index.vue | 22 -----
src/views/operate/rectification/taskList/components/viewInterface/index.vue | 11 --
src/views/operate/video/index.vue | 3
13 files changed, 34 insertions(+), 179 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index f0c9402..d9e3205 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">
@@ -144,9 +144,10 @@
}
};
return {
- eventList: [],
countData: {
- review: 0
+ study: 0,
+ review: 0,
+ register: 0
},
currentEvent: {},
adviceList: [
@@ -208,8 +209,7 @@
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}`);
}
@@ -221,7 +221,7 @@
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) {
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..e90e84e 100644
--- a/src/views/operate/viewEvent/components/closure/index.vue
+++ b/src/views/operate/viewEvent/components/closure/index.vue
@@ -65,14 +65,6 @@
<span class="data-detail">{{baseCase.violations.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..f14dd82 100644
--- a/src/views/operate/viewEvent/components/examine/index.vue
+++ b/src/views/operate/viewEvent/components/examine/index.vue
@@ -54,16 +54,6 @@
<span class="data-detail">{{baseCase.violations.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..628f749 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -15,19 +15,17 @@
<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-select clearable v-model="searchData.communityId" placeholder="璇烽�夋嫨绀惧尯">
+ <el-option v-for="option in communityOptions" :key="option.id" :value="option.id" :label="option.regionName"></el-option>
+ </el-select>
</div>
</div>
<div class="contentItem">
@@ -186,6 +184,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,18 +206,8 @@
totalNum: null,
pageSize: 10,
currentPage: 1,
- typeList: [
- {
- name: "杩濊",
- value: 1,
- checked: true,
- },
- {
- name: "杩濆缓",
- value: 2,
- checked: false,
- },
- ],
+ categoryOptions: CATEGOTY,
+ communityOptions: [],
myproblem: 1,
number: "",
searchData: {
@@ -233,6 +222,7 @@
},
created() {
this.getList();
+ this.getCommunityOptions();
},
methods: {
// 鑾峰彇鍒楄〃
@@ -251,6 +241,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