From c761748876b5239a084e16b22f8d616897714175 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 07 十二月 2022 17:10:18 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/viewEvent/index.vue | 8
src/views/operate/message/mycontrol/createUser/index.vue | 19 -
src/components/myUpload/index.vue | 1
src/views/operate/baseSetting/violation/index.vue | 39 ---
src/views/operate/disposal/casepool/learn/index.vue | 35 --
src/views/operate/disposal/casepool/notDeal/index.vue | 9
src/views/operate/disposal/casepool/notDeal/createUser/index.vue | 21 -
src/views/operate/lawEnforcement/index.vue | 1
src/views/intelligentPatrol/studyJudge/index.vue | 156 ++++++++++--
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue | 2
src/views/systemSetting/device/grid/index.vue | 2
src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue | 3
src/views/operate/management/myIndex/components/illclosure/index.vue | 2
src/views/operate/viewEvent/components/illclosure/index.vue | 2
src/views/operate/disposal/casepool/dispatch/index.vue | 2
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 2
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue | 2
src/views/operate/disposal/casepool/learn/createUser/index.vue | 21 -
src/views/operate/disposal/casepool/escalation/createUser/index.vue | 2
src/views/operate/disposal/casepool/escalation/updateUser/index.vue | 21 -
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 5
src/views/operate/baseSetting/violation/updateUser/index.vue | 20 -
src/views/operate/baseSetting/illegalBuild/index.vue | 16 -
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/ill/index.vue | 1
src/views/operate/management/myIndex/components/closure/index.vue | 1
src/views/systemSetting/device/grid/components/header/index.vue | 2
src/views/layout/components/Header/updatePassword/index.vue | 1
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/ill/index.vue | 1
src/views/operate/myWait/updateUser/index.vue | 20 -
src/views/operate/baseSetting/illegalBuild/createUser/index.vue | 19 -
src/views/operate/viewEvent/components/illExamine/index.vue | 2
src/views/operate/viewEvent/components/examine/index.vue | 2
src/views/operate/rectification/renovationList/index.vue | 17 -
src/views/operate/viewEvent/components/closure/index.vue | 2
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue | 2
src/views/operate/rectification/surveyList/components/createInterface/index.vue | 16 -
src/views/operate/baseSetting/illegalBuild/updateUser/index.vue | 1
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 13 -
src/views/operate/disposal/casepool/escalation/index.vue | 19 -
src/views/operate/management/myIndex/components/examine/index.vue | 2
src/views/operate/rectification/surveyList/index.vue | 3
src/components/dispatch/index.vue | 93 ++-----
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue | 6
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 3
src/components/detail/index.vue | 31 -
src/api/baseInfo.js | 10
src/views/operate/management/myIndex/index.vue | 4
src/views/operate/management/myIndex/components/illExamine/index.vue | 2
src/views/systemSetting/device/grid/components/main/index.vue | 26 -
src/http/url-recorder.js | 1
src/views/operate/lawEnforcement/components/dataView/index.vue | 1
src/views/systemSetting/platform/mySetting/index.vue | 5
52 files changed, 207 insertions(+), 490 deletions(-)
diff --git a/src/api/baseInfo.js b/src/api/baseInfo.js
index ec470c3..8c79392 100644
--- a/src/api/baseInfo.js
+++ b/src/api/baseInfo.js
@@ -5,4 +5,14 @@
return http.get('/sccg/sccg_region/list', params);
},
+ // 鏌ヨ杩濊澶х被
+ getCategoryList: (params) => {
+ return http.get('/sccg/violations/query/type_second', params);
+ },
+
+ //鏌ヨ杩濊灏忕被
+ getTypeList: (params) => {
+ return http.get('/sccg/violations/query/type_third', params);
+ }
+
}
\ No newline at end of file
diff --git a/src/components/detail/index.vue b/src/components/detail/index.vue
index 46df99b..6922398 100644
--- a/src/components/detail/index.vue
+++ b/src/components/detail/index.vue
@@ -6,7 +6,7 @@
<label class="data-title">
闂绫诲瀷:
</label>
- <span class="data-detail">杩濊</span>
+ <span class="data-detail">{{ getCategoryLabel(baseCase.category) }}</span>
</div>
<div class="data-item__right">
<label class="data-title">
@@ -38,12 +38,6 @@
</div>
</div>
<div class="data-item">
- <!-- <div class="data-item__left">
- <label class="data-title">
- 鎵�灞炲尯鍘�:
- </label>
- <span class="data-detail">xxx</span>
- </div> -->
<div class="data-item__left">
<label class="data-title">
鎵�灞炶閬�:
@@ -57,14 +51,6 @@
<span class="data-detail">{{baseCase.communityText}}</span>
</div>
</div>
- <!-- <div class="data-item">
- <div class="data-item__left">
- <label class="data-title">
- 鎵�灞炶閬�:
- </label>
- <span class="data-detail">{{baseCase.streetText}}</span>
- </div>
- </div> -->
<div class="data-item">
<div class="data-item__left">
<label class="data-title">
@@ -138,6 +124,8 @@
import MyFilePicture from '@/components/filePictrue'
import MySovleProblem from '@/components/solveProblem'
import MyScene from '@/components/scene'
+import { CATEGOTY } from "@/utils/helper";
+
export default {
components: {
MyProcess, MyFilePicture, MySovleProblem, MyScene
@@ -174,17 +162,18 @@
}
},
created() {
- const {info} = this;
- this.baseCase = info.baseCase;
- this.handlePassVo = info.handlePassVo;
- this.currentSitVo = info.currentSitVo;
- this.filesPictureVo = info.filesPictureVo;
- console.log(info);
+ this.baseCase = this.info.baseCase;
+ this.handlePassVo = this.info.handlePassVo;
+ this.currentSitVo = this.info.currentSitVo;
+ this.filesPictureVo = this.info.filesPictureVo;
},
methods: {
changeComponent(index) {
this.activeIndex = index;
},
+ getCategoryLabel(category) {
+ return CATEGOTY.find(item => item.value === category).label;
+ }
},
props: ['info','mycode']
}
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index 2089ae8..9f284e1 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -47,9 +47,7 @@
<el-select
v-model="dispatch.enforcementTeam"
placeholder="閫夋嫨涓槦"
- :disabled="
- squadronOptions.length !== 0 && squadronOptions ? false : true
- "
+ :disabled="!(squadronOptions.length !== 0 && squadronOptions)"
@change="handleMidChange"
>
<el-option
@@ -66,9 +64,7 @@
<el-select
v-model="dispatch.lawEnforcer"
placeholder="璇烽�夋嫨浜哄憳"
- :disabled="
- personOptions.length !== 0 && personOptions ? false : true
- "
+ :disabled="!(personOptions.length !== 0 && personOptions)"
@change="handlePerChange"
>
<el-option
@@ -121,15 +117,15 @@
</template>
<script>
import MyMap from "@/components/map";
-import { parseTime } from "@/utils/index";
export default {
components: {
MyMap,
},
- props: ["id", "changeDialog", "refresh", "mytype"],
+ props: ["id", "changeDialog", "refresh", "mytype", "isGetData"],
created() {
// 鍒ゆ柇杞﹁締绫诲瀷
this.mytype === 1 ? this.getLawCarList() : this.getSoilCarList();
+ this.isGetDispatchData = this.isGetData ? this.isGetData : false;
this.getDepartList();
},
data() {
@@ -150,13 +146,6 @@
callback();
} else {
callback(new Error("娲鹃仯鎰忚涓嶈兘涓虹┖"));
- }
- };
- const checkDistance = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback(new Error("璺濈涓嶈兘涓虹┖"));
}
};
const checkTeam = (rule, value, callback) => {
@@ -218,12 +207,6 @@
dispatchOpinion: [
{ required: true, trigger: "change", validator: checkOpinion },
],
- // distance: [
- // { required: true, trigger: "change", validator: checkDistance },
- // ],
- // enforcementTeam: [
- // { required: true, trigger: 'change', validator: checkTeam }
- // ],
lawEnforcer: [
{ required: true, trigger: "change", validator: checkPerson },
],
@@ -238,57 +221,38 @@
},
],
},
- carOptions: [
- {
- label: "杞﹁締涓�",
- value: 1,
- },
- {
- label: "杞﹁締浜�",
- value: 2,
- },
- ],
+ carOptions: [],
departOptions: [],
- carOptions: [
- {
- label: "杞﹁締涓�",
- value: 1,
- },
- {
- label: "杞﹁締浜�",
- value: 2,
- },
- ],
squadronOptions: [],
personOptions: [],
+ isGetDispatchData: true
};
},
methods: {
// 鎵ц璋冨害
handleDispatch() {
- console.log(this.dispatch);
this.$refs.form.validate((valid) => {
- console.log(valid);
if (valid) {
- const { dispatch, id } = this;
- // dispatch.disposeDate = new Date();
- console.log(id);
- dispatch.baseCaseId = id;
- console.log(dispatch);
- this.$axios({
- method: "post",
- url: `sccg/dispatch_handle/dispatch`,
- data: dispatch,
- }).then((res) => {
- this.$message({
- type: res.code === 200 ? "success" : "error",
- message: res.code === 200 ? "璋冨害鎴愬姛" : res.message,
+ if (this.isGetDispatchData) {
+ this.$emit('getDispatchData', this.dispatch);
+ } else {
+ const { dispatch, id } = this;
+ dispatch.baseCaseId = id;
+ this.$axios({
+ method: "post",
+ url: `sccg/dispatch_handle/dispatch`,
+ data: dispatch,
+ }).then((res) => {
+ this.$message({
+ type: res.code === 200 ? "success" : "error",
+ message: res.code === 200 ? "璋冨害鎴愬姛" : res.message,
+ });
+ this.refresh();
});
- this.$emit("changeDialog", { flag: false });
- this.refresh();
- });
+ }
+ this.$emit("changeDialog", { flag: false });
} else {
- return false;
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
});
},
@@ -303,7 +267,6 @@
url: `sccg/car_Manage/query_enforce?current=1&size=1000`,
}).then((res) => {
this.carOptions = res.data.records;
- console.log(res, this.carOptions);
});
},
// 鑾峰彇娓ｅ湡杞﹁締
@@ -326,7 +289,6 @@
},
// 鑾峰彇涓槦
async getTeamList(id) {
- console.log(id);
await this.$axios({
method: "get",
url: `sccg/depart/query_father_children?fatherId=${id}`,
@@ -335,12 +297,10 @@
this.squadronOptions = res.data;
})
.catch((err) => {
- console.log(err);
});
},
// 鑾峰彇閮ㄩ棬涓嬬殑鐢ㄦ埛
async getDepartUserList(id) {
- console.log(id);
await this.$axios({
method: "get",
url: `sccg/admin/getDepartUser/${id}`,
@@ -372,9 +332,6 @@
this.dispatch.contactWay = "";
this.dispatch.lawEnforcerName = "";
await this.getTeamList(id);
- // if (this.squadronOptions.length === 0) {
- // await this.getDepartUserList(id);
- // }
},
// 涓槦鏇存敼
async handleMidChange(id) {
@@ -404,9 +361,7 @@
watch: {
"squadronOptions.length": {
handler(newval, oldval) {
- console.log(newval);
if (newval === 0) {
- console.log(1);
this.$message({
type: "warning",
message: "璇ラ儴闂ㄤ笅娌℃湁涓槦",
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index 003ab5e..15ae865 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -85,6 +85,7 @@
this.loading = false;
})
.catch(err => {
+ this.loading = false;
this.$message.error(err);
})
},
diff --git a/src/http/url-recorder.js b/src/http/url-recorder.js
index a79d433..0c05e15 100644
--- a/src/http/url-recorder.js
+++ b/src/http/url-recorder.js
@@ -20,7 +20,6 @@
// 濡傛灉璇锋眰杩樺湪闃熷垪閲岋紝璇存槑杩樺湪澶勭悊锛屾病鏈夊洖鍖�
if (this.urlList.includes(url)) {
const errorMessage = `璇锋眰 ${url} 姝ｅ湪澶勭悊锛岃绋嶅悗鍐嶈瘯锛乣
- console.error(errorMessage)
const error = {
status: {
code: 1007, // 涓存椂鍐欑殑
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 63dc317..f0c9402 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -31,7 +31,7 @@
<span>鎶ヨ璁板綍</span>
<span>涔卞仠涔辨斁杩濇硶鍗犻亾</span>
</div>
- <el-form ref="currentEvent" label-width="120px" :model="currentEvent" :rules="rules">
+ <el-form ref="currentEvent" label-width="120px" :model="eventInfoData" :rules="rules">
<el-form-item label="浜嬩欢缂栧彿:">
<span>{{ currentEvent.code }}</span>
</el-form-item>
@@ -47,25 +47,37 @@
<el-form-item label="鎸佺画鏃堕棿:">
<span>{{ currentEvent.conntinueTime }}</span>
</el-form-item>
+ <el-form-item label="鍏宠仈搴楅摵" prop="store">
+ <el-select v-model="eventInfoData.store" @change="selectStoreChange" placeholder="璇烽�夋嫨鍏宠仈搴楅摵">
+ <el-option v-for="store in storeList" :value="store.id" :label="store.storeName" :key="store.id" />
+ </el-select>
+ </el-form-item>
+ <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="currentEvent.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-radio-group>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:" prop="categoryId">
- <el-input v-model="currentEvent.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О"></el-input>
+ <el-select v-model="eventInfoData.categoryId" placeholder="璇烽�夋嫨澶х被鍚嶇О" @change="categoryChange">
+ <el-option v-for="category in categoryOptions" :key="category.id" :value="category.id" :label="category.name" />
+ </el-select>
</el-form-item>
<el-form-item label="灏忕被鍚嶇О:" prop="typeId">
- <el-input v-model="currentEvent.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О"></el-input>
+ <el-select v-model="eventInfoData.typeId" placeholder="璇烽�夋嫨灏忕被鍚嶇О">
+ <el-option v-for="type in typeOptions" :key="type.id" :value="type.id" :label="type.name" />
+ </el-select>
</el-form-item>
<el-form-item label="杞︾墝鍙�:" prop="carNumber">
- <el-input v-model="currentEvent.carNumber" placeholder="璇峰～鍐欒溅鐗屽彿鐮�"></el-input>
+ <el-input v-model="eventInfoData.carNumber" placeholder="璇峰～鍐欒溅鐗屽彿鐮�"></el-input>
</el-form-item>
<el-form-item label="澶囨敞:" prop="description">
- <el-input type="textarea" :rows="5" v-model="currentEvent.description"></el-input>
+ <el-input type="textarea" :rows="5" v-model="eventInfoData.description"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="pageChange('prev')">涓婁竴鏉�</el-button>
+ <el-button :disabled="currentPage === 1" @click="pageChange('prev')">涓婁竴鏉�</el-button>
<el-button @click.native.prevent="handleConfirm">纭</el-button>
<el-button @click="pageChange('next')">涓嬩竴鏉�</el-button>
</el-form-item>
@@ -74,23 +86,63 @@
</div>
</div>
</div>
+ <el-dialog :visible="isShowDialog" title="璋冨害淇℃伅">
+ <MyDispatch v-if="isShowDialog" :mytype="1" @confirmInspection="handleConfirm" :isGetData="true" @changeDialog="closeDialog"></MyDispatch>
+ </el-dialog>
</div>
</template>
<script>
import basecase from "@/api/operate/basecase";
+import baseInfo from "@/api/baseInfo";
+import { getStoreInfoList } from "@/api/operate/storeManagement";
import { FILE_ORIGINAL_URL } from "@/utils";
+import { validateCarNum } from "@/utils/validate";
+import MyDispatch from '@/components/dispatch';
export default {
+ components: { MyDispatch },
created() {
this.getInspectionData();
+ this.initEventParams();
basecase.getInspectionCountData()
.then(res => {
this.countData = res;
})
.catch(err => this.$message.error(err))
+
+ getStoreInfoList({ current: 1, size: 100 })
+ .then(({ list }) => {
+ this.storeList = list;
+ })
+ .catch(err => {
+ this.$message.error(err)
+ })
+
+ baseInfo.getCategoryList()
+ .then(res => {
+ this.categoryOptions = res;
+ })
+ .catch(err => this.$message.error(err))
+
+ baseInfo.getTypeList()
+ .then(res => {
+ this.typeList = res;
+ })
+ .catch(err => this.$message.error(err))
},
data() {
+ const validateCarNumber = (rule, value, callback) => {
+ if (value) {
+ if (validateCarNum(value)) {
+ callback();
+ } else {
+ callback(new Error('璇疯緭鍏ユ纭殑杞︾墝鍙�'));
+ }
+ } else {
+ callback();
+ }
+ };
return {
eventList: [],
countData: {
@@ -99,11 +151,11 @@
currentEvent: {},
adviceList: [
{
- id: 1,
+ id: 2,
label: '涓婃姤',
},
{
- id: 2,
+ id: 6,
label: '璋冨害',
},
{
@@ -115,6 +167,7 @@
label: '鏆備笉澶勭悊',
},
],
+ eventInfoData: null,
rules:{
advice:[
{
@@ -131,41 +184,35 @@
required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖'
}
],
- carNumber:[
- {
- required: true, trigger:['blur', 'change'], message: '杞︾墝鍙蜂笉鑳戒负绌�'
- }
- ]
+ carNumber:[{ trigger:['blur', 'change'], validator: validateCarNumber }]
},
imageList: [],
- currentPage: 1
+ currentPage: 1,
+ categoryOptions: [],
+ typeOptions: [],
+ storeList: [],
+ typeList: [],
+ isShowDialog: false
}
},
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];
+ this.getInspectionData();
},
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];
+ this.currentEvent = this.eventList[0];
+ if (this.currentEvent?.picData) {
+ this.imageList = this.currentEvent.picData.split(',').map(item => `${FILE_ORIGINAL_URL}${item}`);
+ }
})
.catch(err => this.$message.error(err))
},
@@ -174,16 +221,57 @@
handleConfirm(){
this.$refs.currentEvent.validate((flag)=>{
if(flag){
- basecase.confirmInspection(this.currentEvent)
- .then(() => {
- this.$message.success('鎿嶄綔鎴愬姛');
- this.getInspectionData();
- })
- .catch(err => this.$message.error(err))
+ this.eventInfoData.baseId = this.currentEvent.code;
+
+ // 璋冨害
+ if (this.eventInfoData.advice === 6) {
+ this.isShowDialog = true;
+ } else {
+ this.confirmInspection();
+ }
} else {
- this.$message.warning('璇锋鏌ュ繀濉」')
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
})
+ },
+
+ initEventParams() {
+ this.eventInfoData = {
+ baseId: null,
+ store: null,
+ advice: null,
+ categoryId: null,
+ typeId: null,
+ carNumber: null,
+ description: null,
+ linkShop: 0,
+ shopName: null
+ }
+ },
+
+ categoryChange(id) {
+ this.typeOptions = this.typeList.filter(type => type.parentId === id);
+ },
+
+ confirmInspection(data) {
+ basecase.confirmInspection({ ...this.eventInfoData, ...data })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getInspectionData();
+ this.initEventParams();
+ })
+ .catch(err => this.$message.error(err))
+ },
+
+ closeDialog() {
+ this.isShowDialog = false;
+ },
+
+ selectStoreChange(id) {
+ const selectedStore = this.storeList.find(store => store.id === id);
+ this.eventInfoData.shopName = selectedStore.storeName;
+ this.eventInfoData.linkShop = 1;
+ return selectedStore;
}
}
}
diff --git a/src/views/layout/components/Header/updatePassword/index.vue b/src/views/layout/components/Header/updatePassword/index.vue
index 50782be..6a7d481 100644
--- a/src/views/layout/components/Header/updatePassword/index.vue
+++ b/src/views/layout/components/Header/updatePassword/index.vue
@@ -53,7 +53,6 @@
this.updatePasswordParam.oldPassword=this.password.oldPassword;
this.updatePasswordParam.username=sessionStorage.getItem('name');
this.updatePasswordParam.newPassword=this.password.newPassword;
- console.log(this.updatePasswordParam);
users.updatePassword(this.updatePasswordParam)
.then(() => {
this.$message.success('淇敼瀵嗙爜鎴愬姛, 鍗冲皢閲嶆柊鐧诲綍');
diff --git a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
index db5f524..82867d6 100644
--- a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
@@ -67,7 +67,6 @@
parentId:'',
level:'',
},
- parentList: [],
createIll: {
name: [
{ required: true, trigger: 'blur', validator: checkName }
@@ -128,9 +127,7 @@
},
// 鎻愪氦鏂板杩濊绫诲瀷
handleSubmit() {
- console.log(this.things);
this.$refs.user.validate((valid) => {
- console.log(valid);
if (valid) {
const { things,selectOrg } = this;
this.$axios({
@@ -171,25 +168,10 @@
}else{
this.parentList = await this.getTypeThird()
- // this.parentList = this.addChildren(await this.getTypeThird(), await this.getTypeSecond());
}
},
- // addChildren(parentArr, childArr) {
- // // console.log(parentArr.length,childArr);
- // parentArr.forEach(item => {
- // item.children = [];
- // childArr.forEach(child => {
- // if (item.id === child.parentId) {
- // item.children.push(child);
- // }
- // })
- // })
- // console.log(parentArr);
- // return parentArr;
- // },
handleCheck(data, checked) {
this.things.parentId = data.name;
- console.log(this.selectOrg.orgsid);
// 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
const indexs = this.selectOrg.orgsid.indexOf(data.id)
// 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
@@ -225,7 +207,6 @@
background-color: #09152f;
main {
- // border: 1px solid #fff;
text-align: left;
padding: 0 55px;
background-color: #09152f;
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index 8f88253..401bc81 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -128,7 +128,6 @@
methods: {
// 鎵归噺鍒犻櫎
mulDelete(idArr){
- console.log(idArr);
this.$axios({
method:'delete',
url:'sccg/illegal_building/batch_delete?ids='+idArr,
@@ -160,11 +159,7 @@
// 鐩戝惉琛ㄦ牸閫変腑鐘舵��
tableChange(list) {
this.tempList = list;
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -178,10 +173,8 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/illegal_building/delete?id=${number}`,
@@ -195,7 +188,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -212,12 +205,11 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
@@ -280,7 +272,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -330,7 +321,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
diff --git a/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue b/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
index 46efb62..709f456 100644
--- a/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/updateUser/index.vue
@@ -44,7 +44,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeFirst();
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index 23c156b..a388ff3 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -133,7 +133,6 @@
methods: {
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
this.$axios({
method: 'delete',
url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -183,10 +182,8 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
@@ -200,7 +197,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -215,37 +212,7 @@
this.totalNum = res.data.total;
})
},
- // search() {
- // const that = this;
- // const { currentPage, pageSize, context } = this;
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // if (context == '') {
- // this.$axios.get('sccg/role/list?keyword=' + '&pageNum=' + currentPage + '&pageSize=' + pageSize).then(res => {
- // if (res.code === 200) {
- // console.log(res);
- // res.data.list.forEach(item => {
- // // item.createTime = helper(item.createTime);
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list;
- // this.totalNum = res.data.list.length;
- // }
- // })
- // } else {
- // this.$axios({
- // method: 'get',
- // url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
- // }).then(res => {
- // if (res.code === 200) {
- // res.data.list.forEach(item => {
- // item.status == 1 ? item.status = true : item.status = false;
- // })
- // that.tableData = res.data.list
- // this.totalNum = res.data.list.length;
- // }
- // })
- // }
- // },
+
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -318,7 +285,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -368,7 +334,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
diff --git a/src/views/operate/baseSetting/violation/updateUser/index.vue b/src/views/operate/baseSetting/violation/updateUser/index.vue
index 87c85db..54388c3 100644
--- a/src/views/operate/baseSetting/violation/updateUser/index.vue
+++ b/src/views/operate/baseSetting/violation/updateUser/index.vue
@@ -66,7 +66,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeThird();
@@ -74,25 +73,6 @@
this.getTypeFirst();
},
methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { flag: false });
- // })
- // } else {
- // return false;
- // }
- // })
- // },
// 鏌ヨ鎵�灞炵被鍨�
getTypeThird() {
this.$axios({
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index c3dec03..7300527 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -262,7 +262,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
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 d284d3d..ecd2735 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
@@ -108,9 +108,7 @@
} else {
evidenceForm.validate((flag) => {
if (!flag) {
- console.log(bookForm);
bookForm.validate((bookFlag) => {
- console.log(bookFlag);
if (!bookFlag) {
return false;
}
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
index d5d5793..b81e0c5 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -338,19 +338,15 @@
methods: {
handleUser() {
const that = this;
- // console.log(this.$refs);
this.$refs.user.validate((valid) => {
- console.log(valid)
if (valid) {
that.$refs.condition.validate((flag) => {
- console.log(flag);
if (flag) {
const { ill } = this;
ill.buildingLength = parseFloat(ill.buildingLength);
ill.buildingHigh = parseFloat(ill.buildingHigh);
ill.buildingWidth = parseFloat(ill.buildingWidth);
ill.buildingArea = parseFloat(ill.buildingArea);
- console.log(ill);
that.$axios({
method: 'post',
url: 'sccg/base-case/addition_illegal_building',
@@ -389,7 +385,6 @@
url: 'sccg/illegal_building/query/type_second'
}).then(res => {
this.bigKindList = res.data;
- // console.log(res);
})
},
// 鑾峰彇琛屾斂鍖哄煙
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/index.vue
index 5fbe248..177f658 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/index.vue
@@ -21,7 +21,7 @@
.then(_ => {
this.$emit('getPageProp',{flag:false,type:idx});
})
- .catch(_ => { console.log('err') });
+ .catch(_ => { });
}
},
props:['getPageProp']
diff --git a/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue b/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue
index bb39826..568e128 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue
@@ -299,7 +299,6 @@
},
created() {
const { getBigKind, getEventLevel, getSmallKind } = this;
- console.log(this.mytype);
this.vio.category = this.mytype + 1;
getBigKind();
getSmallKind();
@@ -316,7 +315,6 @@
url: 'sccg/violations/query/type_first'
}).then(res => {
this.bigKindList = res.data;
- // console.log(res);
})
},
// 鑾峰彇灏忕被鍒楄〃
@@ -354,7 +352,6 @@
this.$refs.user.validate((valid) => {
if (valid) {
const { vio } = this;
- console.log(vio);
this.$axios({
method: 'post',
url: 'sccg/base-case/addition_violation',
diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue
index 0df69ef..36f0d2a 100644
--- a/src/views/operate/disposal/casepool/escalation/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/index.vue
@@ -279,7 +279,6 @@
},
methods: {
setMystatus(value) {
- console.log(value);
this.statusArr[1] = value;
this.changeTypeChecked(value - 1);
this.getUserList();
@@ -291,7 +290,6 @@
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr instanceof Array);
const { statusArr } = this;
this.$confirm("鎮ㄧ‘瀹氳鎵归噺鍒犻櫎妗堜欢鍚�?")
.then((_) => {
@@ -318,12 +316,10 @@
});
})
.catch((err) => {
- console.log(err);
});
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -418,11 +414,7 @@
// 鏇存敼涓�绾ф爣绛剧殑閫変腑
changeNavChecked(idx) {
this.tagList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
});
this.typeList[0].checked = true;
this.typeList[1].checked = false;
@@ -433,11 +425,7 @@
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
});
this.mystatus = idx + 1;
this.statusArr[1] = this.typeList[idx].value;
@@ -448,7 +436,6 @@
},
// 鑾峰彇妗堜欢淇℃伅
getEventInfo(code) {
- console.log("鑾峰彇鍏蜂綋妗堜欢淇℃伅", code);
this.$axios({
method: "get",
url: `sccg/base_case/baseCaseDetail/${code}`,
@@ -471,7 +458,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -540,7 +526,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
diff --git a/src/views/operate/disposal/casepool/escalation/updateUser/index.vue b/src/views/operate/disposal/casepool/escalation/updateUser/index.vue
index 5b0cf9a..af514e0 100644
--- a/src/views/operate/disposal/casepool/escalation/updateUser/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/updateUser/index.vue
@@ -66,7 +66,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeThird();
@@ -74,26 +73,6 @@
this.getTypeFirst();
},
methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
- // })
- // } else {
- // return false;
- // }
- // })
- // },
// 鏌ヨ鎵�灞炵被鍨�
getTypeThird() {
this.$axios({
diff --git a/src/views/operate/disposal/casepool/learn/createUser/index.vue b/src/views/operate/disposal/casepool/learn/createUser/index.vue
index b609337..bc793f3 100644
--- a/src/views/operate/disposal/casepool/learn/createUser/index.vue
+++ b/src/views/operate/disposal/casepool/learn/createUser/index.vue
@@ -66,7 +66,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeThird();
@@ -74,26 +73,6 @@
this.getTypeFirst();
},
methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
- // })
- // } else {
- // return false;
- // }
- // })
- // },
// 鏌ヨ鎵�灞炵被鍨�
getTypeThird() {
this.$axios({
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index 8156c64..a15e0d3 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -79,7 +79,7 @@
<!-- 璇︽儏椤靛睍绀� -->
<el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
:before-close="handleClose">
- <MyDetail :info=info v-if="mystatus==1 ? true:false"></MyDetail>
+ <MyDetail :info=info v-if="mystatus === 1"></MyDetail>
<MyIllDetail :info=info v-else></MyIllDetail>
</el-dialog>
<!-- 涓婁紶椤甸潰 -->
@@ -117,7 +117,6 @@
</div>
</template>
<script>
-// import updateUser from "./updateUser"
import uploadVio from './updateUser/uploadResult/vio'
import uploadIll from "./updateUser/uploadResult/ill"
import MyDetail from '@/components/detail'
@@ -125,7 +124,6 @@
import helper from '@/utils/mydate'
export default {
components: {
- // updateUser,
uploadVio, uploadIll, MyDetail, MyIllDetail
},
data() {
@@ -191,14 +189,12 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- console.log(value);
this.statusArr[1] = value;
this.changeTypeChecked(value - 1);
this.getUserList();
},
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
this.$axios({
method: 'delete',
url: 'sccg/violations/batch_delete?ids=' + idArr,
@@ -212,7 +208,6 @@
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -232,11 +227,7 @@
list.forEach(item => {
this.tempList.push(item.code);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -250,10 +241,8 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
@@ -267,7 +256,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -283,11 +272,7 @@
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = idx + 1;
this.statusArr[1] = this.typeList[idx].value;
@@ -295,12 +280,11 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
@@ -340,14 +324,9 @@
this.dialogView = true;
})
},
- // opernDialog(data){
- // this.dialogUpload = true;
- // this.caseId = data.id;
- // // console.log(data);
- // },
+
// 閲嶆柊澶勭疆
handleReset({ id }) {
- console.log(id);
this.$axios({
method: 'put',
url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=0'
@@ -385,7 +364,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -440,7 +418,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover {
cursor: pointer;
diff --git a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
index 11e6d42..b53da31 100644
--- a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue
@@ -465,9 +465,7 @@
},
// 妫�楠寀ser
checkUser() {
- // console.log(this.$refs.userForm.validate);
this.$refs.userForm.validate((valid) => {
- console.log(valid);
if (valid) {
this.evidence.userInfo = true;
this.userFlag = false;
diff --git a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/ill/index.vue
index b74dfdb..5ae654b 100644
--- a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/ill/index.vue
@@ -28,7 +28,6 @@
},
props:['caseId'],
created(){
- console.log(this.caseId);
},
methods:{
handleSubmit(){
diff --git a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue
index f106521..c94da14 100644
--- a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue
@@ -25,20 +25,16 @@
},
props: ['caseId', 'closeDialog'],
created() {
- console.log(this.caseId);
},
methods: {
handleSubmit() {
const { arrive, evidence } = this.$refs;
const { arriveForm } = arrive.$refs;
const { evidenceForm } = evidence.$refs;
- // console.log(evidence.$refs);
arriveForm.validate((valid) => {
- // console.log(valid);
if (valid) {
evidenceForm.validate((flag) => {
if (flag) {
- // arrive.arrive;evidence.user;evidence.evidence;
this.$axios({
method: 'post',
url: `sccg/dispatch_handle/addition_dispose_result/${this.caseId}/${1}`,
@@ -101,11 +97,9 @@
},
// 鑾峰緱arrive鐨勪俊鎭�
getArrive(obj) {
- console.log(obj);
},
// 鑾峰緱evidence瀵硅薄
getEvidence(obj) {
- console.log(obj);
}
}
}
diff --git a/src/views/operate/disposal/casepool/notDeal/createUser/index.vue b/src/views/operate/disposal/casepool/notDeal/createUser/index.vue
index b609337..bc793f3 100644
--- a/src/views/operate/disposal/casepool/notDeal/createUser/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/createUser/index.vue
@@ -66,7 +66,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeThird();
@@ -74,26 +73,6 @@
this.getTypeFirst();
},
methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
- // })
- // } else {
- // return false;
- // }
- // })
- // },
// 鏌ヨ鎵�灞炵被鍨�
getTypeThird() {
this.$axios({
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index 377b70c..51c8459 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -182,14 +182,12 @@
methods: {
// 椤堕儴涓嬫媺妗�
setMystatus(value) {
- console.log(value);
this.statusArr[1] = value;
this.changeTypeChecked(value - 1);
this.getUserList();
},
// 鎵归噺鍒犻櫎
mulDelete(idArr){
- console.log(idArr);
this.$axios({
method:'delete',
url:'sccg/violations/batch_delete?ids='+idArr,
@@ -203,7 +201,6 @@
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -237,10 +234,8 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
@@ -254,7 +249,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -315,11 +310,9 @@
opernDialog(data){
this.dialogUpload = true;
this.caseId = data.id;
- // console.log(data);
},
// 閲嶆柊澶勭疆
handleReset({id}){
- console.log(id);
this.$axios({
method:'put',
url:'sccg/base_case/case_status_update?caseId='+id+'&state=0'
diff --git a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
index 11e6d42..b53da31 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue
@@ -465,9 +465,7 @@
},
// 妫�楠寀ser
checkUser() {
- // console.log(this.$refs.userForm.validate);
this.$refs.userForm.validate((valid) => {
- console.log(valid);
if (valid) {
this.evidence.userInfo = true;
this.userFlag = false;
diff --git a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/ill/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/ill/index.vue
index b74dfdb..5ae654b 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/ill/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/ill/index.vue
@@ -28,7 +28,6 @@
},
props:['caseId'],
created(){
- console.log(this.caseId);
},
methods:{
handleSubmit(){
diff --git a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
index f84672e..ac6b854 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue
@@ -71,11 +71,9 @@
},
// 鑾峰緱arrive鐨勪俊鎭�
getArrive(obj) {
- console.log(obj);
},
// 鑾峰緱evidence瀵硅薄
getEvidence(obj) {
- console.log(obj);
}
}
}
diff --git a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
index 2dfa4c7..10a2eff 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -459,15 +459,12 @@
},
// 琛楅亾鏇存敼
handleStreet(id) {
- console.log(id);
this.ill.communityId = '';
- // this.communityList = getcommunityList(1,'11')
this.$axios({
method: 'get',
url: `sccg/sccg_region/getChildren/${id}`
})
.then(res => {
- console.log(res.data)
this.communityList = res.data;
})
},
diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index 2786350..76f4ea6 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -51,14 +51,6 @@
</el-option>
</el-select>
</el-form-item>
- <!-- 鎵�灞炲尯鍘� -->
- <!-- <el-form-item class="optionItems" label="鎵�灞炲尯鍘�:" prop="status">
- <el-select v-model="vio.type" placeholder="璇烽�夋嫨鎵�灞炲尯鍘�">
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </el-form-item> -->
<div class="user-item">
<!-- 鎵�灞炶閬� -->
<el-form-item class="optionItems" label="鎵�灞炶閬�:" prop="streetId">
@@ -395,7 +387,6 @@
},
created() {
const { setBigKindList, getStreetList, getEventLevel } = this;
- console.log(this.mytype);
this.vio.category = this.mytype + 1;
setBigKindList();
getStreetList(0);
@@ -426,7 +417,6 @@
return item;
}
})
- console.log(this.anYouList);
},
// 鏌ヨ澶х被鍒楄〃
async getBigKind() {
@@ -522,9 +512,7 @@
},
// 琛楅亾鏇存敼
handleStreet(id) {
- console.log(id);
this.vio.communityId = '';
- // this.communityList = getTypeList(1,'11')
this.$axios({
method: 'get',
url: `sccg/sccg_region/getChildren/${id}`
@@ -552,7 +540,6 @@
selectBlur(e) {
if (e.target.value) {
this.vio.actionCause = e.target.value;
- console.log(e.target.value);
}
}
},
diff --git a/src/views/operate/lawEnforcement/components/dataView/index.vue b/src/views/operate/lawEnforcement/components/dataView/index.vue
index 75fc658..a672a44 100644
--- a/src/views/operate/lawEnforcement/components/dataView/index.vue
+++ b/src/views/operate/lawEnforcement/components/dataView/index.vue
@@ -15,7 +15,6 @@
default:{},
},
created(){
- console.log(this.viewData);
}
}
</script>
diff --git a/src/views/operate/lawEnforcement/index.vue b/src/views/operate/lawEnforcement/index.vue
index 0ad9323..c4d86f2 100644
--- a/src/views/operate/lawEnforcement/index.vue
+++ b/src/views/operate/lawEnforcement/index.vue
@@ -153,7 +153,6 @@
},
methods: {
search() {
- console.log('search');
},
reset() {
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index d04c32d..d66a448 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -301,7 +301,6 @@
}
})
.catch((err) => {
- console.log(err);
});
} else {
return false;
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index 329b471..fdeae01 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -174,7 +174,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
}else{
return false;
}
diff --git a/src/views/operate/management/myIndex/components/illExamine/index.vue b/src/views/operate/management/myIndex/components/illExamine/index.vue
index 4720bd3..3c5bebe 100644
--- a/src/views/operate/management/myIndex/components/illExamine/index.vue
+++ b/src/views/operate/management/myIndex/components/illExamine/index.vue
@@ -172,7 +172,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
}else{
return false;
}
diff --git a/src/views/operate/management/myIndex/components/illclosure/index.vue b/src/views/operate/management/myIndex/components/illclosure/index.vue
index f329e49..a00e63a 100644
--- a/src/views/operate/management/myIndex/components/illclosure/index.vue
+++ b/src/views/operate/management/myIndex/components/illclosure/index.vue
@@ -305,7 +305,7 @@
}
})
.catch((err) => {
- console.log(err);
+
});
} else {
return false;
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 0a9c456..a2c15c5 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -231,7 +231,6 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
this.$axios({
@@ -247,7 +246,7 @@
this.getUserList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
@@ -391,7 +390,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover{
cursor: pointer;
}
diff --git a/src/views/operate/message/mycontrol/createUser/index.vue b/src/views/operate/message/mycontrol/createUser/index.vue
index 061e046..34c8851 100644
--- a/src/views/operate/message/mycontrol/createUser/index.vue
+++ b/src/views/operate/message/mycontrol/createUser/index.vue
@@ -40,10 +40,6 @@
if (value) {
callback();
} else {
- // const rep = /^[\u4E00-\u9FA5]{2,4}$/;
- // if (!rep.test(value)) {
- // callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
- // }
callback();
}
};
@@ -103,21 +99,6 @@
handleCancel(){
this.$emit('closeDialog',{flag:false,index:0});
}
- // 鑾峰彇鍒涘缓鐢ㄦ埛淇℃伅
- // async getCreaterInfo(){
- // let id;
- // const name = sessionStorage.getItem('name');
- // await this.$axios({
- // method:'get',
- // url:'sccg/admin/info?name='+'name'
- // })
- // .then(res=>{
- // console.log(res);
- // if(res.code ===200){
-
- // }
- // })
- // }
},
props: ['closeDialog']
}
diff --git a/src/views/operate/myWait/updateUser/index.vue b/src/views/operate/myWait/updateUser/index.vue
index cd456e9..af514e0 100644
--- a/src/views/operate/myWait/updateUser/index.vue
+++ b/src/views/operate/myWait/updateUser/index.vue
@@ -73,26 +73,6 @@
this.getTypeFirst();
},
methods: {
- // handleUser() {
- // this.$refs.user.validate((valid) => {
- // if (valid) {
- // const { role } = this;
- // console.log(role);
- // this.$axios.post('/sccg/role/update/' + role.id, {
- // id: role.id,
- // status: role.status,
- // description: role.description,
- // name: role.name,
- // sort: 0
- // }).then(res => {
- // this.$emit('changeDialog', { dialogUpdate: false });
- // this.getUserList();
- // })
- // } else {
- // return false;
- // }
- // })
- // },
// 鏌ヨ鎵�灞炵被鍨�
getTypeThird() {
this.$axios({
diff --git a/src/views/operate/rectification/renovationList/index.vue b/src/views/operate/rectification/renovationList/index.vue
index 8fdf4bb..2085b17 100644
--- a/src/views/operate/rectification/renovationList/index.vue
+++ b/src/views/operate/rectification/renovationList/index.vue
@@ -225,27 +225,10 @@
// 鍒犻櫎绗笁鏂规帴鍙�
handleDelete({ id }) {
this.dialogUpdate=true;
- console.log(id);
}
- // // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
- // changeCurrentPage(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓婁竴椤电偣鍑讳簨浠�
- // handlePrev(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓嬩竴椤电偣鍑讳簨浠�
- // handleNext(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
}
}
</script>
-<!-- sccg/system/portal/thirdApp/search -->
<style lang="scss" scoped>
.otherInterface {
header {
diff --git a/src/views/operate/rectification/surveyList/components/createInterface/index.vue b/src/views/operate/rectification/surveyList/components/createInterface/index.vue
index 57dd333..e7ea873 100644
--- a/src/views/operate/rectification/surveyList/components/createInterface/index.vue
+++ b/src/views/operate/rectification/surveyList/components/createInterface/index.vue
@@ -165,34 +165,18 @@
methods: {
// 鍏抽棴寮圭獥
handleCancel() {
- console.log(1);
this.$emit("closeDialog", { flag: false, index: 0 });
},
//淇濆瓨
handleSave() {
const { myInterface } = this;
this.$refs.survey.validate((flag)=>{
- console.log(flag)
if(flag){
}else{
return false
}
})
- // this.$axios
- // .post("sccg/system/portal/thirdApp/add", {
- // websiteUrl: myInterface.websiteUrl,
- // applicationIconUrl: myInterface.applicationIconUrl,
- // applicationType: 0,
- // description: myInterface.description,
- // applicationName: myInterface.applicationName,
- // })
- // .then((res) => {
- // console.log(res);
- // // if (res.code === 200) {
- // // this.refresh();
- // // }
- // });
},
},
props: ['refresh','closeDialog'],
diff --git a/src/views/operate/rectification/surveyList/index.vue b/src/views/operate/rectification/surveyList/index.vue
index 3ec0dfc..0a967d2 100644
--- a/src/views/operate/rectification/surveyList/index.vue
+++ b/src/views/operate/rectification/surveyList/index.vue
@@ -214,19 +214,16 @@
.catch((_) => {});
},
closeDialog({ flag, index }) {
- console.log(flag);
index === 1 ? "" : "";
this.dialogCreate = flag;
},
// 鍒涘缓鏌ョ湅寮圭獥
handleView(rowData) {
- console.log(rowData);
this.userInfo = rowData;
this.dialogUpdate = true;
},
// 鍒犻櫎绗笁鏂规帴鍙�
handleDelete({ id }) {
- console.log(id);
this.$axios
.delete("sccg/system/portal/thirdApp/delete", {
params: {
diff --git a/src/views/operate/viewEvent/components/closure/index.vue b/src/views/operate/viewEvent/components/closure/index.vue
index a43287f..aeb2684 100644
--- a/src/views/operate/viewEvent/components/closure/index.vue
+++ b/src/views/operate/viewEvent/components/closure/index.vue
@@ -220,7 +220,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
} else {
return false;
}
diff --git a/src/views/operate/viewEvent/components/examine/index.vue b/src/views/operate/viewEvent/components/examine/index.vue
index 3ca352b..0eb5df1 100644
--- a/src/views/operate/viewEvent/components/examine/index.vue
+++ b/src/views/operate/viewEvent/components/examine/index.vue
@@ -181,7 +181,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
}else{
return false;
}
diff --git a/src/views/operate/viewEvent/components/illExamine/index.vue b/src/views/operate/viewEvent/components/illExamine/index.vue
index 9f88b7a..a473092 100644
--- a/src/views/operate/viewEvent/components/illExamine/index.vue
+++ b/src/views/operate/viewEvent/components/illExamine/index.vue
@@ -181,7 +181,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
}else{
return false;
}
diff --git a/src/views/operate/viewEvent/components/illclosure/index.vue b/src/views/operate/viewEvent/components/illclosure/index.vue
index 7e3913a..8c9f954 100644
--- a/src/views/operate/viewEvent/components/illclosure/index.vue
+++ b/src/views/operate/viewEvent/components/illclosure/index.vue
@@ -208,7 +208,7 @@
}
})
- .catch(err => { console.log(err) });
+ .catch(err => { });
} else {
return false;
}
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 27d6f79..24ec25a 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -80,7 +80,7 @@
>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-link>{{ scope.row.code }}</el-link>
+ <el-link @click="handleView(scope.row)">{{ scope.row.code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="8">
@@ -289,9 +289,15 @@
closeDialog({ flag }) {
this.dialogExamine = flag;
this.dialogClosure = flag;
+ this.dialogView = false;
this.getList();
},
+ async handleView(rowData) {
+ this.info = await casequery.getBaseCaseDetail(rowData.code);
+ this.dialogView = true;
+ },
+
filterTime(time) {
return helper(time);
},
diff --git a/src/views/systemSetting/device/grid/components/header/index.vue b/src/views/systemSetting/device/grid/components/header/index.vue
index f92bea3..7bdc495 100644
--- a/src/views/systemSetting/device/grid/components/header/index.vue
+++ b/src/views/systemSetting/device/grid/components/header/index.vue
@@ -36,7 +36,6 @@
this.$emit('getSearch', { text: this.search })
},
sendDialog(flag) {
- console.log(flag);
this.dialogCreate = flag.flag;
this.$emit('setDialog', { flag: true })
},
@@ -55,7 +54,6 @@
<style lang="scss" scoped>
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index aae572d..9317de6 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -130,7 +130,6 @@
},
methods: {
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -154,15 +153,10 @@
list.forEach(item => {
this.tempList.push(item.id);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
mulDelte(idArr) {
- console.log(idArr);
this.$confirm("鎮ㄧ‘瀹氳杩涜鎵归噺鍒犻櫎鐢ㄦ埛鍚�?")
.then(_ => {
this.$axios({
@@ -184,11 +178,10 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 鎵归噺淇敼璐﹀彿
mulUpdateStatus(idArr, flag) {
- console.log(flag);
this.$confirm(flag === 1 ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤鐢ㄦ埛鍚�?" : '鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤鐢ㄦ埛鍚�?')
.then(_ => {
this.$axios({
@@ -210,7 +203,7 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
changeTime({ createTime }) {
return helper(createTime);
@@ -275,7 +268,7 @@
this.dialogUpdate = true;
this.updateFlag = true;
for (let key in this.flag) {
- if (key == mykey) {
+ if (key === mykey) {
this.flag[key] = true;
} else {
this.flag[key] = false;
@@ -286,7 +279,7 @@
// 淇敼鐢ㄦ埛鐘舵��
handleChangeStatus(obj) {
let { id, status } = obj;
- status == true ? status = 1 : status = 0;
+ status === true ? status = 1 : status = 0;
this.$axios.post(`sccg/admin/updateStatus/` + id + '?status=' + status).then(res => {
})
},
@@ -298,7 +291,7 @@
this.$axios.get(`sccg/admin/list?keyword=${search}¤t=${currentPage}&pageSize=${pageSize}`).then(res => {
if (res.code === 200) {
res.data.records.forEach(item => {
- item.status == 1 ? item.status = true : item.status = false;
+ item.status === 1 ? item.status = true : item.status = false;
})
that.totalNum = res.data.total;
that.tableData = res.data.records;
@@ -313,12 +306,11 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 澶勭悊鐢ㄦ埛鎵�灞炶鑹�
filterRole(arr){
@@ -342,9 +334,9 @@
watch: {
refresh: {
handler(newValue, oldValue) {
- if (newValue == true) {
+ if (newValue) {
this.search = '';
- if (this.keyword != '') {
+ if (this.keyword !== '') {
this.search = this.keyword;
}
this.currentPage = 1;
diff --git a/src/views/systemSetting/device/grid/index.vue b/src/views/systemSetting/device/grid/index.vue
index b63edc5..156d55f 100644
--- a/src/views/systemSetting/device/grid/index.vue
+++ b/src/views/systemSetting/device/grid/index.vue
@@ -28,13 +28,11 @@
},
// 鑾峰彇鍒锋柊缁撴灉
changeDialog({ flag }) {
- console.log(flag);
this.isFresh = flag;
},
// 閲嶇疆isFresh
resetFresh({ flag }) {
this.isFresh = flag;
- console.log(this.isFresh);
},
}
}
diff --git a/src/views/systemSetting/platform/mySetting/index.vue b/src/views/systemSetting/platform/mySetting/index.vue
index 51fec48..93ceaed 100644
--- a/src/views/systemSetting/platform/mySetting/index.vue
+++ b/src/views/systemSetting/platform/mySetting/index.vue
@@ -75,7 +75,6 @@
},
// 淇敼鐘舵��
handleChangeStatus(data) {
- console.log(data);
let { isStart, relationId } = data;
isStart ? isStart = 1 : isStart = 0;
this.$axios({
@@ -122,10 +121,6 @@
},
// 鎷栨嫿
handleDrop(before, after, inner, event) {
- console.log(before)
- console.log(after)
- console.log(inner)
- console.log(event);
},
// 鑾峰彇鏄惁鍙互鏀剧疆
allowDrop(before, inner, next) {
--
Gitblit v1.8.0