From fc60289c320651a4068dfc943d9b8d92448adc66 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 7 Apr 2025 16:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/basic/area/index.vue | 8 ++-- src/views/basic/pm/index.vue | 6 ++- src/views/basic/progressCorrection/index.vue | 16 ++++---- src/views/basic/project/index.vue | 14 ++++--- src/views/basic/quality/index.vue | 38 ++++++++++--------- src/views/basic/single/index.vue | 9 +++-- src/views/device/devData/index.vue | 6 ++- src/views/device/deviceMange/index.vue | 8 ++-- src/views/device/sideband/index.vue | 6 ++- src/views/device/sidebandDevice/index.vue | 14 ++++--- src/views/man-car/car/index.vue | 8 ++-- src/views/man-car/staff/index.vue | 15 ++++---- src/views/man-car/team/index.vue | 16 ++++---- src/views/risk/dutyPlan/index.vue | 8 ++-- .../emergency/components/EmergencyCase.vue | 8 ++-- .../emergency/components/EmergencyPhone.vue | 9 +++-- .../emergency/components/EmergencyProcess.vue | 10 +++-- src/views/system/dict/index.vue | 4 +- src/views/system/menu/index.vue | 6 ++- src/views/system/org/index.vue | 4 +- src/views/system/roles/index.vue | 4 +- src/views/system/user/index.vue | 10 +++-- vue.config.js | 5 ++- 24 files changed, 140 insertions(+), 94 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 897486e..4bde794 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -37,7 +37,7 @@ service.interceptors.request.use(config => { let iscUserId=getIscId(); console.log("iscUserId==="+iscUserId); // 是否需要加密 - let aqEnnable = true; + let aqEnnable = false; // 是否需要设置 token const isToken = (config.headers || {}).isToken === false // 是否需要防止数据重复提交 diff --git a/src/views/basic/area/index.vue b/src/views/basic/area/index.vue index 4299081..f6861c5 100644 --- a/src/views/basic/area/index.vue +++ b/src/views/basic/area/index.vue @@ -287,8 +287,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -319,7 +321,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/basic/pm/index.vue b/src/views/basic/pm/index.vue index b60c70d..e9adc45 100644 --- a/src/views/basic/pm/index.vue +++ b/src/views/basic/pm/index.vue @@ -300,8 +300,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; diff --git a/src/views/basic/progressCorrection/index.vue b/src/views/basic/progressCorrection/index.vue index 7a69fc0..d48f98e 100644 --- a/src/views/basic/progressCorrection/index.vue +++ b/src/views/basic/progressCorrection/index.vue @@ -239,7 +239,7 @@ export default { this.list = response.rows this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false @@ -253,8 +253,10 @@ export default { async handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, async isOpenEditDialog(){ let row = this.checkRow; @@ -263,7 +265,7 @@ export default { // this.$set(this.bidCode,res.data.bidCode) // this.$set(this.titleTwo,this.processType === '线路' ? '杆塔' : '工序计划') // this.temp = Object.assign({}, res.data) - + this.processType = res.data.proType this.titleTwo = this.processType === '线路' ? '杆塔' : '工序计划' this.bidCode = res.data.bidCode @@ -276,7 +278,7 @@ export default { this.$set(this.temp,'bidCode',res.data.bidCode) // this.dialogStatus = 'update' // this.dialogFormVisible = true - + // this.temp = Object.assign({}, res.data) }) await this.getTowerList(); @@ -287,7 +289,7 @@ export default { this.loadWaterMark(); }) },300) - + }, updateData() { this.$refs['dataForm'].validate((valid) => { @@ -308,7 +310,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/basic/project/index.vue b/src/views/basic/project/index.vue index 15ffdef..ca98120 100644 --- a/src/views/basic/project/index.vue +++ b/src/views/basic/project/index.vue @@ -59,9 +59,9 @@ - - - + + + @@ -71,7 +71,7 @@ - + @@ -642,8 +642,10 @@ export default { // 编辑工程 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; diff --git a/src/views/basic/quality/index.vue b/src/views/basic/quality/index.vue index 65d12ca..b7c395d 100644 --- a/src/views/basic/quality/index.vue +++ b/src/views/basic/quality/index.vue @@ -209,20 +209,20 @@ export default { this.dialogFormVisible = false }, loadWaterMark() { - //设置水印内容，这段代码实现的是两行文本内容的水印。 - const nickName = sessionStorage.getItem('nickName'); - const roleName = sessionStorage.getItem('roleName'); - let str1 = nickName ? decryptData(nickName) : ''; - let str2 = roleName ? decryptData(roleName) : ''; - let str3 = '建设部'; - if (nickName || roleName) { - setWaterMark(str1, str2, str3,this.$refs.content); - } + // //设置水印内容，这段代码实现的是两行文本内容的水印。 + // const nickName = sessionStorage.getItem('nickName'); + // const roleName = sessionStorage.getItem('roleName'); + // let str1 = nickName ? decryptData(nickName) : ''; + // let str2 = roleName ? decryptData(roleName) : ''; + // let str3 = '建设部'; + // if (nickName || roleName) { + // setWaterMark(str1, str2, str3,this.$refs.content); + // } }, phoneFormatter(row, column, cellValue, index){ if(row.teamLeaderPhone){ - let teamLeaderPhone = decryptData(row.teamLeaderPhone).replace(/\/g, ''); - const formatPhone = desensitize(teamLeaderPhone,'phone').replace(/\/g, ''); + // let teamLeaderPhone = decryptData(row.teamLeaderPhone).replace(/\/g, ''); + const formatPhone = desensitize(row.teamLeaderPhone,'phone').replace(/\/g, ''); return formatPhone; }else{ return ''; @@ -266,15 +266,17 @@ export default { getList() { this.listLoading = true getQualityList(this.listQuery).then((response) => { + console.log(response) this.list = response.rows.map(item => { + console.log(item) const { score } = item - item.score = Number(score) + item.score = Number(score) if (item.score > 5) item.score = 5 return item }) this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false @@ -303,7 +305,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) } }) @@ -311,8 +313,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -352,7 +356,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/basic/single/index.vue b/src/views/basic/single/index.vue index 01627fa..4f83a83 100644 --- a/src/views/basic/single/index.vue +++ b/src/views/basic/single/index.vue @@ -393,8 +393,11 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -428,7 +431,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/device/devData/index.vue b/src/views/device/devData/index.vue index 0a97475..ff13062 100644 --- a/src/views/device/devData/index.vue +++ b/src/views/device/devData/index.vue @@ -295,8 +295,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; diff --git a/src/views/device/deviceMange/index.vue b/src/views/device/deviceMange/index.vue index d15b4c1..1663bc8 100644 --- a/src/views/device/deviceMange/index.vue +++ b/src/views/device/deviceMange/index.vue @@ -300,8 +300,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -334,7 +336,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/device/sideband/index.vue b/src/views/device/sideband/index.vue index 22ef393..ea4df0e 100644 --- a/src/views/device/sideband/index.vue +++ b/src/views/device/sideband/index.vue @@ -295,8 +295,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; diff --git a/src/views/device/sidebandDevice/index.vue b/src/views/device/sidebandDevice/index.vue index c987581..e29463b 100644 --- a/src/views/device/sidebandDevice/index.vue +++ b/src/views/device/sidebandDevice/index.vue @@ -220,7 +220,7 @@ export default { this.loadWaterMark(); } }, - + methods: { closeDialog(){ removeWatermark(this.$refs.content); @@ -267,7 +267,7 @@ export default { this.list = response.rows this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false @@ -298,7 +298,7 @@ export default { this.dialogFormVisible = false this.getList() }).finally(() => { - + }) } }) @@ -306,8 +306,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -345,7 +347,7 @@ export default { this.dialogFormVisible = false this.getList() }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/man-car/car/index.vue b/src/views/man-car/car/index.vue index dfce839..2c3a59a 100644 --- a/src/views/man-car/car/index.vue +++ b/src/views/man-car/car/index.vue @@ -296,8 +296,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -347,7 +349,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/man-car/staff/index.vue b/src/views/man-car/staff/index.vue index acc757d..9f579ce 100644 --- a/src/views/man-car/staff/index.vue +++ b/src/views/man-car/staff/index.vue @@ -472,9 +472,10 @@ export default { }, // 编辑 handleUpdate(row) { - this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.checkRow = _.cloneDeep(row); + this.isOpenEditDialog(); + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -544,7 +545,7 @@ export default { this.getList() this.dialogFormVisible = false }).finally(() => { - + }) }, // 删除数据 @@ -600,7 +601,7 @@ export default { } }, beforeAvatarUpload(file){ - + }, handleRemoveImageItem(file) { if (!file?.hasOwnProperty('raw')) { @@ -640,7 +641,7 @@ export default { this.getList() this.bindVisible = false }).finally(() => { - + }) } }) @@ -659,7 +660,7 @@ export default { this.getList() this.bindVisible = false }).finally(() => { - + }) } }) diff --git a/src/views/man-car/team/index.vue b/src/views/man-car/team/index.vue index 5e76524..66f47b6 100644 --- a/src/views/man-car/team/index.vue +++ b/src/views/man-car/team/index.vue @@ -263,7 +263,7 @@ export default { }) this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false @@ -300,7 +300,7 @@ export default { this.getList() } }).finally(() => { - + }) } }) @@ -308,8 +308,10 @@ export default { // 编辑 handleUpdate(row) { this.checkRow = _.cloneDeep(row); - this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) - + this.isOpenEditDialog(); + + // this.openModulDialog('验证密码', 'pwdVerifiers', '600px', true) + }, isOpenEditDialog(){ let row = this.checkRow; @@ -347,7 +349,7 @@ export default { if(this.temp.teamLeaderPhone.indexOf('*') > -1){ obj.teamLeaderPhone = this.temp.newTeamLeaderPhone; } - + updateTeamItem(obj).then((response) => { if(response.code==200){ this.$message({ @@ -358,10 +360,10 @@ export default { }) this.checkRow = {}; this.dialogFormVisible = false - this.getList() + this.getList() } }).finally(() => { - + }) }, // 删除数据 diff --git a/src/views/risk/dutyPlan/index.vue b/src/views/risk/dutyPlan/index.vue index 8586ed1..e394381 100644 --- a/src/views/risk/dutyPlan/index.vue +++ b/src/views/risk/dutyPlan/index.vue @@ -100,7 +100,7 @@ - +