From cc9ddf2ecaf3ad935374f49c842227f7eb15779d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/arrive/index.vue | 1
src/views/operate/viewEvent/index.vue | 188 ++----
src/views/operate/message/mycontrol/createUser/index.vue | 2
src/views/operate/baseSetting/violation/index.vue | 1
src/views/systemSetting/platform/otherInterface/index.vue | 1
src/components/Table/index.vue | 5
src/views/operate/management/message/index.vue | 3
src/views/systemSetting/platform/portalSetting/index.vue | 2
src/views/operate/log/index.vue | 8
src/views/operate/message/myIndex/index.vue | 3
src/views/operate/myWait/index.vue | 92 --
src/views/operate/disposal/casepool/pool/index.vue | 2
src/views/operate/video/createInterface/index.vue | 3
src/views/operate/disposal/casepool/learn/index.vue | 4
src/views/systemSetting/baseSetting/department/index.vue | 1
src/views/systemSetting/device/bayonet/index.vue | 96 +-
src/views/operate/car/myIndex/create/soil/index.vue | 2
src/views/operate/images/index.vue | 355 +++--------
src/views/operate/disposal/casepool/notDeal/index.vue | 36 -
src/views/operate/sms/smsTemplate/index.vue | 2
src/views/operate/management/message/checkSms/index.vue | 1
src/views/systemSetting/device/bayonet/create/index.vue | 113 ++
src/views/operate/car/myIndex/edit/law/index.vue | 3
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/arrive/index.vue | 1
src/views/operate/myWait/createUser/index.vue | 2
src/store/index.js | 2
src/views/operate/car/myIndex/create/law/index.vue | 3
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/evidence/index.vue | 1
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue | 1
src/views/operate/rectification/taskList/index.vue | 1
src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue | 2
src/views/operate/management/myIndex/components/illclosure/index.vue | 2
src/views/operate/viewEvent/components/illclosure/index.vue | 2
src/api/operate/myWait.js | 7
src/views/operate/message/mycontrol/index.vue | 9
src/views/operate/disposal/casepool/dispatch/index.vue | 3
src/views/operate/images/updateUser/index.vue | 209 ++----
src/views/operate/sms/smsIndex/index.vue | 2
src/api/operate/casequery.js | 7
src/views/operate/car/myIndex/index.vue | 5
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/ill/index.vue | 2
src/main.js | 1
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/vio/index.vue | 1
src/views/operate/baseSetting/violation/createUser/index.vue | 2
src/api/operate/imageManagement.js | 27
src/http/index.js | 3
src/views/video/index.vue | 1
src/api/system/bayonet.js | 34
src/components/Upload/index.vue | 1
src/views/operate/car/myIndex/update/soil/index.vue | 1
src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue | 2
src/views/operate/baseSetting/illegalBuild/index.vue | 1
src/views/operate/management/myIndex/components/closure/index.vue | 2
src/api/system/portal/teamConstruction.js | 2
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue | 1
src/views/layout/components/Header/updatePassword/index.vue | 2
src/views/login/index.vue | 4
src/views/operate/rectification/taskList/components/createInterface/index.vue | 1
src/views/systemSetting/platform/cockpitManage/index.vue | 19
src/views/operate/car/myIndex/update/law/index.vue | 1
src/views/layout/components/Menu/index.vue | 1
src/utils/helper.js | 43
src/views/operate/myWait/updateUser/index.vue | 1
src/views/operate/baseSetting/illegalBuild/createUser/index.vue | 1
src/views/operate/viewEvent/components/illExamine/index.vue | 2
src/views/operate/viewEvent/components/examine/index.vue | 2
src/views/operate/car/myIndex/edit/soil/index.vue | 3
src/views/operate/viewEvent/components/closure/index.vue | 2
src/components/filePictrue/index.vue | 1
src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/evidence/index.vue | 1
src/views/operate/video/index.vue | 2
src/store/users/index.js | 2
src/views/systemSetting/baseSetting/user/components/main/index.vue | 4
src/views/operate/disposal/casepool/pool/createUser/vio/index.vue | 2
src/views/operate/disposal/casepool/escalation/index.vue | 2
src/views/operate/management/myIndex/components/examine/index.vue | 2
src/views/operate/rectification/surveyList/index.vue | 1
src/views/layout/components/Header/index.vue | 4
src/components/dispatch/index.vue | 2
src/views/operate/disposal/casepool/learn/updateUser/uploadResult/vio/index.vue | 1
src/views/operate/rectification/renovationList/components/createInterface/index.vue | 1
src/utils/request.js | 1
/dev/null | 322 -----------
src/views/operate/disposal/casepool/pool/createUser/ill/index.vue | 11
src/views/operate/message/mycontrol/update/index.vue | 3
src/views/systemSetting/platform/otherInterface/components/createInterface/index.vue | 1
src/views/operate/management/myIndex/index.vue | 4
src/views/operate/management/myIndex/components/illExamine/index.vue | 2
src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue | 1
src/views/systemSetting/device/grid/components/main/index.vue | 4
src/views/systemSetting/baseSetting/role/index.vue | 3
91 files changed, 493 insertions(+), 1,230 deletions(-)
diff --git a/src/api/operate/casequery.js b/src/api/operate/casequery.js
new file mode 100644
index 0000000..0091ec9
--- /dev/null
+++ b/src/api/operate/casequery.js
@@ -0,0 +1,7 @@
+import http from "@/http";
+
+export default {
+ baseCaseQuery: (params) => {
+ return http.get('/sccg/base_case/query_case', params);
+ }
+}
\ No newline at end of file
diff --git a/src/api/operate/imageManagement.js b/src/api/operate/imageManagement.js
new file mode 100644
index 0000000..efe5e09
--- /dev/null
+++ b/src/api/operate/imageManagement.js
@@ -0,0 +1,27 @@
+import http from "@/http";
+
+export default {
+ importImage: (params) => {
+ return http.uploadFile('/sccg/file/medias', params);
+ },
+
+ getImageResources: (params) => {
+ return http.get('/sccg/image_resources/query', params);
+ },
+
+ addImageResource: (params) => {
+ return http.post('/sccg/image_resources/addition', params);
+ },
+
+ deleteImageResource: (params) => {
+ return http.delete('/sccg/image_resources/deletion', params);
+ },
+
+ updateImageResource: (params) => {
+ return http.put('/sccg/image_resources/modification', params);
+ },
+
+ deleteImageResources: (params) => {
+ return http.delete('/sccg/image_resources/deletion_batch', params);
+ }
+}
\ No newline at end of file
diff --git a/src/api/operate/myWait.js b/src/api/operate/myWait.js
new file mode 100644
index 0000000..f43a0a3
--- /dev/null
+++ b/src/api/operate/myWait.js
@@ -0,0 +1,7 @@
+import http from "@/http";
+
+export default {
+ getMybackLog: (params) => {
+ return http.get('/sccg/my_backlog/query', params);
+ }
+}
\ No newline at end of file
diff --git a/src/api/system/bayonet.js b/src/api/system/bayonet.js
index e183620..cd834a6 100644
--- a/src/api/system/bayonet.js
+++ b/src/api/system/bayonet.js
@@ -1,29 +1,7 @@
-import axios from "axios";
-import {getToken} from '@/utils/helper'
-const baseUrl = '/sccg/equipment_bayonet'
-const token = {
- 'Authorization':getToken()
-}
+import http from "@/http";
export default {
- // 鑾峰彇鍗″彛鍒楄〃
- getBayonetList: (data) => axios({
- method: 'get',
- url: baseUrl+'/query',
- headers:{...token},
- params: data
- }),
- // 瀵煎嚭鍗″彛璁惧
- exportBayonetList:(data)=>axios({
- method:'get',
- url:baseUrl + '/export',
- headers:{...token},
- params:data
- }),
- // 鏂板鍗″彛
- addBayonet:(data)=>axios({
- method:'post',
- url:baseUrl + '/addition',
- headers:{...token},
- data:data
- })
-};
+ getBayonetList: (params) => { return http.get('/sccg/equipment_bayonet/query', params); },
+ exportBayonetList: (params) => { return http.get('/sccg/equipment_bayonet/export', params); },
+ addBayonet: (params) => { return http.post('/sccg/equipment_bayonet/addition', params); },
+ updateBayonet: (params) => { return http.put('/sccg/equipment_bayonet/modification', params) }
+}
diff --git a/src/api/system/portal/teamConstruction.js b/src/api/system/portal/teamConstruction.js
index 3ea1136..8f97e82 100644
--- a/src/api/system/portal/teamConstruction.js
+++ b/src/api/system/portal/teamConstruction.js
@@ -13,7 +13,7 @@
}
export function importTeamInfo(data) {
- return http.post('/sccg/team_construction/import', data);
+ return http.uploadFile('/sccg/team_construction/import', data);
}
export function updateTeamInfo(params) {
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index 48072b9..ca943ee 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -4,8 +4,6 @@
<el-table ref="multipleTable" :data="tableData" style="width: 100%"
:header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
:row-class-name="tableRowClassName">
- <el-table-column type="selection" :min-width="5">
- </el-table-column>
<el-table-column v-for="item in option.group" :key="item.prop" :label="item.label"
:prop="item.prop" :min-width="item['min-width'] ? item['item.min-width']:'10'">
<template slot-scope="scope">
@@ -120,12 +118,11 @@
methods: {
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index ec73e95..2e7d00a 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -34,7 +34,6 @@
return true
},
handleSuccess(res, file, filelist) {
- console.log(res);
this.$emit('getPicUrl', { obj: res.data, value: this.mykey });
},
getToken() {
diff --git a/src/components/dispatch/index.vue b/src/components/dispatch/index.vue
index d44b36d..2089ae8 100644
--- a/src/components/dispatch/index.vue
+++ b/src/components/dispatch/index.vue
@@ -313,7 +313,6 @@
url: `sccg/car_Manage/query_enforce?current=1&size=1000`,
}).then((res) => {
this.carOptions = res.data.records;
- console.log(res);
});
},
// 鑾峰彇椤剁骇閮ㄩ棬
@@ -347,7 +346,6 @@
url: `sccg/admin/getDepartUser/${id}`,
})
.then((res) => {
- console.log(res);
if (res.code === 200) {
this.personOptions = res.data;
} else {
diff --git a/src/components/filePictrue/index.vue b/src/components/filePictrue/index.vue
index 9ab2534..ce10e5d 100644
--- a/src/components/filePictrue/index.vue
+++ b/src/components/filePictrue/index.vue
@@ -68,7 +68,6 @@
url: `sccg/base_case/baseCaseDetail/${mycode}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogView = true;
let pic = res.data.filesPictureVo.imageResources;
diff --git a/src/http/index.js b/src/http/index.js
index 516bac4..53dda95 100644
--- a/src/http/index.js
+++ b/src/http/index.js
@@ -64,11 +64,10 @@
* @param {boolean?} throwError 鏄惁涓嶄娇鐢ㄩ粯璁ょ殑寮傚父澶勭悊鏂规硶锛岃�屾妸寮傚父鎶涘嚭鏉�
* @return {Promise} 杩斿洖涓�涓猵romise瀵硅薄銆傚叾涓璽hen鏂规硶浼犻�掑洖鍖呬腑鐨刣ata鏁版嵁锛沜atch浜嬩欢鍒欎紶閫掓暣涓洖鍖咃紝鍏跺弬鏁颁负{data:{},status{code:123,message:'xxx'}}
*/
- post(url, data = {}, params = {}, throwError) {
+ post(url, data = {}, throwError) {
const config = {
method: 'POST',
url,
- params,
data: JSON.stringify(data),
errorHandler: (!throwError && this.defaultErrorHandler) || null,
headers: {
diff --git a/src/main.js b/src/main.js
index 134e8ca..5c21072 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,6 @@
next();
}
})
-// console.log(process.env.VUE_APP_BASE_API);
Vue.use(ElementUI);
new Vue({
router,
diff --git a/src/store/index.js b/src/store/index.js
index 84a64f1..b12d733 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,6 @@
import Vuex from 'vuex'
import users from "./users"
import logs from "./logs"
-import bayonet from './system/bayonet'
import loudspeaker from './system/loudspeaker'
import handheldTerminal from './system/handheldTerminal'
import shortMessage from './operate/managenment/shortMessage'
@@ -17,7 +16,6 @@
modules: {
users,
logs,
- bayonet,
shortMessage,
loudspeaker,
handheldTerminal,
diff --git a/src/store/system/bayonet/index.js b/src/store/system/bayonet/index.js
deleted file mode 100644
index aaf1c3f..0000000
--- a/src/store/system/bayonet/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import bayonetApi from "@/api/system/bayonet";
-// import { Message } from "element-ui";
-export default {
- namespaced: true,
- state: {
- userInfo: {},
- },
- actions: {
- async getBayonetList({ state }, params) {
- const res = await bayonetApi.getBayonetList(params);
- return res;
- },
- async exportBayonetList({ state },params) {
- const res = await bayonetApi.exportBayonetList(params);
- return res;
- },
- async addBayonet({ state },params) {
- const res = await bayonetApi.addBayonet(params);
- return res;
- },
- },
-};
diff --git a/src/store/users/index.js b/src/store/users/index.js
index 118bc9b..5425eaf 100644
--- a/src/store/users/index.js
+++ b/src/store/users/index.js
@@ -7,9 +7,7 @@
},
actions: {
async login({ state }, params) {
- console.log("store login");
const res = await usersApi.login(params);
- console.log(res);
const { data } = res;
return res;
},
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 25f8baf..e9853bc 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -45,30 +45,26 @@
})
return arr;
}
-export async function myDownLoad(arr){
- let fileName = arr.headers['content-disposition'];
- console.log(fileName);
- if (fileName) {
- fileName = fileName.slice(fileName.indexOf('filename=') + 9);
- }
- const blob = new Blob([arr.data], {
- type: 'application/octet-stream'
- })
- // content-disposition
- const downloadElement = document.createElement('a')
- // 鍒涘缓涓嬭浇鐨勯摼鎺�
- const href = window.URL.createObjectURL(blob)
- downloadElement.href = href
- // // 涓嬭浇鍚庢枃浠跺悕
- downloadElement.download = fileName
- document.body.appendChild(downloadElement)
- // 鐐瑰嚮涓嬭浇
- downloadElement.click()
- // 涓嬭浇瀹屾垚绉婚櫎鍏冪礌
- document.body.removeChild(downloadElement)
- // 閲婃斁鎺塨lob瀵硅薄
- window.URL.revokeObjectURL(href)
+
+// data: 鏂囦欢, contentDisposition锛氳姹傚ご涓枃浠剁殑鍚嶅瓧
+// 榛樿涓嶇敤淇敼锛岀洿鎺ュ皢杩斿洖鐨剅es浼犲叆鍗冲彲
+export function downloadFile(res) {
+ const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+ const fileName = res.contentDisposition.split('=')[1];
+ if (window.navigator && window.navigator.msSaveBlob) {
+ navigator.msSaveBlob(blob, fileName);
+ } else {
+ const link = document.createElement('a');
+ link.style.display = 'none';
+ link.href = URL.createObjectURL(blob);
+ link.setAttribute('download', decodeURI(fileName));
+ document.body.appendChild(link);
+ link.click();
+ URL.revokeObjectURL(link.href);
+ document.body.removeChild(link);
+ }
}
+
// 鑾峰彇token
export function getToken() {
const token = sessionStorage.getItem('token');
@@ -76,7 +72,6 @@
if (token && tokenHead) {
return tokenHead + token;
}
- return;
}
// 鑾峰彇骞存湀鏃ユ椂鍒嗙
export function getNowDate(time){
diff --git a/src/utils/request.js b/src/utils/request.js
index 8521a4b..3867d1b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,7 +16,6 @@
}
return config;
}, (err) => {
- console.log(err, 're');
}
)
// 鍝嶅簲
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 8f1994b..cc861e6 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -162,7 +162,6 @@
},
created() {
this.setLoginInfo()
- console.log(this.user)
},
methods: {
baseInfo() {
@@ -200,7 +199,6 @@
sessionStorage.clear();
this.$router.push({ path: "/login" })
}).catch(err => {
- console.log(err);
})
},
// 鏀瑰彉閫変腑鐘舵��
@@ -217,11 +215,9 @@
async setLoginInfo() {
const info = JSON.parse(sessionStorage.getItem('user'));
if (info) {
- console.log(info)
this.user = info;
} else {
this.user = await this.getLoginInfo();
- console.log(this.user)
}
this.show = true
},
diff --git a/src/views/layout/components/Header/updatePassword/index.vue b/src/views/layout/components/Header/updatePassword/index.vue
index 60f4736..cadfb72 100644
--- a/src/views/layout/components/Header/updatePassword/index.vue
+++ b/src/views/layout/components/Header/updatePassword/index.vue
@@ -108,8 +108,6 @@
}
},
created() {
- // console.log(this.info);
- // this.car = JSON.parse(JSON.stringify(this.info));
},
methods: {
},
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index b7b43c5..df82b94 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -97,7 +97,6 @@
method: "get",
url: "sccg/system/portal/menu/search_myself",
}).then((res) => {
- console.log(res);
});
},
},
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 0da15ac..2d699af 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -118,7 +118,6 @@
handleLogin() {
const { username, password } = this.loginForm;
const that = this;
- console.log(this.login);
this.$axios
.post("sccg/admin/login", {
password,
@@ -128,7 +127,6 @@
if (response.code === 200) {
// 璁剧疆toke鏃堕棿
// 淇濆瓨token
- console.log(response);
sessionStorage.setItem('token',response.data.token);
// 淇濆瓨token
sessionStorage.setItem('tokenHead',response.data.tokenHead);
@@ -146,10 +144,8 @@
}
})
}
- // console.log(response);
})
.catch(function (error) {
- console.log(error);
});
},
},
diff --git a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
index 7e563b1..db5f524 100644
--- a/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/createUser/index.vue
@@ -147,7 +147,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/baseSetting/illegalBuild/index.vue b/src/views/operate/baseSetting/illegalBuild/index.vue
index 2e47ab5..8f88253 100644
--- a/src/views/operate/baseSetting/illegalBuild/index.vue
+++ b/src/views/operate/baseSetting/illegalBuild/index.vue
@@ -187,7 +187,6 @@
url: `sccg/illegal_building/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
diff --git a/src/views/operate/baseSetting/violation/createUser/index.vue b/src/views/operate/baseSetting/violation/createUser/index.vue
index b55af77..a3c7bdb 100644
--- a/src/views/operate/baseSetting/violation/createUser/index.vue
+++ b/src/views/operate/baseSetting/violation/createUser/index.vue
@@ -165,7 +165,6 @@
url: 'sccg/violations/query/type_four'
})
.then(res => {
- console.log(res);
this.parentList = res.data;
})
},
@@ -191,7 +190,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index bb856f9..23c156b 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -192,7 +192,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
diff --git a/src/views/operate/car/myIndex/create/law/index.vue b/src/views/operate/car/myIndex/create/law/index.vue
index f6defdc..c6b15c3 100644
--- a/src/views/operate/car/myIndex/create/law/index.vue
+++ b/src/views/operate/car/myIndex/create/law/index.vue
@@ -200,7 +200,6 @@
url: "sccg/car_Manage/addition_enforce",
data: car,
}).then((res) => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: "success",
@@ -224,8 +223,6 @@
},
// 閮ㄩ棬淇敼
handleCheck(data, checked) {
- console.log(data);
- // this.car.belong = data.departName
this.car.departId = data.id;
this.car.departName = data.departName;
// 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
diff --git a/src/views/operate/car/myIndex/create/soil/index.vue b/src/views/operate/car/myIndex/create/soil/index.vue
index dced212..955e727 100644
--- a/src/views/operate/car/myIndex/create/soil/index.vue
+++ b/src/views/operate/car/myIndex/create/soil/index.vue
@@ -189,7 +189,6 @@
methods: {
// 娣诲姞杞﹁締
handleCar() {
- console.log(this.car);
this.$refs.user.validate((valid) => {
if (valid) {
const { car } = this;
@@ -209,7 +208,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/car/myIndex/edit/law/index.vue b/src/views/operate/car/myIndex/edit/law/index.vue
index 610a012..29e24e4 100644
--- a/src/views/operate/car/myIndex/edit/law/index.vue
+++ b/src/views/operate/car/myIndex/edit/law/index.vue
@@ -182,7 +182,6 @@
};
},
created() {
- console.log(this.info);
const { getDepartTree } = this;
// 鍒濆鍖栭儴闂ㄦ爲
getDepartTree();
@@ -205,7 +204,6 @@
...car,
},
}).then((res) => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: "success",
@@ -226,7 +224,6 @@
},
// 閮ㄩ棬淇敼
handleCheck(data, checked) {
- console.log(data);
this.car.departId = data.id;
this.car.departName = data.departName;
// 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
diff --git a/src/views/operate/car/myIndex/edit/soil/index.vue b/src/views/operate/car/myIndex/edit/soil/index.vue
index f6fbabb..c333de7 100644
--- a/src/views/operate/car/myIndex/edit/soil/index.vue
+++ b/src/views/operate/car/myIndex/edit/soil/index.vue
@@ -185,12 +185,10 @@
created() {
// 鍒濆鍖栨暟鎹�
this.car = JSON.parse(JSON.stringify(this.info));
- console.log('------------',this.car);
},
methods: {
// 娣诲姞杞﹁締
handleCar() {
- console.log(this.car);
this.$refs.user.validate((valid) => {
if (valid) {
const { car } = this;
@@ -202,7 +200,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/car/myIndex/index.vue b/src/views/operate/car/myIndex/index.vue
index 34e34fe..769a0da 100644
--- a/src/views/operate/car/myIndex/index.vue
+++ b/src/views/operate/car/myIndex/index.vue
@@ -171,7 +171,6 @@
methods: {
// 缂栬緫杞﹁締
handleEdit(data){
- console.log(data)
this.dialogEdit = true
this.info = data;
},
@@ -221,7 +220,6 @@
url: `/sccg/car_Manage/${myurl}?id=${id}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -230,7 +228,7 @@
this.getCarList();
})
})
- .catch(_ => { console.log(2) });
+ .catch(_ => { });
},
// 鑾峰彇杞﹁締鍒楄〃
async getCarList() {
@@ -252,7 +250,6 @@
url:`sccg/car_Manage/query_enforce?current=${currentPage}&size=${pageSize}&carNum=${carNum}`,
})
.then(res=>{
- console.log(res);
arr = res.data;
})
return arr;
diff --git a/src/views/operate/car/myIndex/update/law/index.vue b/src/views/operate/car/myIndex/update/law/index.vue
index 319cdf6..978fc89 100644
--- a/src/views/operate/car/myIndex/update/law/index.vue
+++ b/src/views/operate/car/myIndex/update/law/index.vue
@@ -132,7 +132,6 @@
}
},
created() {
- console.log(this.info);
this.car = JSON.parse(JSON.stringify(this.info));
},
methods: {
diff --git a/src/views/operate/car/myIndex/update/soil/index.vue b/src/views/operate/car/myIndex/update/soil/index.vue
index 091c2b0..92c35f4 100644
--- a/src/views/operate/car/myIndex/update/soil/index.vue
+++ b/src/views/operate/car/myIndex/update/soil/index.vue
@@ -181,7 +181,6 @@
}
},
created() {
- console.log(this.info);
this.car = JSON.parse(JSON.stringify(this.info));
},
methods: {
diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue
index c7a248a..3c0252b 100644
--- a/src/views/operate/disposal/casepool/dispatch/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/index.vue
@@ -262,7 +262,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -276,14 +275,12 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
this.$axios({
method: 'get',
url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
- console.log(res);
})
},
// 鏇存敼杩濊/杩濆缓
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
index 3fcba43..4a76757 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/arrive/index.vue
@@ -117,7 +117,6 @@
methods: {
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
console.log(this.fileList);
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + res.data.url1)
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
index 9a9a94f..dfad1d3 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/components/evidence/index.vue
@@ -486,7 +486,6 @@
},
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
if (this.evidence.pic.length < 4) {
this.evidence.pic.push(baseUrl + res.data.url1)
}
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 12b8756..4d65cf7 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
@@ -97,7 +97,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -151,7 +150,6 @@
url:'sccg/admin/info?name='+myname,
})
.then(res=>{
- console.log(res);
})
},
handleBack(){
diff --git a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
index aaa2381..ccc1dd1 100644
--- a/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
+++ b/src/views/operate/disposal/casepool/dispatch/updateUser/uploadResult/vio/index.vue
@@ -73,7 +73,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
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 7cc5f93..d5d5793 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/ill/index.vue
@@ -403,13 +403,11 @@
},
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
this.ill.positive = baseUrl + res.data.url1;
},
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
this.ill.negative = baseUrl + res.data.url1;
}
},
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 767ab4c..bb39826 100644
--- a/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/createUser/vio/index.vue
@@ -326,7 +326,6 @@
url: 'sccg/violations/query/type_second'
})
.then(res => {
- console.log(res);
this.smallKindList = res.data;
})
},
@@ -337,7 +336,6 @@
url: 'sccg/violations/query/event_type'
})
.then(res => {
- console.log(res);
this.eventLevelList = res.data;
})
},
diff --git a/src/views/operate/disposal/casepool/escalation/index.vue b/src/views/operate/disposal/casepool/escalation/index.vue
index 31434d3..c94d4cc 100644
--- a/src/views/operate/disposal/casepool/escalation/index.vue
+++ b/src/views/operate/disposal/casepool/escalation/index.vue
@@ -309,14 +309,12 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
this.$axios({
method: 'get',
url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
- console.log(res);
})
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
diff --git a/src/views/operate/disposal/casepool/learn/index.vue b/src/views/operate/disposal/casepool/learn/index.vue
index ceeb418..8156c64 100644
--- a/src/views/operate/disposal/casepool/learn/index.vue
+++ b/src/views/operate/disposal/casepool/learn/index.vue
@@ -259,7 +259,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -273,14 +272,12 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
this.$axios({
method: 'get',
url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
- console.log(res);
})
},
// 鏇存敼杩濊/杩濆缓
@@ -356,7 +353,6 @@
url: 'sccg/base_case/case_status_update?caseId=' + id + '&state=0'
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/arrive/index.vue
index f24afb6..fd474d4 100644
--- a/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/learn/updateUser/uploadResult/components/arrive/index.vue
@@ -108,7 +108,6 @@
methods: {
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + res.data.url1)
}
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 dba41f9..11e6d42 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
@@ -447,7 +447,6 @@
methods: {
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
if (this.evidence.pic.length < 4) {
this.evidence.pic.push(baseUrl + res.data.url1)
}
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 a12edc3..f106521 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
@@ -72,7 +72,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/disposal/casepool/notDeal/index.vue b/src/views/operate/disposal/casepool/notDeal/index.vue
index a0e23fc..377b70c 100644
--- a/src/views/operate/disposal/casepool/notDeal/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/index.vue
@@ -72,7 +72,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>
<!-- 涓婁紶椤甸潰 -->
@@ -100,8 +100,7 @@
</div>
<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">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -224,11 +223,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() {
@@ -251,7 +246,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -265,24 +259,18 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
this.$axios({
method: 'get',
url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
}).then(res => {
this.totalNum = res.data.total;
this.tableData = res.data.records;
- console.log(res);
})
},
// 鏇存敼杩濊/杩濆缓
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;
@@ -290,25 +278,14 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
this.currentPage = page;
this.getUserList();
},
@@ -348,7 +325,6 @@
url:'sccg/base_case/case_status_update?caseId='+id+'&state=0'
})
.then(res=>{
- console.log(res);
if(res.code === 200){
this.$message({
type:'success',
@@ -380,7 +356,6 @@
color: #4b9bb7;
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -429,7 +404,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/notDeal/updateUser/uploadResult/components/arrive/index.vue b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/arrive/index.vue
index f24afb6..fd474d4 100644
--- a/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/arrive/index.vue
+++ b/src/views/operate/disposal/casepool/notDeal/updateUser/uploadResult/components/arrive/index.vue
@@ -108,7 +108,6 @@
methods: {
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
if (this.arrive.situationPic.length < 4) {
this.arrive.situationPic.push(baseUrl + res.data.url1)
}
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 dba41f9..11e6d42 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
@@ -447,7 +447,6 @@
methods: {
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
if (this.evidence.pic.length < 4) {
this.evidence.pic.push(baseUrl + res.data.url1)
}
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 a12edc3..f106521 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
@@ -72,7 +72,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
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 78e13a9..2dfa4c7 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/ill/index.vue
@@ -367,19 +367,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',
@@ -419,7 +415,6 @@
url: 'sccg/illegal_building/query/type_second'
}).then(res => {
this.bigKindList = res.data;
- // console.log(res);
})
},
// 鑾峰彇token
@@ -432,16 +427,11 @@
},
handleSuccess(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- // if(res.code === 500){
- // console.log('err');
- // return;
- // }
this.ill.positive = baseUrl + res.data.url1;
},
handleSuccess2(res, file, filelist) {
const baseUrl = 'http://140.143.152.226:8410/';
- console.log(res);
this.ill.negative = baseUrl + res.data.url1;
},
// 鏌ヨ绀惧尯
@@ -451,7 +441,6 @@
url: 'sccg/dict/query_type?level=1&typeCode=' + '10'
})
.then(res => {
- console.log(res);
})
},
// 鑾峰彇琛楅亾淇℃伅
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 3471e50..2786350 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -465,7 +465,6 @@
})
.then(res => {
arr = res.data;
- console.log(res);
})
return arr;
},
@@ -484,7 +483,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue
index 1650706..1441b3f 100644
--- a/src/views/operate/disposal/casepool/pool/index.vue
+++ b/src/views/operate/disposal/casepool/pool/index.vue
@@ -290,7 +290,7 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
diff --git a/src/views/operate/images/createUser/index.vue b/src/views/operate/images/createUser/index.vue
deleted file mode 100644
index 4b72bdc..0000000
--- a/src/views/operate/images/createUser/index.vue
+++ /dev/null
@@ -1,459 +0,0 @@
-<template>
- <div class="createUser">
- <main>
- <div class="mainContent">
- <el-form
- ref="user"
- label-width="140px"
- autoComplete="on"
- :model="depart"
- :rules="createDepartRules"
- label-position="right"
- >
- <!-- 閮ㄩ棬鍚嶇О -->
- <el-form-item class="optionItem" label="闂绫诲瀷:" prop="departName">
- <el-input
- v-model="depart.departName"
- placeholder="璇疯緭鍏ラ棶棰樼被鍨�"
- ></el-input>
- </el-form-item>
- <!-- 涓婄骇閮ㄩ棬 -->
- <el-form-item class="optionItems" label="澶х被鍚嶇О:" prop="parentId">
- <el-select v-model="depart.parentId" placeholder="璇疯緭鍏ュぇ绫诲悕绉�">
- <el-option :value="mylabel">
- <el-tree
- ref="tree"
- :check-strictly="true"
- :data="departList"
- :props="defaultProps"
- show-checkbox
- @check-change="handleCheck"
- default-expand-all
- node-key="id"
- >
- </el-tree>
- </el-option>
- </el-select>
- </el-form-item>
- <!-- 閮ㄩ棬绫诲瀷 -->
- <el-form-item class="optionItem" label="灏忕被鍚嶇О:" prop="departType">
- <el-select v-model="depart.departType" placeholder="璇烽�夋嫨灏忕被鍚嶇О">
- <el-option
- v-for="item in departTypeList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <!--娣诲姞浜哄憳 -->
- <el-form-item class="optionItem add" label="娣诲姞鍥剧墖:">
- <ul class="addPerson">
- <li
- v-for="(item, index) in checkedList"
- :key="index"
- @click="setLeader(index)"
- >
- <div class="li-item">
- <div class="li-icon">
- <i
- :class="[
- 'el-icon-user-solid',
- item.leader ? 'leader' : '',
- ]"
- ></i>
- </div>
- <label
- style="font-size: 12px"
- :class="[item.leader ? 'leader' : '']"
- >{{ item.username }}</label
- >
- </div>
- </li>
- <li class="li-btn">
- <i class="el-icon-plus" @click="openUser = true"></i>
- </li>
- </ul>
- <div class="card" v-if="openUser">
- <el-card class="box-card">
- <div slot="header" class="myclear">
- <span>宸ヤ綔浜哄憳</span>
- <div @click="addUser">纭</div>
- </div>
- <div class="scrollWrap">
- <el-checkbox-group v-model="checkedUser">
- <el-checkbox
- v-for="user in userList"
- :label="user.id"
- :key="user.id"
- >
- {{ user.username}}
- </el-checkbox>
- </el-checkbox-group>
- </div>
- <div class="hidebar"></div>
- </el-card>
- </div>
- </el-form-item>
- </el-form>
- </div>
- </main>
- <footer>
- <div class="optionBtn">
- <el-button @click="handleClose">鍙栨秷</el-button>
- <el-button type="primary" class="btn submit" @click="handleUser"
- >纭畾</el-button
- >
- </div>
- </footer>
- </div>
-</template>
-<script>
-import { getTypeList } from "@/utils/helper";
-export default {
- data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欓儴闂ㄥ悕绉�"));
- } else {
- callback();
- }
- };
- const validatePass = (rule, value, callback) => {
- if (!value) {
- callback();
- } else {
- callback();
- }
- };
- const validatePhone = (rule, value, callback) => {
- if (!value) {
- callback();
- } else {
- callback();
- }
- };
- return {
- depart: {
- departName: "",
- parentId: "",
- departType: "",
- departDes: "",
- },
- createDepartRules: {
- departName: [
- { required: true, trigger: "blur", validator: validateNickname },
- ],
- parentId: [
- { required: false, trigger: "blur", validator: validatePass },
- ],
- departType: [
- { required: false, trigger: "blur", validator: validatePhone },
- ],
- departDes: [{ required: false, trigger: "blur" }],
- },
- userList: [],
- departList: [],
- checkedUser: [],
- checkedList: [],
- openUser: false,
- departTypeList: [],
- selectOrg: {
- orgsid: [],
- },
- mylabel: "",
- defaultProps: {
- children: "children",
- label: "departName",
- },
- };
- },
- created() {
- const that = this;
- // 鑾峰彇閮ㄩ棬鏍戝舰缁撴瀯鍥�
- this.getDepartTree();
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- this.getUserList();
- // 鑾峰彇閮ㄩ棬绫诲瀷鍒楄〃
- this.getDepartTypeList();
- },
- methods: {
- handleUser() {
- this.$refs.user.validate((valid) => {
- if (valid) {
- const { depart, checkedList, selectOrg } = this;
- const arr = [];
- checkedList.forEach((item) => {
- arr.push({ leader: item.leader, userId: item.id });
- });
- console.log(arr);
- this.$axios({
- method: "post",
- url: "/sccg/depart/create",
- data: {
- departName: depart.departName,
- parentId: selectOrg.orgsid[0],
- departType: depart.departType,
- departDes: depart.departDes,
- departManagerList: arr,
- },
- }).then((res) => {
- if (res.code === 200) {
- this.$message({
- message: res.message,
- type: "success",
- });
- this.refresh();
- } else if (res.code === 2001) {
- this.$message({
- message: res.message,
- type: "error",
- });
- this.refresh();
- }
- });
- } else {
- return false;
- }
- });
- },
- // 鑾峰彇閮ㄩ棬鏍戝舰缁撴瀯鍥�
- getDepartTree() {
- this.$axios({
- method: "get",
- url: "sccg/depart/tree",
- }).then((res) => {
- // console.log(res);
- // res.data.unshift({ id: 0, departName: "椤剁骇鑿滃崟" });
- this.departList = res.data;
- });
- },
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- getUserList() {
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
- this.$axios.get(`/sccg/depart/query_surplus_user`).then((res) => {
- if (res.code === 200) {
- this.userList = res.data;
- }
- });
- },
- addUser() {
- console.log(this.checkedUser);
- console.log(this.userList);
- this.checkedList = [];
- this.userList.forEach((item) => {
- this.checkedUser.forEach((child) => {
- if (item.id == child) {
- this.checkedList.push({
- id: item.id,
- username: item.username,
- leader: false,
- });
- }
- });
- });
- this.checkedList[0].leader = true;
- this.openUser = false;
- },
- handleClose() {
- this.$emit("changMyDialog", { flag: false });
- },
- // 鑾峰彇閮ㄩ棬绫诲瀷
- async getDepartTypeList() {
- this.departTypeList = await getTypeList(1, "08");
- },
- handleCheck(data, checked) {
- this.depart.parentId = data.departName;
- // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
- const indexs = this.selectOrg.orgsid.indexOf(data.id);
- // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
- this.$message({
- message: "鍙兘閫夋嫨涓�涓儴闂紒",
- type: "warning",
- showClose: true,
- });
- // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
- this.$refs.tree.setChecked(data, false);
- } else if (this.selectOrg.orgsid.length === 0 && checked) {
- // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
- // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
- this.selectOrg.orgsid = [];
- this.selectOrg.orgsid.push(data.id);
- } else if (
- indexs >= 0 &&
- this.selectOrg.orgsid.length === 1 &&
- !checked
- ) {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = [];
- this.depart.parentId = "";
- }
- },
- // 璁剧疆棰嗗
- setLeader(idx) {
- this.checkedList.forEach((item, index) => {
- item.leader = index === idx;
- });
- },
- },
- props: ["refresh", "changMyDialog"],
-};
-</script>
-<style lang="scss" scoped>
-.createUser {
- border-radius: 1px;
- background-color: #09152f;
-
- main {
- text-align: left;
- padding: 0 55px;
- background-color: #09152f;
- padding-bottom: 50px;
-
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
-
- &::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- .addPerson {
- display: flex;
- list-style: none;
- padding: 0;
- flex-wrap: wrap;
- max-width: 280px;
- li {
- color: #fff;
- text-align: center;
- font-size: 30px;
- margin-left: 10px;
- }
- }
- .li-icon {
- background-color: #cccccc;
- width: 36px;
- height: 36px;
- border-radius: 50%;
- margin: 0 auto;
- }
- .li-btn {
- background-color: #cccccc;
- width: 36px;
- height: 36px;
- border-radius: 50%;
- }
- .el-form-item__content {
- width: 400px;
-
- .el-select {
- width: 100%;
- }
- }
-
- .optionHandleSp {
- display: flex;
-
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
- }
- }
- }
-
- .add {
- position: relative;
-
- .card {
- position: absolute;
- z-index: 2000;
- right: 0;
-
- .box-card {
- min-height: 240px;
- max-height: 260px;
- overflow: hidden;
- background-color: #09152f;
- position: relative;
- max-width: 220px;
-
- .scrollWrap {
- overflow: scroll;
- height: 180px;
- position: relative;
- color: #4b9bb7;
-
- .el-checkbox-group {
- display: flex;
- flex-direction: column;
-
- .el-checkbox {
- line-height: 20px;
- }
- }
- }
-
- .myclear {
- width: 100%;
- line-height: 20px;
- color: #4b9bb7;
- display: flex;
- justify-content: space-between;
- }
-
- .hidebar {
- position: absolute;
- top: 77px;
- right: 20px;
- width: 20px;
- height: 180px;
- background-color: #09152f;
- }
-
- .item {
- line-height: 40px;
- }
- }
- }
- }
- }
-
- .li-item {
- display: flex;
- flex-direction: column;
- }
-
- .leader {
- color: red;
- }
- .el-input {
- width: 280px !important;
- }
- footer {
- border-top: 1px solid #fff;
- height: 80px;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- padding-right: 20px;
- }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/operate/images/detailUser/index.vue b/src/views/operate/images/detailUser/index.vue
deleted file mode 100644
index cde5599..0000000
--- a/src/views/operate/images/detailUser/index.vue
+++ /dev/null
@@ -1,322 +0,0 @@
-<template>
- <div class="updateUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" style="width: 100%;">
- <el-form-item prop="code" label="鎵�灞炰簨浠剁紪鍙�">
- <el-input v-model="imagedata.code"></el-input>
- </el-form-item>
- <el-form-item prop="code" label="澶х被鍚嶇О">
- <el-input v-model="imagedata.questionType"></el-input>
- </el-form-item>
- <el-form-item prop="code" label="灏忕被鍚嶇О">
- <el-input v-model="imagedata.bigType"></el-input>
- </el-form-item>
- <el-form-item prop="code" label="鍥剧墖Id">
- <el-input v-model="imagedata.imagesId"></el-input>
- </el-form-item>
- <el-form-item prop="code" label="涓婁紶鏃堕棿">
- <el-input v-model="imagedata.uploadTime"></el-input>
- </el-form-item>
- <el-form-item prop="questionType" label="鍥剧墖:" min-width="8">
- <img style="width: 180px;height: 120px;" :src=imagedata.imageUrl>
- </el-form-item>
- <!-- <el-form-item prop="questionType" label="闂绫诲瀷" min-width="8" v-model="imagedata.questionType">
- </el-form-item>
- <el-form-item prop="bigType" label="澶х被鍚嶇О" min-width="8" v-model="imagedata.bigType">
- </el-form-item>
- <el-form-item prop="smallType" label="灏忕被鍚嶇О" min-width="8" v-model="imagedata.smallType">
- </el-form-item>
- <el-form-item prop="imagesId" label="鍥剧墖Id" min-width="8" v-model="imagedata.imagesId">
- </el-form-item>
- <el-form-item prop="uploadTime" label="涓婁紶鏃堕棿" min-width="15" v-model="imagedata.uploadTime"> -->
- <!-- </el-form-item> -->
- <!-- <el-form-item v-if="updateFlag"> -->
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
- </el-button>
- </div>
- <!-- </el-form-item> -->
- </el-form>
- </div>
- </main>
- </div>
-</template>
-<script>
-import { getTypeList } from "@/utils/helper";
-export default {
- data() {
-
- return {
-
- imagedata: {
- code: "SJ202211010001",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01",
- imageUrl:"https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.fabao365.xuanfa.cn%2Fimage%2F202107%2F130f9d19f204302f.jpg&refer=http%3A%2F%2Fimg.fabao365.xuanfa.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1670034077&t=974b018f9e27023a01d2d8ad3c7c44f2"
- },
- }
- },
- created() {
- // const that = this;
- // this.user = JSON.parse(JSON.stringify(that.userInfo));
- // console.log(this.user);
- // this.user.parentId = this.user.parentId === 0 ? '鏆傛棤涓婄骇閮ㄩ棬' : this.user.parentId;
- // this.checkedList = this.user.userInfoDTOS;
- // this.checkedList.forEach((e) => {
- // this.checkedUser.push(e.userId);
- // });
- // console.log(this.checkedUser)
- // this.$axios({
- // method: "get",
- // url: "sccg/depart/tree",
- // }).then((res) => {
- // that.departList = res.data;
- // });
- // this.getUserList(this.user.id);
- // // 鑾峰彇閮ㄩ棬绫诲瀷
- // this.getDepartType();
- },
- methods: {
- // handleUser() {
- // this.$refs["user"].validate((valid) => {
- // if (valid) {
- // const { user, checkedList } = this;
- // const arr = [];
- // checkedList.forEach((item) => {
- // arr.push({ leader: item.leader, userId: item.id ? item.id : item.userId });
- // });
- // if (arr.length === 0) {
- // this.$message({
- // type: 'warning',
- // message: '璇烽�夋嫨閮ㄩ棬浜哄憳',
- // })
- // } else {
- // this.$axios
- // .post("sccg/depart/update", {
- // id: user.id,
- // departName: user.departName,
- // parentId: user.parentId === '鏆傛棤涓婄骇閮ㄩ棬' ? 0 : user.parentId,
- // departDes: user.departDes,
- // departManagerList: arr,
- // })
- // .then((res) => {
- // this.$message({
- // message: res.message,
- // type: res.code === 200 ? "success" : "warning",
- // });
- // this.$emit("changeDialog", { flag: false });
- // this.getDepartList();
- // });
- // }
- // } else {
- // return false;
- // }
- // });
- // },
- // // 鑾峰彇閮ㄩ棬绫诲瀷
- // async getDepartType() {
- // this.typeList = await getTypeList(1, "08");
- // },
-
- // // 璁剧疆棰嗗
- // setLeader(idx) {
- // if (this.updateFlag) {
- // this.checkedList.forEach((item, index) => {
- // item.leader = index === idx;
- // });
- // }
- // },
-
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // getUserList(id) {
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
- // this.$axios.get(`/sccg/depart/query_surplus_exist_user?id=`+id).then((res) => {
- // if (res.code === 200) {
- // this.userList = res.data;
- // }
- // });
- // },
- // addUser() {
- // this.checkedList = [];
- // this.userList.forEach((item) => {
- // this.checkedUser.forEach((child) => {
- // if (item.id == child) {
- // this.checkedList.push({
- // id: item.id,
- // username: item.username,
- // leader: false,
- // });
- // }
- // });
- // });
- // this.checkedList[0].leader = true;
- // console.log(this.checkedList);
- // this.openUser = false;
- // },
- // },
- // props: ["userInfo", "updateFlag", "getDepartList", "changeDialog"],
- },
- props: ['updateFlag']
-};
-</script>
-<style lang="scss" scoped>
-.updateUser {
- border-radius: 1px;
- background-color: #09152f;
-
- main {
- // border: 1px solid #fff;
- text-align: left;
- padding: 0 55px;
- background-color: #09152f;
- padding-bottom: 50px;
-
- // .mainTitle {
- // color: #4b9bb7;
- // font-weight: 600;
- // line-height: 100px;
- // font-size: 14px;
- // }
-
- .mainContent {
- display: flex;
- justify-content: center;
- padding-top: 50px;
-
- .el-form-item__content {
- width: 400px;
-
- .el-select {
- width: 100%;
- }
- }
-
- .optionHandleSp {
- display: flex;
-
- .areaNumber,
- .moreNumber {
- flex: 1;
- }
-
- .telNumber {
- flex: 2;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
- justify-content: center;
-
- .btn {
- padding: 12px 50px;
- }
- }
- }
- }
-}
-
-.updateUser::v-deep .el-form-item__label {
- color: #4b9bb7;
-}
-
-.updateUser::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
-}
-
-.addPerson {
- display: flex;
- list-style: none;
- padding: 0;
- flex-wrap: wrap;
- max-width: 280px;
-
- li {
- color: #fff;
- text-align: center;
- font-size: 30px;
- margin-left: 10px;
- }
-}
-
-.li-icon {
- background-color: #cccccc;
- width: 36px;
- height: 36px;
- border-radius: 50%;
- margin: 0 auto;
-}
-
-.li-btn {
- background-color: #cccccc;
- width: 36px;
- height: 36px;
- border-radius: 50%;
-}
-
-.card {
- position: absolute;
- z-index: 2000;
- right: 0;
-
- .box-card {
- min-height: 240px;
- max-height: 260px;
- overflow: hidden;
- background-color: #09152f;
- position: relative;
- max-width: 220px;
-
- .scrollWrap {
- overflow: scroll;
- height: 180px;
- position: relative;
- color: #4b9bb7;
-
- .el-checkbox-group {
- display: flex;
- flex-direction: column;
-
- .el-checkbox {
- line-height: 20px;
- }
- }
- }
-
- .myclear {
- width: 100%;
- line-height: 20px;
- color: #4b9bb7;
- display: flex;
- justify-content: space-between;
- }
-
- .hidebar {
- position: absolute;
- top: 77px;
- right: 20px;
- width: 20px;
- height: 180px;
- background-color: #09152f;
- }
-
- .item {
- line-height: 40px;
- }
- }
-}
-
-.leader {
- color: red;
-}
-
-.el-input {
- width: 280px !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index dd18d97..558d931 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -5,17 +5,24 @@
<div class="search">
<span>绫诲瀷鏌ヨ:</span>
<div class="option">
- <el-input v-model="info.type" placeholder="璇疯緭鍏ラ棶棰樼被鍨�"></el-input>
+ <el-input v-model="type" placeholder="璇疯緭鍏ョ被鍨�"></el-input>
</div>
<span>涓婁紶鏃堕棿:</span>
<div class="option">
- <el-input v-model="info.startTime" placeholder="閫夋嫨涓婁紶鏃堕棿"></el-input>
+ <el-date-picker
+ v-model="datePicked"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</div>
<div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+ <el-button type="primary" @click="getImageResourceList">鏌ヨ</el-button>
</div>
<div class="findBtn">
- <el-button type="primary" @click="addImages">娣诲姞鍥剧墖</el-button>
+ <el-button type="primary" @click="handleUpdateImageResource(null, 'create')">娣诲姞鍥剧墖</el-button>
</div>
</div>
</div>
@@ -23,7 +30,7 @@
<main>
<div class="mainContent">
<div class="type-nav">
- <div @click="changeTypeChecked(index)" v-for="(item, index) in typeList" :key="item.name"
+ <div @click="changeTypeChecked(item.value)" v-for="item in typeList" :key="item.name"
:class="[item.checked ? 'is-active' : '', 'type-item']">{{ item.name }}</div>
</div>
<!-- 鏁版嵁灞曠ず -->
@@ -33,88 +40,37 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
+ <el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
- <el-table-column prop="questionType" label="闂绫诲瀷" min-width="8">
+ <el-table-column prop="category" label="闂绫诲瀷" min-width="8">
</el-table-column>
- <el-table-column prop="bigType" label="澶х被鍚嶇О" min-width="8">
+ <el-table-column prop="eventSource" label="澶х被鍚嶇О" min-width="8">
</el-table-column>
- <el-table-column prop="smallType" label="灏忕被鍚嶇О" min-width="8">
+ <el-table-column prop="regionName" label="灏忕被鍚嶇О" min-width="8">
</el-table-column>
- <el-table-column prop="imagesId" label="鍥剧墖Id" min-width="8">
+ <el-table-column prop="id" label="鍥剧墖Id" min-width="8">
</el-table-column>
- <el-table-column prop="uploadTime" label="涓婁紶鏃堕棿" min-width="15" v-if="mystatus === 1">
+ <el-table-column prop="createTime" label="涓婁紶鏃堕棿" min-width="15" v-if="mystatus === 1">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="operation">
- <span @click="handleFind(scope.row)">鏌ョ湅</span>
+ <span @click="handleUpdateImageResource(scope.row, 'view')">鏌ョ湅</span>
<span class="line">|</span>
- <span @click="handleUpdate(scope.row)">淇敼</span>
+ <span @click="handleUpdateImageResource(scope.row, 'update')">淇敼</span>
<span class="line">|</span>
<span @click="handleDelete(scope.row)">鍒犻櫎</span>
</div>
</template>
</el-table-column>
</el-table>
- <!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
- :before-close="handleClose">
- <MyDetail :info=info v-if="mystatus == 1 ? true : false"></MyDetail>
- <MyIllDetail :info=info v-else></MyIllDetail>
+ <el-dialog
+ :visible.sync="isShowUploadDialog"
+ width="40%"
+ :title="getDialogTitle"
+ >
+ <updateUser @closeDialog="closeDialog" :dialogType="dialogType" :originalData="originalData" />
</el-dialog>
- <!-- 涓婁紶椤甸潰 -->
- <!-- <el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
- :before-close="handleClose"> -->
- <!-- <uploadVio v-if="mystatus === 1" :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadIll> -->
- <!-- </el-dialog> -->
- <!-- tools -->
- <!-- 鏌ョ湅淇敼椤甸潰 -->
- <el-dialog
- :visible.sync="dialogUpdate"
- width="40%"
- title="淇敼"
- v-if="dialogUpdate"
- :before-close="handleClose"
- >
- <updateUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
- <el-dialog
- :visible.sync="dialogcheck"
- width="40%"
- title="鏌ョ湅"
- v-if="dialogcheck"
- :before-close="handleClose"
- >
- <detailUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
-
- <el-dialog
- :visible.sync="dialogAdd"
- width="40%"
- title="娣诲姞"
- v-if="dialogAdd"
- :before-close="handleClose"
- >
- <createUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
-
<div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
@@ -133,8 +89,7 @@
</div>
<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">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -143,58 +98,38 @@
</div>
</template>
<script>
-// import uploadVio from './updateUser/uploadResult/vio'
-// import uploadIll from "./updateUser/uploadResult/ill"
-import createUser from "./createUser";
import updateUser from "./updateUser";
-import detailUser from "./detailUser";
+import imageManagement from "@/api/operate/imageManagement";
+
export default {
- components: {
- // updateUser,
- // uploadVio, uploadIll,
- updateUser, createUser,detailUser
+ components: { updateUser },
+
+ computed: {
+ getDialogTitle() {
+ if (this.dialogType === 'create') {
+ return '鍒涘缓';
+ }
+
+ if (this.dialogType === 'update') {
+ return '鏇存柊';
+ }
+
+ if (this.dialogType === 'view') {
+ return '鏌ョ湅';
+ }
+ }
},
+
data() {
return {
- dialogUpdate:false,
- dialogcheck:false,
- tableData: [
- {
- code: "IMG202211010001",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010002",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010003",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010004",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- }
- ],
- context: "",
+ isShowUploadDialog:false,
+ dialogType: 'create',
+ originalData: null,
+ type: '',
+ size: '',
+ importTime: null,
+ tableData: [],
dialogUpload: false,
- // dialogUpdate: false,
dialogView: false,
updateFlag:false,
userInfo:{},
@@ -238,55 +173,36 @@
checked: false,
},
],
- statusArr: [],
mystatus: 1,
caseId: '',
caseCode: null,
- dialogAdd:false,
+ dialogAdd: false,
+ datePicked: null
}
},
created() {
- this.statusArr[0] = 6;
- this.typeList.forEach(item => {
- if (item.checked) {
- this.statusArr[1] = item.value;
- }
- })
- this.getUserList();
+ this.size = this.typeList.find(item => item.checked).value;
+ this.getImageResourceList();
},
methods: {
//淇敼
- handleUpdate(){
- this.dialogUpdate=true;
+ handleUpdateImageResource(data, type){
+ this.dialogType = type;
+ this.originalData = data;
+ this.isShowUploadDialog = true;
},
- // 鏌ョ湅
- handleFind(){
- this.dialogcheck=true;
- },
- // 椤堕儴涓嬫媺妗�
- 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,
- }).then(res => {
- this.getUserList();
- this.$message({
- message: res.message,
- type: res.code === 200 ? 'success' : 'warning'
- })
- })
+ imageManagement.deleteImageResources({ ids: idArr })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getImageResourceList();
+ })
+ .catch(err => this.$message.error(`${err}`))
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -306,11 +222,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() {
@@ -323,127 +235,60 @@
})
},
// 鍒犻櫎鍗曟潯鏁版嵁
- handleDelete({ number }) {
- console.log(number);
+ handleDelete({ id }) {
this.$confirm('纭鍒犻櫎锛�')
- .then(_ => {
- console.log(1);
- this.$axios({
- method: 'delete',
- url: `sccg/violations/delete?id=${number}`,
- })
- .then(res => {
- console.log(res);
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message
- })
-
- this.getUserList();
- })
+ .then(() => {
+ imageManagement.deleteImageResource({ id: id })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ })
+ .catch(err => this.$message.error(`${err}`))
})
- .catch(_ => { console.log(2) });
},
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
- // this.$axios({
- // method: 'get',
- // url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
- // }).then(res => {
- // this.totalNum = res.data.total;
- // this.tableData = res.data.records;
- // console.log(res);
- // })
+
+ getImageResourceList() {
+ const dateParams = {};
+ if (this.datePicked) {
+ dateParams.startTime = dateParams[0];
+ dateParams.endTime = dateParams[1]
+ }
+ imageManagement.getImageResources({ current: this.currentPage, size: this.size, type: this.type, ...dateParams })
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message({ type: 'error', message: err }))
},
// 鏇存敼杩濊/杩濆缓
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;
- console.log(this.mystatus);
- this.statusArr[1] = this.typeList[idx].value;
- this.getUserList();
+ this.size = idx;
+ this.getImageResourceList();
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getUserList();
- },
- addImages(){
- this.dialogAdd=true;
- },
- handleClose(done) {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- this.dialogUpload = false;
- // this.dialogUpdate = false;
- done();
- })
- .catch(_ => { });
- },
- handleClose(done) {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- this.dialogUpload = false;
- // this.dialogUpdate = false;
- done();
- })
- .catch(_ => { });
- },
- async JumpView(data) {
- await this.getEventInfo(data.code);
- },
- // 鑾峰彇妗堜欢淇℃伅
- async getEventInfo(code) {
- await this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${code}`
- })
- .then(res => {
- this.info = res.data;
- this.dialogView = true;
- })
+ this.getImageResourceList();
},
opernDialog(data) {
this.dialogUpload = true;
this.caseId = data.id;
this.caseCode = data.code
- // console.log(data);
},
- // 鍏抽棴涓婁紶鐣岄潰
- closeDialog({ flag }) {
- this.dialogUpload = flag;
- this.getUserList();
- },
- // 澶勭悊鏃堕棿
- filterTime(time) {
- return helper(time);
+
+ closeDialog() {
+ this.isShowUploadDialog = false;
}
}
}
@@ -456,7 +301,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -516,7 +360,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover {
cursor: pointer;
@@ -637,5 +480,9 @@
.line {
padding: 0 5px;
}
+
+ :deep(.el-range-input) {
+ background-color: #09152f;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/operate/images/updateUser/index.vue b/src/views/operate/images/updateUser/index.vue
index 3a844dc..ebcd0ad 100644
--- a/src/views/operate/images/updateUser/index.vue
+++ b/src/views/operate/images/updateUser/index.vue
@@ -2,163 +2,106 @@
<div class="updateUser">
<main>
<div class="mainContent">
- <el-form ref="user" style="width: 100%;">
- <el-form-item prop="code" label="鎵�灞炰簨浠剁紪鍙�">
- <el-input v-model="imagedata.code"></el-input>
+ <el-form :disabled="isDisabled" ref="user" style="width: 100%;">
+ <el-form-item prop="baseId" label="鎵�灞炰簨浠剁紪鍙�">
+ <el-input v-model="imagedata.baseId"></el-input>
</el-form-item>
- <el-form-item prop="code" label="澶х被鍚嶇О">
- <el-input v-model="imagedata.questionType"></el-input>
+ <el-form-item prop="eventSource" label="澶х被鍚嶇О">
+ <el-input v-model="imagedata.eventSource"></el-input>
</el-form-item>
- <el-form-item prop="code" label="灏忕被鍚嶇О">
- <el-input v-model="imagedata.bigType"></el-input>
+ <el-form-item prop="regionName" label="灏忕被鍚嶇О">
+ <el-input v-model="imagedata.regionName"></el-input>
</el-form-item>
- <el-form-item prop="code" label="鍥剧墖Id">
- <el-input v-model="imagedata.imagesId"></el-input>
+ <el-form-item prop="id" label="鍥剧墖Id">
+ <el-input v-model="imagedata.id"></el-input>
</el-form-item>
- <el-form-item prop="code" label="涓婁紶鏃堕棿">
- <el-input v-model="imagedata.uploadTime"></el-input>
+ <el-form-item prop="createTime" label="涓婁紶鏃堕棿">
+ <el-input v-model="imagedata.createTime"></el-input>
</el-form-item>
- <el-form-item prop="questionType" label="鍥剧墖:" min-width="8">
- <img style="width: 180px;height: 120px;" :src=imagedata.imageUrl>
+ <el-form-item prop="eventSource" label="鍥剧墖:" min-width="8">
+<!-- <img style="width: 180px;height: 120px;" :src=imagedata.url>-->
+ <el-upload
+ action=""
+ :show-file-list="false"
+ :on-success="handleImageSuccess"
+ :before-upload="beforeImageUpload">
+ <img v-if="imagedata.url" :src="imagedata.url" class="avatar">
+ <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+ </el-upload>
</el-form-item>
- <!-- <el-form-item prop="bigType" label="澶х被鍚嶇О" min-width="8" v-model="imagedata.bigType">
- </el-form-item>
- <el-form-item prop="smallType" label="灏忕被鍚嶇О" min-width="8" v-model="imagedata.smallType">
- </el-form-item>
- <el-form-item prop="imagesId" label="鍥剧墖Id" min-width="8" v-model="imagedata.imagesId"> -->
- <!-- </el-form-item>
- <el-form-item prop="uploadTime" label="涓婁紶鏃堕棿" min-width="15" v-model="imagedata.uploadTime">
- </el-form-item> -->
- <!-- <el-form-item v-if="updateFlag"> -->
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
- </el-button>
+ <div v-if="!isDisabled" class="optionBtn">
+ <el-button type="primary" class="btn submit" @click.native.prevent="onSubmit">鎻愪氦</el-button>
</div>
- <!-- </el-form-item> -->
</el-form>
</div>
</main>
</div>
</template>
<script>
-import { getTypeList } from "@/utils/helper";
+import { deepClone } from "@/utils/helper";
+import imageManagement from "@/api/operate/imageManagement";
+
export default {
data() {
-
return {
-
imagedata: {
- code: "SJ202211010001",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01",
- imageUrl: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.fabao365.xuanfa.cn%2Fimage%2F202107%2F130f9d19f204302f.jpg&refer=http%3A%2F%2Fimg.fabao365.xuanfa.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1670034077&t=974b018f9e27023a01d2d8ad3c7c44f2"
+ code: '',
+ eventSource: '',
+ regionName: '',
+ smallType: '',
+ id: '',
+ createTime: '',
+ url: ''
},
+ isDisabled: false
}
},
created() {
- // const that = this;
- // this.user = JSON.parse(JSON.stringify(that.userInfo));
- // console.log(this.user);
- // this.user.parentId = this.user.parentId === 0 ? '鏆傛棤涓婄骇閮ㄩ棬' : this.user.parentId;
- // this.checkedList = this.user.userInfoDTOS;
- // this.checkedList.forEach((e) => {
- // this.checkedUser.push(e.userId);
- // });
- // console.log(this.checkedUser)
- // this.$axios({
- // method: "get",
- // url: "sccg/depart/tree",
- // }).then((res) => {
- // that.departList = res.data;
- // });
- // this.getUserList(this.user.id);
- // // 鑾峰彇閮ㄩ棬绫诲瀷
- // this.getDepartType();
+ this.imagedata = deepClone(this.originalData);
+ this.isDisabled = this.dialogType === 'view';
},
methods: {
- // handleUser() {
- // this.$refs["user"].validate((valid) => {
- // if (valid) {
- // const { user, checkedList } = this;
- // const arr = [];
- // checkedList.forEach((item) => {
- // arr.push({ leader: item.leader, userId: item.id ? item.id : item.userId });
- // });
- // if (arr.length === 0) {
- // this.$message({
- // type: 'warning',
- // message: '璇烽�夋嫨閮ㄩ棬浜哄憳',
- // })
- // } else {
- // this.$axios
- // .post("sccg/depart/update", {
- // id: user.id,
- // departName: user.departName,
- // parentId: user.parentId === '鏆傛棤涓婄骇閮ㄩ棬' ? 0 : user.parentId,
- // departDes: user.departDes,
- // departManagerList: arr,
- // })
- // .then((res) => {
- // this.$message({
- // message: res.message,
- // type: res.code === 200 ? "success" : "warning",
- // });
- // this.$emit("changeDialog", { flag: false });
- // this.getDepartList();
- // });
- // }
- // } else {
- // return false;
- // }
- // });
- // },
- // // 鑾峰彇閮ㄩ棬绫诲瀷
- // async getDepartType() {
- // this.typeList = await getTypeList(1, "08");
- // },
-
- // // 璁剧疆棰嗗
- // setLeader(idx) {
- // if (this.updateFlag) {
- // this.checkedList.forEach((item, index) => {
- // item.leader = index === idx;
- // });
- // }
- // },
-
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- // getUserList(id) {
- // // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
- // this.$axios.get(`/sccg/depart/query_surplus_exist_user?id=`+id).then((res) => {
- // if (res.code === 200) {
- // this.userList = res.data;
- // }
- // });
- // },
- // addUser() {
- // this.checkedList = [];
- // this.userList.forEach((item) => {
- // this.checkedUser.forEach((child) => {
- // if (item.id == child) {
- // this.checkedList.push({
- // id: item.id,
- // username: item.username,
- // leader: false,
- // });
- // }
- // });
- // });
- // this.checkedList[0].leader = true;
- // console.log(this.checkedList);
- // this.openUser = false;
- // },
- // },
- // props: ["userInfo", "updateFlag", "getDepartList", "changeDialog"],
+ onSubmit() {
+ this.$refs.user.validate(valid => {
+ if (valid) {
+ if (this.dialogType === 'create') {
+ imageManagement.addImageResource(this.imagedata)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.$emit('closeDialog');
+ })
+ .catch(err => this.$message.error(`${err}`))
+ } else {
+ imageManagement.updateImageResource(this.imagedata)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.$emit('closeDialog');
+ })
+ .catch(err => this.$message.error(`${err}`))
+ }
+ } else {
+ this.$message.warning('璇锋鏌ュ繀濉」');
+ }
+ })
+ },
+ handleImageSuccess() {},
+ beforeImageUpload(file) {
+ imageManagement.importImage(file)
+ .then(res => {
+ })
+ .catch(err => this.$message.error(`${err}`))
+ }
},
- props: ['updateFlag']
+ props: {
+ originalData: {
+ type: Object,
+ default: () => null
+ },
+ dialogType: {
+ type: String,
+ default: () => 'create'
+ }
+ }
};
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 651590c..e691a20 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -201,7 +201,6 @@
async handleExport() {
const { currentPage, pageSize, context, operationType, mysort, mytime } =
this;
- console.log(mytime);
let arr = await this.exportLogs({
content: context,
current: currentPage,
@@ -284,7 +283,6 @@
async getLogList() {
const { currentPage, pageSize, context, operationType, mysort, mytime } =
this;
- console.log(mytime);
let arr = await this.getLogsList({
content: context,
current: currentPage,
@@ -296,12 +294,10 @@
startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
sort: mysort,
});
- console.log(arr);
return arr.data.data;
},
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -344,11 +340,9 @@
message: res.message,
});
}
- console.log(res);
});
})
.catch((err) => {
- console.log(err);
});
},
// 琛ㄦ牸鐩戝惉
@@ -412,7 +406,6 @@
done();
})
.catch((err) => {
- console.log(err);
});
},
// 鑷畾涔夊叧闂脊绐�
@@ -423,7 +416,6 @@
},
//
timechange(data) {
- console.log(data);
},
},
};
diff --git a/src/views/operate/management/message/checkSms/index.vue b/src/views/operate/management/message/checkSms/index.vue
index 947c4af..a296de8 100644
--- a/src/views/operate/management/message/checkSms/index.vue
+++ b/src/views/operate/management/message/checkSms/index.vue
@@ -83,7 +83,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
diff --git a/src/views/operate/management/message/index.vue b/src/views/operate/management/message/index.vue
index d53a03a..df8baf6 100644
--- a/src/views/operate/management/message/index.vue
+++ b/src/views/operate/management/message/index.vue
@@ -5,7 +5,7 @@
<div class="header-content">
<div class="search">
<span>ID:</span>
- <el-input placeholder="ID" v-model="context"></el-input>
+ <el-input placeholder="璇疯緭鍏D" v-model="context"></el-input>
</div>
<div class="status">
<span>鐭俊鐘舵��:</span>
@@ -231,7 +231,6 @@
},
// 鏀瑰彉鏇存柊鏃堕棿
changeUpdateTime(time) {
- console.log(time)
if (time) {
return helper(time);
}
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index b61ff2d..a43287f 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -206,7 +206,6 @@
url: 'sccg/base_case/end_case?caseId='+baseCase.id +'&opinion='+baseCase.finalOpinion +'&result='+'缁撴鎴愬姛',
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -239,7 +238,6 @@
}
})
.then(res => {
- console.log(res);
})
}
},
diff --git a/src/views/operate/management/myIndex/components/examine/index.vue b/src/views/operate/management/myIndex/components/examine/index.vue
index 483743f..3ca352b 100644
--- a/src/views/operate/management/myIndex/components/examine/index.vue
+++ b/src/views/operate/management/myIndex/components/examine/index.vue
@@ -172,7 +172,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -200,7 +199,6 @@
}
})
.then(res => {
- console.log(res);
})
},
},
diff --git a/src/views/operate/management/myIndex/components/illExamine/index.vue b/src/views/operate/management/myIndex/components/illExamine/index.vue
index 1dfd4a4..fb3102c 100644
--- a/src/views/operate/management/myIndex/components/illExamine/index.vue
+++ b/src/views/operate/management/myIndex/components/illExamine/index.vue
@@ -173,7 +173,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -201,7 +200,6 @@
}
})
.then(res => {
- console.log(res);
})
},
},
diff --git a/src/views/operate/management/myIndex/components/illclosure/index.vue b/src/views/operate/management/myIndex/components/illclosure/index.vue
index 513b04b..8bf7dab 100644
--- a/src/views/operate/management/myIndex/components/illclosure/index.vue
+++ b/src/views/operate/management/myIndex/components/illclosure/index.vue
@@ -204,7 +204,6 @@
url: 'sccg/base_case/end_case?caseId='+baseCase.id +'&opinion='+baseCase.finalOpinion+'&result='+'缁撴鎴愬姛' ,
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -237,7 +236,6 @@
}
})
.then(res => {
- console.log(res);
})
}
},
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index 075adec..03bbd75 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -246,7 +246,6 @@
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
type: res.code === 200 ? 'success' : 'warning',
message: res.message
@@ -314,7 +313,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogView = true;
})
@@ -326,7 +324,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogExamine = true;
})
@@ -338,7 +335,6 @@
url: `sccg/base_case/baseCaseDetail/${code}`
})
.then(res => {
- console.log(res);
this.info = res.data;
this.dialogClosure = true;
})
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 29b7d60..0bfa339 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -314,7 +314,7 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
@@ -374,7 +374,6 @@
done();
})
.catch(err => {
- console.log(err);
})
},
diff --git a/src/views/operate/message/mycontrol/createUser/index.vue b/src/views/operate/message/mycontrol/createUser/index.vue
index 310d447..061e046 100644
--- a/src/views/operate/message/mycontrol/createUser/index.vue
+++ b/src/views/operate/message/mycontrol/createUser/index.vue
@@ -68,10 +68,8 @@
methods: {
handleUser() {
this.$refs['user'].validate((valid) => {
- console.log(valid);
if (valid) {
const { role } = this;
- console.log(role);
this.$axios({
method: 'post',
url: 'sccg/message_column/addColumn',
diff --git a/src/views/operate/message/mycontrol/index.vue b/src/views/operate/message/mycontrol/index.vue
index 1c92c8c..1a15265 100644
--- a/src/views/operate/message/mycontrol/index.vue
+++ b/src/views/operate/message/mycontrol/index.vue
@@ -110,7 +110,6 @@
},
// 鍒犻櫎鏁版嵁
handleDelete(idArr) {
- console.log(idArr);
this.$confirm('鏄惁纭畾纭畾鍒犻櫎鏍忕洰?')
.then(_ => {
this.$axios({
@@ -128,12 +127,10 @@
})
})
.catch(err=>{
- console.log(err);
})
},
// 淇敼鏍忕洰鐘舵��
handleChangeStatus({ id, status }) {
- console.log(id, status);
status === true ? status = 1 : status = 0;
this.$axios({
method: 'post',
@@ -160,7 +157,6 @@
item.isShow === 1 ? item.isShow = true : item.isShow = false;
})
arr = res.data
- // console.log(res);
})
return arr;
},
@@ -171,7 +167,6 @@
},
// 涓嬫媺妗嗙洃鍚�
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -211,10 +206,9 @@
message: res.message
})
}
- console.log(res);
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐘舵�佺洃鍚�
tableChange(list) {
@@ -273,7 +267,6 @@
done();
})
.catch(err => {
- console.log(err);
})
},
// 鑷畾涔夊叧闂脊绐�
diff --git a/src/views/operate/message/mycontrol/update/index.vue b/src/views/operate/message/mycontrol/update/index.vue
index b8c8b36..2d7b868 100644
--- a/src/views/operate/message/mycontrol/update/index.vue
+++ b/src/views/operate/message/mycontrol/update/index.vue
@@ -58,16 +58,13 @@
}
},
created() {
- console.log(this.info);
this.role = JSON.parse(JSON.stringify(this.info)) ;
},
methods: {
handleUser() {
this.$refs['user'].validate((valid) => {
- console.log(valid);
if (valid) {
const { role } = this;
- console.log(role);
this.$axios({
method: 'post',
url: `sccg/message_column/update/${role.id}`,
diff --git a/src/views/operate/myWait/createUser/index.vue b/src/views/operate/myWait/createUser/index.vue
index c53e2d0..59722b9 100644
--- a/src/views/operate/myWait/createUser/index.vue
+++ b/src/views/operate/myWait/createUser/index.vue
@@ -149,13 +149,11 @@
url: 'sccg/violations/query/event_type'
})
.then(res => {
- console.log(res);
this.eventLevelList = res.data;
})
},
// 鎻愪氦鏂板杩濊绫诲瀷
handleSubmit(){
- console.log(this.things);
}
},
props: ['getUserList']
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index fb682ce..0a64ce7 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -9,7 +9,7 @@
<span>绛涢�夋潯浠�:</span>
<el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="context"></el-input>
<div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+ <el-button type="primary" @click="getTableData">鏌ヨ</el-button>
</div>
</div>
</div>
@@ -27,43 +27,34 @@
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
<template slot-scope="scope">
- <span>{{scope.row.eventSource===1 ? '瑙嗛宸℃煡': '浜哄伐涓婃姤'}}</span>
+ <span>{{scope.row}}</span>
</template>
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="10">
<template slot-scope="scope">
- <span>{{scope.row.category===1 ? '杩濊': '杩濆缓'}}</span>
+ <span>{{scope.row}}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
<template slot-scope="scope">
- <span>{{changeTime(scope.row.createTime)}}</span>
+ <span>{{changeTime(scope.row)}}</span>
</template>
</el-table-column>
<el-table-column prop="type" label="鍓╀綑鏃堕棿" min-width="10">
<template slot-scope="scope">
- <span>{{getRestTime(scope.row.limitTime)}}</span>
+ <span>{{getRestTime(scope.row)}}</span>
</template>
</el-table-column>
<el-table-column prop="stepName" label="闂鐘舵��" min-width="10">
</el-table-column>
<el-table-column min-width="10">
</el-table-column>
- <!-- <el-table-column prop="operation" label="鎿嶄綔" min-width="10">
- <template slot-scope="scope">
- <div class="operation">
- <span @click="handleFind(scope.row)">鏌ョ湅</span>
- <span class="line">|</span>
- <span @click="handleDelete(scope.row)">鍒犻櫎</span>
- </div>
- </template>
- </el-table-column> -->
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
v-if="dialogUpdate" :before-close="handleClose">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo
- :getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
+ :getTableData=" context ? getTableData : getTableData" @changeDialog="changeDialog" />
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -98,6 +89,8 @@
import createUser from "./createUser"
import {computeTime} from '@/utils/helper'
import filterTime from '@/utils/mydate'
+import myWait from "@/api/operate/myWait";
+
export default {
components: {
updateUser,createUser
@@ -139,22 +132,19 @@
}
},
created() {
- this.getUserList();
+ this.getTableData();
},
methods: {
- // 鎵归噺鍒犻櫎
- mulDelete(idArr){
- console.log(idArr);
- this.$axios({
- method:'delete',
- url:'sccg/violations/batch_delete?ids='+idArr,
- }).then(res=>{
- this.getUserList();
- this.$message({
- message:res.message,
- type:res.code === 200 ? 'success' : 'warning'
- })
+ getTableData() {
+ myWait.getMybackLog({ num: this.context })
+ .then(res => {
+ this.tableData = res;
})
+ .catch(err => this.$message({ type: 'error', message: err }))
+ },
+
+ // 鎵归噺鍒犻櫎
+ mulDelete(idArr){
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(val) {
@@ -176,11 +166,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() {
@@ -194,39 +180,6 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
- this.$confirm('纭鍒犻櫎锛�')
- .then(_ => {
- console.log(1);
- this.$axios({
- method: 'delete',
- url: `sccg/violations/delete?id=${number}`,
- })
- .then(res => {
- console.log(res);
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message
- })
-
- this.getUserList();
- })
- })
- .catch(_ => { console.log(2) });
- },
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const { currentPage, pageSize, context } = this;
- // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
- this.$axios({
- method: 'get',
- // ?current=${currentPage},&size=${pageSize}&
- url: `sccg/my_backlog/query?num=${context}`,
- })
- .then(res => {
- this.tableData = res.data;
- this.totalNum = res.data.length;
- })
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
@@ -235,7 +188,6 @@
} else {
return 'success-row';
}
- return '';
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
@@ -246,17 +198,17 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.getUserList();
+ this.getTableData();
},
// 涓婁竴椤电偣鍑讳簨浠�
handlePrev(page) {
this.currentPage = page;
- this.getUserList();
+ this.getTableData();
},
// 涓嬩竴椤电偣鍑讳簨浠�
handleNext(page) {
this.currentPage = page;
- this.getUserList();
+ this.getTableData();
},
changeDialog(val) {
this.dialogUpdate = val.dialogUpdate;
diff --git a/src/views/operate/myWait/updateUser/index.vue b/src/views/operate/myWait/updateUser/index.vue
index 5b0cf9a..cd456e9 100644
--- a/src/views/operate/myWait/updateUser/index.vue
+++ b/src/views/operate/myWait/updateUser/index.vue
@@ -66,7 +66,6 @@
}
},
created() {
- console.log(this.userInfo);
this.things = JSON.parse(JSON.stringify(this.userInfo));
// 鑾峰彇鎵�灞炵被鍨嬪垪琛�
this.getTypeThird();
diff --git a/src/views/operate/rectification/renovationList/components/createInterface/index.vue b/src/views/operate/rectification/renovationList/components/createInterface/index.vue
index 5f94365..5b9673e 100644
--- a/src/views/operate/rectification/renovationList/components/createInterface/index.vue
+++ b/src/views/operate/rectification/renovationList/components/createInterface/index.vue
@@ -125,7 +125,6 @@
description: myInterface.description,
applicationName: myInterface.applicationName
}).then(res => {
- console.log(res);
// if (res.code === 200) {
// this.refresh();
// }
diff --git a/src/views/operate/rectification/surveyList/index.vue b/src/views/operate/rectification/surveyList/index.vue
index 4c2e34d..b94275e 100644
--- a/src/views/operate/rectification/surveyList/index.vue
+++ b/src/views/operate/rectification/surveyList/index.vue
@@ -234,7 +234,6 @@
},
})
.then((res) => {
- console.log(res);
});
},
// // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
diff --git a/src/views/operate/rectification/taskList/components/createInterface/index.vue b/src/views/operate/rectification/taskList/components/createInterface/index.vue
index 8b0944b..4f2695a 100644
--- a/src/views/operate/rectification/taskList/components/createInterface/index.vue
+++ b/src/views/operate/rectification/taskList/components/createInterface/index.vue
@@ -128,7 +128,6 @@
description: myInterface.description,
applicationName: myInterface.applicationName
}).then(res => {
- console.log(res);
// if (res.code === 200) {
// this.refresh();
// }
diff --git a/src/views/operate/rectification/taskList/index.vue b/src/views/operate/rectification/taskList/index.vue
index 8256cf7..44b9d14 100644
--- a/src/views/operate/rectification/taskList/index.vue
+++ b/src/views/operate/rectification/taskList/index.vue
@@ -179,7 +179,6 @@
id
}
}).then(res => {
- console.log(res);
})
}
// // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index 5b9e6ed..bce5de8 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -245,7 +245,7 @@
this.$message({ type: 'error', message: err });
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index 735bac4..9a41d57 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -263,7 +263,7 @@
}
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
diff --git a/src/views/operate/video/createInterface/index.vue b/src/views/operate/video/createInterface/index.vue
index 7111397..d9570a9 100644
--- a/src/views/operate/video/createInterface/index.vue
+++ b/src/views/operate/video/createInterface/index.vue
@@ -187,7 +187,6 @@
checkedList.forEach((item) => {
arr.push({ leader: item.leader, userId: item.id });
});
- console.log(arr);
this.$axios({
method: "post",
url: "/sccg/depart/create",
@@ -239,8 +238,6 @@
});
},
addUser() {
- console.log(this.checkedUser);
- console.log(this.userList);
this.checkedList = [];
this.userList.forEach((item) => {
this.checkedUser.forEach((child) => {
diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue
index 8974f3b..16f938f 100644
--- a/src/views/operate/video/index.vue
+++ b/src/views/operate/video/index.vue
@@ -408,7 +408,6 @@
method: "delete",
url: `sccg/violations/delete?id=${number}`,
}).then((res) => {
- console.log(res);
this.$message({
type: res.code === 200 ? "success" : "warning",
message: res.message,
@@ -424,7 +423,6 @@
// 鑾峰彇鐢ㄦ埛鍒楄〃
getUserList() {
const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
// this.$axios({
// method: 'get',
// url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
diff --git a/src/views/operate/viewEvent/components/closure/index.vue b/src/views/operate/viewEvent/components/closure/index.vue
index b61ff2d..a43287f 100644
--- a/src/views/operate/viewEvent/components/closure/index.vue
+++ b/src/views/operate/viewEvent/components/closure/index.vue
@@ -206,7 +206,6 @@
url: 'sccg/base_case/end_case?caseId='+baseCase.id +'&opinion='+baseCase.finalOpinion +'&result='+'缁撴鎴愬姛',
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -239,7 +238,6 @@
}
})
.then(res => {
- console.log(res);
})
}
},
diff --git a/src/views/operate/viewEvent/components/examine/index.vue b/src/views/operate/viewEvent/components/examine/index.vue
index 483743f..3ca352b 100644
--- a/src/views/operate/viewEvent/components/examine/index.vue
+++ b/src/views/operate/viewEvent/components/examine/index.vue
@@ -172,7 +172,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -200,7 +199,6 @@
}
})
.then(res => {
- console.log(res);
})
},
},
diff --git a/src/views/operate/viewEvent/components/illExamine/index.vue b/src/views/operate/viewEvent/components/illExamine/index.vue
index 1dfd4a4..fb3102c 100644
--- a/src/views/operate/viewEvent/components/illExamine/index.vue
+++ b/src/views/operate/viewEvent/components/illExamine/index.vue
@@ -173,7 +173,6 @@
}
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -201,7 +200,6 @@
}
})
.then(res => {
- console.log(res);
})
},
},
diff --git a/src/views/operate/viewEvent/components/illclosure/index.vue b/src/views/operate/viewEvent/components/illclosure/index.vue
index 513b04b..8bf7dab 100644
--- a/src/views/operate/viewEvent/components/illclosure/index.vue
+++ b/src/views/operate/viewEvent/components/illclosure/index.vue
@@ -204,7 +204,6 @@
url: 'sccg/base_case/end_case?caseId='+baseCase.id +'&opinion='+baseCase.finalOpinion+'&result='+'缁撴鎴愬姛' ,
})
.then(res => {
- console.log(res);
if (res.code === 200) {
this.$message({
type: 'success',
@@ -237,7 +236,6 @@
}
})
.then(res => {
- console.log(res);
})
}
},
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index fea39e0..162b08a 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -6,44 +6,44 @@
<div class="contentItem">
<span>鎸夌紪鍙�: </span>
<div>
- <el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="info.code"></el-input>
+ <el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="searchData.number"></el-input>
</div>
</div>
<div class="contentItem">
<span>鎸夌被鍨�: </span>
<div class="search">
- <el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="info.type"></el-input>
+ <el-input placeholder=" 璇疯緭鍏ョ被鍨�" v-model="searchData.categories"></el-input>
</div>
</div>
<div class="contentItem">
<span>鎸夌ぞ鍖�: </span>
<div class="search">
- <el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="info.community"></el-input>
+ <el-input placeholder=" 璇疯緭鍏ョぞ鍖�" v-model="searchData.communityId"></el-input>
</div>
</div>
<div class="contentItem">
<span>鎸変簨鍙戝湴鐐�: </span>
<div class="search">
- <el-input placeholder=" 璇疯緭鍏ョ紪鍙�" v-model="info.site"></el-input>
+ <el-input placeholder=" 璇疯緭鍏ヤ簨鍙戝湴鐐�" v-model="searchData.site"></el-input>
</div>
</div>
<div class="date-search contentItem">
<div class="btn">
- <el-button icon="el-icon-plus" type="primary">鎼滅储</el-button>
+ <el-button icon="el-icon-plus" categories="primary" @click="getList">鎼滅储</el-button>
</div>
</div>
</div>
<div class="headerContent">
<span>鏃堕棿: </span>
- <div>
- <el-input placeholder=" 璇疯緭鍏ュ紑濮嬫椂闂�" v-model="info.startTime"></el-input>
- </div>
- <div class="line">
- --
- </div>
- <div>
- <el-input placeholder=" 璇疯緭鍏ョ粨鏉熸椂闂�" v-model="info.endTime"></el-input>
- </div>
+ <el-date-picker
+ v-model="datepick"
+ type="daterange"
+ @change="datepickChange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</div>
</header>
<main>
@@ -53,11 +53,11 @@
:header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
- <el-table-column type="selection" min-width="5">
+ <el-table-column categories="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
+ <el-table-column prop="id" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
- <el-link @click="JumpView(scope.row)">{{ scope.row.code }}</el-link>
+ <el-link @click="JumpView(scope.row)">{{ scope.row.id }}</el-link>
</template>
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8">
@@ -68,7 +68,7 @@
<el-table-column :prop="myproblem === 1 ? 'category' : 'category'"
:label="myproblem === 1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem === 1 ? '10' : '20'">
</el-table-column>
- <el-table-column :prop="myproblem === 1 ? 'type' : 'site'"
+ <el-table-column :prop="myproblem === 1 ? 'categories' : 'site'"
:label="myproblem === 1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
<el-table-column :prop="myproblem === 1 ? 'actionCause' : 'communityId'"
@@ -96,22 +96,22 @@
</el-table-column>
</el-table>
<!-- 瀹℃牳椤甸潰 -->
- <el-dialog :visible.sync="dialogExamine" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
+ <el-dialog :visible.sync="dialogExamine" width="80%" title="鍩虹淇℃伅(浜哄伐)"
:before-close="handleClose">
<MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine>
<MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine>
</el-dialog>
<!-- 缁撴椤甸潰 -->
- <el-dialog :visible.sync="dialogClosure" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
+ <el-dialog :visible.sync="dialogClosure" width="80%" title="鍩虹淇℃伅(浜哄伐)"
:before-close="handleClose">
<MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure>
<MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure>
</el-dialog>
<!-- 璇︽儏椤甸潰 -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)"
:before-close="handleNoClose">
- <MyDetail :info=info v-if="myproblem === 1" :mycode='code'></MyDetail>
- <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
+ <MyDetail :info=info v-if="myproblem === 1" :mycode='number'></MyDetail>
+ <MyIllDetail :info=info v-else :mycode="number"></MyIllDetail>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -132,8 +132,7 @@
</div>
<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">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -149,12 +148,15 @@
import MyDetail from '@/components/detail'
import MyIllDetail from '@/components/illdetail'
import helper from '@/utils/mydate'
+import casequery from "@/api/operate/casequery";
+
export default {
components: {
MyExamine, MyClosure, MyDetail, MyIllDetail, MyIllExamine, MyIllClosure
},
data() {
return {
+ datepick: null,
tableData: [],
dialogExamine: false,
dialogClosure: false,
@@ -202,30 +204,36 @@
caseId: '',
myproblem: 1,
instatus: 7,
- code: ''
+ number: '',
+ searchData: {
+ categories: null,
+ number: null,
+ communityId: null,
+ endTime: null,
+ site: null,
+ startTime: null
+ }
}
},
created() {
- this.getUserList();
+ this.getList();
},
methods: {
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
this.$axios({
method: 'delete',
url: 'sccg/violations/batch_delete?ids=' + idArr,
}).then(res => {
- this.getUserList();
+ this.getList();
this.$message({
message: res.message,
- type: res.code === 200 ? 'success' : 'warning'
+ categories: res.number === 200 ? 'success' : 'warning'
})
})
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -234,7 +242,7 @@
} else {
this.myIdx = this.preMyIdx;
this.$message({
- type: 'warning',
+ categories: 'warning',
message: '鎮ㄨ繕娌￠�変腑浠讳綍鏁版嵁',
})
}
@@ -243,13 +251,9 @@
tableChange(list) {
this.tempList = [];
list.forEach(item => {
- this.tempList.push(item.code);
+ this.tempList.push(item.number);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -263,61 +267,50 @@
},
// 鍒犻櫎鍗曟潯鏁版嵁
handleDelete({ number }) {
- console.log(number);
this.$confirm('纭鍒犻櫎锛�')
.then(_ => {
- console.log(1);
this.$axios({
method: 'delete',
url: `sccg/violations/delete?id=${number}`,
})
.then(res => {
- console.log(res);
this.$message({
- type: res.code === 200 ? 'success' : 'warning',
+ categories: res.number === 200 ? 'success' : 'warning',
message: res.message
})
- this.getUserList();
+ this.getList();
})
})
.catch(_ => { console.log(2) });
},
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const { currentPage, pageSize, instatus, myproblem } = this;
- this.$axios({
- method: 'get',
- url: `sccg/base_case/query?state=${instatus}¤t=${currentPage}&size=${pageSize}&resource=2&type=${myproblem}`
- }).then(res => {
- this.totalNum = res.data.total;
- this.tableData = res.data.records;
- })
+ // 鑾峰彇鍒楄〃
+ getList() {
+ casequery.baseCaseQuery({ current: this.currentPage, pageSize: this.pageSize, ...this.searchData })
+ .then((res) => {
+ this.tableData = res;
+ })
+ .catch(err => this.$message({ type: 'error', message: err }))
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.getUserList();
+ this.getList();
},
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
+
+ datepickChange() {
+ this.searchData.startTime = this.datepick[0];
+ this.searchData.endTime = this.datepick[1].replace('00:00:00', '23:59:59');
},
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getUserList();
- },
+
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
.then(_ => {
@@ -329,68 +322,27 @@
handleNoClose(done) {
done();
},
- async JumpView(data) {
- this.code = data.code
- await this.getEventInfo(data.code);
+ JumpView(data) {
+
},
- // 鑾峰彇妗堜欢淇℃伅
- getEventInfo(code) {
- this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${code}`
- })
- .then(res => {
- console.log(res);
- this.info = res.data;
- this.dialogView = true;
- })
- },
- // 鑾峰彇妗堜欢淇℃伅
- getEventInfo3(code) {
- this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${code}`
- })
- .then(res => {
- console.log(res);
- this.info = res.data;
- this.dialogExamine = true;
- })
- },
- // 鑾峰彇妗堜欢淇℃伅
- getEventInfo2(code) {
- this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${code}`
- })
- .then(res => {
- console.log(res);
- this.info = res.data;
- this.dialogClosure = true;
- })
- },
- // 鍘诲鏍�
- handleExamine({ code }) {
- this.getEventInfo3(code);
- },
- // 鍘荤粨妗�
- handleClosure({ code }) {
- this.getEventInfo2(code);
- },
+
// 鍏抽棴dialog
closeDialog({ flag }) {
this.dialogExamine = flag;
this.dialogClosure = flag;
- this.getUserList();
+ this.getList();
},
+
// 闂绫诲瀷
changeMyProblem(val) {
- this.getUserList();
+ this.getList();
},
+
// 瀹℃牳鐘舵��
changeInStatus(val) {
- this.getUserList();
+ this.getList();
},
+
filterTime(time) {
return helper(time);
}
@@ -407,7 +359,6 @@
display: flex;
line-height: 60px;
flex-direction: column;
- // justify-content: space-between;
padding: 0 20px;
color: #4b9bb7;
@@ -436,7 +387,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover {
cursor: pointer;
@@ -610,5 +560,9 @@
&::v-deep .el-dialog__body {
padding: 0;
}
+
+ &::v-deep .el-range-input {
+ background-color: #06122c;
+ }
}
</style>
\ No newline at end of file
diff --git a/src/views/systemSetting/baseSetting/department/index.vue b/src/views/systemSetting/baseSetting/department/index.vue
index 50452b4..1ae0aa0 100644
--- a/src/views/systemSetting/baseSetting/department/index.vue
+++ b/src/views/systemSetting/baseSetting/department/index.vue
@@ -264,7 +264,6 @@
id,
},
}).then((res) => {
- console.log(res);
this.$message({
type: res.code === 404 ? "warning" : "success",
message: res.message,
diff --git a/src/views/systemSetting/baseSetting/role/index.vue b/src/views/systemSetting/baseSetting/role/index.vue
index cad254b..0f25179 100644
--- a/src/views/systemSetting/baseSetting/role/index.vue
+++ b/src/views/systemSetting/baseSetting/role/index.vue
@@ -185,7 +185,6 @@
message: res.message
})
}
- console.log(res);
})
})
.catch(err => { console.log(err) })
@@ -225,7 +224,6 @@
.then(res => {
this.myIdx = 0;
this.preMyIdx = 0;
- console.log(res);
this.$message({
type: 'success',
message: res.message
@@ -269,7 +267,6 @@
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;
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index 7909708..fbb6ce5 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -266,7 +266,6 @@
message: res.message,
});
}
- console.log(res);
});
})
.catch((err) => {
@@ -299,7 +298,6 @@
message: res.message,
});
}
- console.log(res);
});
})
.catch((err) => {
@@ -325,7 +323,6 @@
method: "post",
url: "sccg/admin/delete/" + id,
}).then((res) => {
- console.log(res);
this.$message({
message: res.message,
type: "success",
@@ -387,7 +384,6 @@
this.$axios
.post(`sccg/admin/updateStatus/` + id + "?status=" + status)
.then((res) => {
- console.log(res);
});
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
diff --git a/src/views/systemSetting/device/bayonet/create/index.vue b/src/views/systemSetting/device/bayonet/create/index.vue
index a97553f..0f490db 100644
--- a/src/views/systemSetting/device/bayonet/create/index.vue
+++ b/src/views/systemSetting/device/bayonet/create/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="create">
- <el-form ref="device" label-position="right" label-width="120px" :model="bayonet" :rule="rules">
+ <el-form ref="device" label-position="right" label-width="120px" :model="bayonet" :rules="rules">
<!-- 鍗″彛鍚嶇О -->
<div class="device-item">
<div class="item-left">
@@ -25,8 +25,8 @@
<!-- 鎵�灞炲尯鍩� -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鎵�灞炲尯鍩�:" prop="area">
- <el-input v-model="bayonet.area" placeholder="璇峰～鍐欏尯鍩熷悕绉�"></el-input>
+ <el-form-item label="鎵�灞炲尯鍩�:" prop="belong_area">
+ <el-input v-model="bayonet.belong_area" placeholder="璇峰～鍐欏尯鍩熷悕绉�"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -34,8 +34,8 @@
<!-- 鍩熷悕/ip -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鍩熷悕/IP:" prop="domainName">
- <el-input v-model="bayonet.domainName" placeholder="璇峰～鍐欏煙鍚嶆垨鑰匢P"></el-input>
+ <el-form-item label="鍩熷悕/IP:" prop="ipAddress">
+ <el-input v-model="bayonet.ipAddress" placeholder="璇峰～鍐欏煙鍚嶆垨鑰匢P"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -52,8 +52,8 @@
<!-- 鍓嶇绫诲瀷 -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鍓嶇绫诲瀷:" prop="webType">
- <el-input v-model="bayonet.webType" placeholder="璇疯緭鍏ュ墠绔被鍨�"></el-input>
+ <el-form-item label="鍓嶇绫诲瀷:" prop="frontEndType">
+ <el-input v-model="bayonet.frontEndType" placeholder="璇疯緭鍏ュ墠绔被鍨�"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -61,8 +61,8 @@
<!-- 鍑哄叆鍩庣被鍨� -->
<div class="device-item">
<div class="item-left">
- <el-form-item label="鍑哄叆鍩庣被鍨�:" prop="cityType">
- <el-input v-model="bayonet.cityType" placeholder="鍑哄煄/鍏ュ煄"></el-input>
+ <el-form-item label="鍑哄叆鍩庣被鍨�:" prop="inOutCityType">
+ <el-input v-model="bayonet.inOutCityType" placeholder="鍑哄煄/鍏ュ煄"></el-input>
</el-form-item>
</div>
<div class="item-right"></div>
@@ -78,32 +78,89 @@
</div>
<!-- 鎸夐挳 -->
<div class="device-btn">
- <el-button>杩斿洖</el-button>
- <el-button type="primary">纭畾</el-button>
+ <el-button @click="closeDialog">杩斿洖</el-button>
+ <el-button type="primary" @click="onSubmit">纭畾</el-button>
</div>
</el-form>
</div>
</template>
<script>
-export default {
- data() {
- return {
- bayonet: {
- bayonetName: '',
- latitude: '',
- longitude: '',
- area: '',
- ipAddress: '',
- port: '',
- frontEndType: '',
- inOutCityType: '',
- description: '',
- },
- rules: {
+import bayonet from "@/api/system/bayonet";
+import { deepClone } from "@/utils/helper";
- }
- }
+export default {
+ props: {
+ originalBayonet: {
+ type: Object,
+ default: () => {}
},
+ isEdit: {
+ type: Boolean,
+ default: () => false
+ }
+ },
+
+ data() {
+ return {
+ bayonet: {
+ name: '',
+ latitude: '',
+ longitude: '',
+ belong_area: '',
+ ipAddress: '',
+ port: '',
+ frontEndType: '',
+ inOutCityType: '',
+ description: ''
+ },
+ rules: {
+ name: [{ required: true, trigger: 'blur', message: '璇峰～鍐欏崱鍙ｅ悕绉�' }],
+ latitude: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欑含搴︿綅缃�' }],
+ longitude: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欑粡搴︿綅缃�' }],
+ belong_area: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏尯鍩熷悕绉�' }],
+ ipAddress: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏煙鍚嶆垨鑰匢P' }],
+ port: [{ required: true, trigger: ['blur', 'change'], message: '璇疯緭鍏ョ鍙ｅ彿' }],
+ frontEndType: [{ required: true, trigger: ['blur', 'change'], message: '璇疯緭鍏ュ墠绔被鍨�' }],
+ inOutCityType: [{ required: true, trigger: ['blur', 'change'], message: '璇峰～鍐欏嚭鍩�/鍏ュ煄' }],
+ description: [{ required: true, trigger: ['blur', 'change'], message: '璇疯緭鍏ユ弿杩板唴瀹�' }]
+ }
+ }
+ },
+
+ methods: {
+ onSubmit() {
+ this.$refs.device.validate(valid => {
+ if (valid) {
+ const copyBayonet = deepClone(this.bayonet);
+ if (!this.isEdit) {
+ bayonet.addBayonet(this.bayonet)
+ .then(() => {
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ this.$emit('closeDialog');
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ })
+ } else {
+ bayonet.updateBayonet(copyBayonet)
+ .then(() => {
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ this.$emit('closeDialog');
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ })
+ }
+ } else {
+ this.$message({ type: 'warning', message: '璇锋鏌ュ繀濉」' });
+ }
+ });
+ },
+
+ closeDialog() {
+ this.$emit('closeDialog');
+ }
+ }
}
</script>
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 00ff0a4..5117c56 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -4,7 +4,7 @@
<div class="header-content">
<div class="search">
<span style="padding-right:20px">绛涢�夋潯浠�:</span>
- <el-select v-model="context" placeholder="璇烽�夋嫨">
+ <el-select v-model="context" placeholder="璇烽�夋嫨" @change="getBayonetListData">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -14,24 +14,24 @@
<main>
<div class="main-content">
<div class="main-title">
- <el-button class="el-icon-plus" type="primary" @click="dialogCreate = true">娣诲姞</el-button>
+ <el-button class="el-icon-plus" type="primary" @click="showDialog(false, null)">娣诲姞</el-button>
<el-button @click="handleExport">瀵煎嚭鍗″彛</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
- <MyTable
+ <MyTable
:tableOption="tableOption"
:tableData="list"
:pageShow="false">
<template #operation="info">
- <el-link :underline="false" style="color:#4b9bb7">缂栬緫</el-link>
+ <el-link :underline="false" style="color:#4b9bb7" @click="showDialog(true, info)">缂栬緫</el-link>
</template>
</MyTable>
</div>
</main>
<footer>
<!-- 娣诲姞鍗″彛 -->
- <el-dialog title="娣诲姞鍗″彛" :visible.sync="dialogCreate" width="60%" :before-close="handleClose">
- <MyCreate :addBayonet="addBayonet"></MyCreate>
+ <el-dialog :title="getDialogTitle" :visible.sync="isShowDialog" width="60%" :before-close="handleClose">
+ <MyCreate @closeDialog="closeDialog" :originalBayonet="originalBayonet" :isEdit="isEdit"></MyCreate>
</el-dialog>
</footer>
</div>
@@ -39,16 +39,16 @@
<script>
import MyCreate from './create'
import MyTable from '@/components/Table'
-import {myDownLoad} from '@/utils/helper'
-import { createNamespacedHelpers } from "vuex";
-const { mapActions } = createNamespacedHelpers("bayonet");
+import bayonet from "@/api/system/bayonet";
+import {downloadFile} from "@/utils/helper";
+
export default {
components: {
MyCreate, MyTable,
},
data() {
return {
- dialogCreate: false,
+ isShowDialog: false,
context: 0,
options: [
{
@@ -75,11 +75,6 @@
type: 'text',
prop: 'latitude',
},
- // {
- // label: '鎵�灞炲尯鍩�',
- // type: 'text',
- // prop: '',
- // },
{
label: '鍩熷悕/IP',
type: 'text',
@@ -107,39 +102,56 @@
},
]
},
+ originalBayonet: null,
+ isEdit: false
}
+ },
+
+ computed: {
+ getDialogTitle() {
+ return this.isEdit ? '缂栬緫鍗″彛' : '鏂板缓鍗″彛';
+ },
},
created() {
- const { setTableData } = this;
- setTableData();
+ this.getBayonetListData();
},
methods: {
- // 寮圭獥鍏抽棴
- handleClose(done) {
- this.$confirm('纭鍏抽棴?')
- .then(_ => {
- done();
- })
- },
- ...mapActions(['getBayonetList', 'exportBayonetList','addBayonet']),
- // 璁剧疆tableData
- async setTableData() {
- const { current, size, context } = this;
- let arr = await this.getBayonetList({
- // bayonetName:context,
- current, size
+ getBayonetListData() {
+ bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
+ .then(data => {
+ this.list = data;
})
- this.list = arr.data.data
- },
- // 瀵煎嚭
- async handleExport(){
- const { current, size, context } = this;
- let arr = await this.exportBayonetList({
- current, size
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
})
- myDownLoad(arr);
- console.log(arr);
- }
+ },
+ // 寮圭獥鍏抽棴
+ handleClose(done) {
+ this.$confirm('纭鍏抽棴?')
+ .then(_ => {
+ done();
+ })
+ },
+
+ closeDialog() {
+ this.isShowDialog = false;
+ },
+
+ handleExport() {
+ bayonet.exportBayonetList({ bayonetName: this.context, current: this.current, size: this.size })
+ .then(res => {
+ downloadFile(res);
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ })
+ },
+ showDialog(isEdit, data) {
+ this.isShowDialog = true;
+ this.isEdit = isEdit;
+ this.originalBayonet = data;
+ }
}
}
</script>
@@ -151,7 +163,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-content {
padding: 0 40px;
@@ -186,7 +197,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.main-title {
line-height: 60px;
diff --git a/src/views/systemSetting/device/grid/components/main/index.vue b/src/views/systemSetting/device/grid/components/main/index.vue
index b2ce381..c7c7b5a 100644
--- a/src/views/systemSetting/device/grid/components/main/index.vue
+++ b/src/views/systemSetting/device/grid/components/main/index.vue
@@ -201,7 +201,6 @@
message: res.message
})
}
- console.log(res);
})
})
.catch(err => { console.log(err) })
@@ -228,7 +227,6 @@
message: res.message
})
}
- console.log(res);
})
})
.catch(err => { console.log(err) })
@@ -251,7 +249,6 @@
method: 'post',
url: 'sccg/admin/delete/' + id,
}).then(res => {
- console.log(res);
this.$message({
message: res.message,
type: 'success'
@@ -310,7 +307,6 @@
let { id, status } = obj;
status == true ? status = 1 : status = 0;
this.$axios.post(`sccg/admin/updateStatus/` + id + '?status=' + status).then(res => {
- console.log(res);
})
},
// 鑾峰彇鐢ㄦ埛鍒楄〃
diff --git a/src/views/systemSetting/platform/cockpitManage/index.vue b/src/views/systemSetting/platform/cockpitManage/index.vue
index 80b04b9..0a1d317 100644
--- a/src/views/systemSetting/platform/cockpitManage/index.vue
+++ b/src/views/systemSetting/platform/cockpitManage/index.vue
@@ -136,6 +136,7 @@
import detailUser from "./detailUser";
import { deleteTeam, exportTeamInfo, importTeamInfo, searchTeamInfo } from "@/api/system/portal/teamConstruction";
import {SUCCESS_CODE} from "@/utils";
+import {downloadFile} from "@/utils/helper";
export default {
components: { updateUser, detailUser },
@@ -235,20 +236,8 @@
exportTable() {
exportTeamInfo({ current: this.currentPage, size: this.pageSize, departName: this.searchDepartment, status: this.searchStatus })
.then(res => {
- const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
- const fileName = res.contentDisposition.split('=')[1];
- if (window.navigator && window.navigator.msSaveBlob) {
- navigator.msSaveBlob(blob, fileName);
- } else {
- const link = document.createElement('a');
- link.style.display = 'none';
- link.href = URL.createObjectURL(blob);
- link.setAttribute('download', decodeURI(fileName));
- document.body.appendChild(link);
- link.click();
- URL.revokeObjectURL(link.href);
- document.body.removeChild(link);
- }
+ downloadFile(res);
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
})
.catch(err => {
this.$message({ type: 'error', message: err });
@@ -257,7 +246,7 @@
// 瀵煎叆
importTable(file) {
- importTeamInfo({ 'multipartFile': file.file })
+ importTeamInfo(file.file)
.then(() => {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
this.getDepartmentList();
diff --git a/src/views/systemSetting/platform/otherInterface/components/createInterface/index.vue b/src/views/systemSetting/platform/otherInterface/components/createInterface/index.vue
index 1be774b..095ba36 100644
--- a/src/views/systemSetting/platform/otherInterface/components/createInterface/index.vue
+++ b/src/views/systemSetting/platform/otherInterface/components/createInterface/index.vue
@@ -125,7 +125,6 @@
description:myInterface.description,
applicationName:myInterface.applicationName
}).then(res => {
- console.log(res);
// if (res.code === 200) {
// this.refresh();
// }
diff --git a/src/views/systemSetting/platform/otherInterface/index.vue b/src/views/systemSetting/platform/otherInterface/index.vue
index 8046f6e..b46db9e 100644
--- a/src/views/systemSetting/platform/otherInterface/index.vue
+++ b/src/views/systemSetting/platform/otherInterface/index.vue
@@ -124,7 +124,6 @@
this.$axios.delete('sccg/system/portal/thirdApp/delete',{params:{
id
}}).then(res=>{
- console.log(res);
})
}
// // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
diff --git a/src/views/systemSetting/platform/portalSetting/index.vue b/src/views/systemSetting/platform/portalSetting/index.vue
index 8b3abd4..5d2da31 100644
--- a/src/views/systemSetting/platform/portalSetting/index.vue
+++ b/src/views/systemSetting/platform/portalSetting/index.vue
@@ -119,7 +119,6 @@
url: 'sccg/system/portal/logo/add',
data: icon
}).then(res => {
- console.log(res);
if (res.code == 200) {
this.$axios({
method: 'get',
@@ -142,7 +141,6 @@
url: 'sccg/system/portal/logo/update',
data: obj
}).then(res => {
- console.log(res);
this.$message({
message: res.message,
type: 'success'
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 6e9f237..be892c9 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -250,7 +250,6 @@
},
methods: {
handleNodeClick(data) {
- console.log(data);
}
}
};
--
Gitblit v1.8.0