From 64b6ffd7145864da552ed0f10eec4316213c9252 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 24 Apr 2024 17:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ah-jjzhgd-web/src/api/basic/project.js | 2 +-
ah-jjzhgd-web/src/api/risk/emergency.js | 15 +++++++++++++++
ah-jjzhgd-web/src/views/basic/project/index.vue | 5 +++--
.../src/views/risk/check/childer/index.vue | 4 ++--
ah-jjzhgd-web/src/views/risk/dutyPlan/index.vue | 7 ++++---
.../src/views/risk/task/components/TaskModal.vue | 10 +---------
ah-jjzhgd-web/src/views/risk/task/index.vue | 6 +++---
ah-jjzhgd-web/src/views/system/org/index.vue | 1 -
8 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/ah-jjzhgd-web/src/api/basic/project.js b/ah-jjzhgd-web/src/api/basic/project.js
index 676b330..7fa99be 100644
--- a/ah-jjzhgd-web/src/api/basic/project.js
+++ b/ah-jjzhgd-web/src/api/basic/project.js
@@ -92,7 +92,7 @@ export function getBuildList(data) {
// 工程完工
export function completeProject(data) {
return request({
- url: '/system/sys/pro/editProStatus',
+ url: '/background/sys/pro/editProStatus',
method: 'post',
data
})
diff --git a/ah-jjzhgd-web/src/api/risk/emergency.js b/ah-jjzhgd-web/src/api/risk/emergency.js
index 2459408..a48a523 100644
--- a/ah-jjzhgd-web/src/api/risk/emergency.js
+++ b/ah-jjzhgd-web/src/api/risk/emergency.js
@@ -50,6 +50,9 @@ export function getEmergencyCaseList(data) {
// 新增应急预案
export function addEmergencyCaseItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/emerge/addYaFile',
method: 'post',
data
@@ -59,6 +62,9 @@ export function addEmergencyCaseItem(data) {
// 编辑应急预案
export function updateEmergencyCaseItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/emerge/updateYaFile',
method: 'post',
data
@@ -78,6 +84,9 @@ export function deleteEmergencyCaseItem(data) {
// 查询应急流程列表
export function getEmergencyProcessList(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/emerge/getLcList',
method: 'get',
params: data
@@ -87,6 +96,9 @@ export function getEmergencyProcessList(data) {
// 新增应急流程
export function addEmergencyProcessItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/emerge/addLcFile',
method: 'post',
data
@@ -96,6 +108,9 @@ export function addEmergencyProcessItem(data) {
// 编辑应急流程
export function updateEmergencyProcessItem(data) {
return request({
+ headers: { // 修改请求头
+ 'decrypt': 'decrypt'
+ },
url: '/background/back/emerge/updateLcFile',
method: 'post',
data
diff --git a/ah-jjzhgd-web/src/views/basic/project/index.vue b/ah-jjzhgd-web/src/views/basic/project/index.vue
index 59647e6..8572162 100644
--- a/ah-jjzhgd-web/src/views/basic/project/index.vue
+++ b/ah-jjzhgd-web/src/views/basic/project/index.vue
@@ -330,6 +330,7 @@
v-model="completeForm.endTime"
style="width: 100%"
type="date"
+ value-format="yyyy-MM-dd"
placeholder="选择日期"
/>
@@ -497,7 +498,7 @@ export default {
this.list = response.rows
this.total = response.total
}).finally(() => {
-
+
})
setTimeout(()=>{
this.listLoading = false
@@ -652,7 +653,7 @@ export default {
this.getList()
this.completeModalVisible = false
}).finally(() => {
-
+
})
}
})
diff --git a/ah-jjzhgd-web/src/views/risk/check/childer/index.vue b/ah-jjzhgd-web/src/views/risk/check/childer/index.vue
index 1cc1899..1d71add 100644
--- a/ah-jjzhgd-web/src/views/risk/check/childer/index.vue
+++ b/ah-jjzhgd-web/src/views/risk/check/childer/index.vue
@@ -12,7 +12,7 @@
-
+
已分配
未分配
@@ -89,7 +89,7 @@ export default {
props:['componentVisible','userId','type','parentList'],
data() {
return {
- types:'2',
+ types:'',
orgId:'',
addType:0,
tableKey: 0,
diff --git a/ah-jjzhgd-web/src/views/risk/dutyPlan/index.vue b/ah-jjzhgd-web/src/views/risk/dutyPlan/index.vue
index e6e4997..4687808 100644
--- a/ah-jjzhgd-web/src/views/risk/dutyPlan/index.vue
+++ b/ah-jjzhgd-web/src/views/risk/dutyPlan/index.vue
@@ -170,6 +170,7 @@ export default {
handleExit() {
this.planEditMode = false
this.temp = _.cloneDeep(defaultTmp)
+ this.getDutyPlan();
},
// 导出班组
handleExport() {
@@ -196,7 +197,7 @@ export default {
}
this.total = response.total
}).finally(() => {
-
+
})
setTimeout(()=>{
this.listLoading = false
@@ -230,7 +231,7 @@ export default {
})
this.temp = Object.assign({}, tmp)
}).finally(() => {
-
+
})
setTimeout(()=>{
this.listLoading = false
@@ -259,7 +260,7 @@ export default {
this.getDutyPlan()
this.dialogFormVisible = false
}).finally(() => {
-
+
})
}
})
diff --git a/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue b/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue
index 4fdbef4..bd0aac7 100644
--- a/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue
+++ b/ah-jjzhgd-web/src/views/risk/task/components/TaskModal.vue
@@ -11,15 +11,7 @@
@keyup.enter.native="handleFilter"
/>
-
-
+
查询
-
- 新增
-
+
+
+