diff --git a/.env.production b/.env.production index 772274e..11d9e2e 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,8 @@ NODE_ENV = "production" # 线上环境接口地址(easymock) # VITE_API_URL = "http://139.9.66.234:6688" -# VITE_API_URL = "http://182.90.224.147:6688" -VITE_API_URL = "http://101.43.164.214:6688" +VITE_API_URL = "http://182.90.224.147:6688" +# VITE_API_URL = "http://101.43.164.214:6688" # 打包 VITE_ULD_API_URL = 'http://182.90.224.147:8012/onlinePreview?url=' diff --git a/src/assets/images/goverHome/工程审批.png b/src/assets/images/goverHome/工程审批.png deleted file mode 100644 index 26d00bb..0000000 Binary files a/src/assets/images/goverHome/工程审批.png and /dev/null differ diff --git a/src/assets/images/goverHome/系统管理.png b/src/assets/images/goverHome/系统管理.png new file mode 100644 index 0000000..de11ff8 Binary files /dev/null and b/src/assets/images/goverHome/系统管理.png differ diff --git a/src/assets/images/goverHome/项目报监.png b/src/assets/images/goverHome/项目报监.png index 3ac1a1c..26d00bb 100644 Binary files a/src/assets/images/goverHome/项目报监.png and b/src/assets/images/goverHome/项目报监.png differ diff --git a/src/assets/images/goverHome/项目报监2.png b/src/assets/images/goverHome/项目报监2.png new file mode 100644 index 0000000..3ac1a1c Binary files /dev/null and b/src/assets/images/goverHome/项目报监2.png differ diff --git a/src/views/enterprise/qualitySupervision/components/transformInfo.vue b/src/views/enterprise/qualitySupervision/components/transformInfo.vue index eb76eb8..9b07ec2 100644 --- a/src/views/enterprise/qualitySupervision/components/transformInfo.vue +++ b/src/views/enterprise/qualitySupervision/components/transformInfo.vue @@ -112,10 +112,10 @@ -
+
- 全部整改完成,提交审核 + 全部整改完成,提交审核
@@ -151,11 +151,7 @@
整改情况 - 新增整改记录
@@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框 const recordData = ref([]); // 整改记录表格数据 const recordRowData = ref(); // 整改记录表格行数据 const basicData = ref(); // 基础信息 -const isFinished = ref(true); // 是否全部问题整改完成 const dialogStyle = ref({ "min-width": "824px" }); @@ -343,9 +338,6 @@ const getInfo = async () => { recordData.value = res.result.inspectQuestionList; recordData.value.map(item => { item.image = eval(item.image); - if (item.state == 1 || item.state == 4) { - isFinished.value = false; - } }); console.log(recordData); }; diff --git a/src/views/enterprise/safetySupervision/components/transformInfo.vue b/src/views/enterprise/safetySupervision/components/transformInfo.vue index b76ddce..ce721f4 100644 --- a/src/views/enterprise/safetySupervision/components/transformInfo.vue +++ b/src/views/enterprise/safetySupervision/components/transformInfo.vue @@ -112,10 +112,10 @@ -
+
- 全部整改完成,提交审核 + 全部整改完成,提交审核
@@ -151,11 +151,7 @@
整改情况 - 新增整改记录
@@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框 const recordData = ref([]); // 整改记录表格数据 const recordRowData = ref(); // 整改记录表格行数据 const basicData = ref(); // 基础信息 -const isFinished = ref(true); // 是否全部问题整改完成 const dialogStyle = ref({ "min-width": "824px" }); @@ -344,9 +339,6 @@ const getInfo = async () => { recordData.value = res.result.inspectQuestionList; recordData.value.map(item => { item.image = eval(item.image); - if (item.state == 1 || item.state == 4) { - isFinished.value = false; - } }); console.log(recordData); }; diff --git a/src/views/goverment/notice/newNotification/index.vue b/src/views/goverment/notice/newNotification/index.vue index 8d987ea..2558f26 100644 --- a/src/views/goverment/notice/newNotification/index.vue +++ b/src/views/goverment/notice/newNotification/index.vue @@ -188,10 +188,12 @@ const getMsg = val => { leftForm.value.content = val; }; const handlechange = e => { + console.log(e); current.value.files = e.map(item => { item.label = current.value.dictLabel; return item; }); + console.log(annexFileList.value); }; // 通讯录过滤寻找匹配合适项 let nameList = computed(val => { @@ -305,12 +307,14 @@ const handleSubmit = async (formEl: FormInstance | undefined) => { tags.value.forEach(item => { const curr: acceptNameList = {}; console.log(item); - if (item.sn) { + if (item.userId) { (curr.accept = item.userId), (curr.acceptType = 2); } else if (item.enterpriseSn) { (curr.accept = item.enterpriseSn), (curr.acceptType = 3); - } else { + } else if (item.projectSn) { (curr.accept = item.projectSn), (curr.acceptType = 4); + } else { + (curr.accept = item.accept), (curr.acceptType = item.acceptType); } console.log(curr); acceptsList.push(curr); @@ -411,7 +415,7 @@ onMounted(async () => { item.files = files; // item.fileName = store.Message?.title; }); - + console.log(annexFileList.value); tags.value = store.Message.acceptList; tags.value.forEach(item => { diff --git a/src/views/goverment/qualitySupervision/components/transformInfo.vue b/src/views/goverment/qualitySupervision/components/transformInfo.vue index a88dcbf..d90700d 100644 --- a/src/views/goverment/qualitySupervision/components/transformInfo.vue +++ b/src/views/goverment/qualitySupervision/components/transformInfo.vue @@ -112,7 +112,7 @@ -
+
驳回,请尽快整改 @@ -406,10 +406,10 @@ onMounted(() => {}); font-family: Source Han Sans CN-Medium, Source Han Sans CN; font-weight: 500; color: #333333; - } - > span { - font-weight: 400; - color: #008bff; + > span { + font-weight: 400; + color: #008bff; + } } } } diff --git a/src/views/goverment/safetySupervision/components/transformInfo.vue b/src/views/goverment/safetySupervision/components/transformInfo.vue index 8489db7..93db9ee 100644 --- a/src/views/goverment/safetySupervision/components/transformInfo.vue +++ b/src/views/goverment/safetySupervision/components/transformInfo.vue @@ -112,7 +112,7 @@
-
+
驳回,请尽快整改 @@ -407,10 +407,10 @@ onMounted(() => {}); font-family: Source Han Sans CN-Medium, Source Han Sans CN; font-weight: 500; color: #333333; - } - > span { - font-weight: 400; - color: #008bff; + > span { + font-weight: 400; + color: #008bff; + } } } } diff --git a/src/views/project/qualitySupervision/components/transformInfo.vue b/src/views/project/qualitySupervision/components/transformInfo.vue index b5b7604..b025c65 100644 --- a/src/views/project/qualitySupervision/components/transformInfo.vue +++ b/src/views/project/qualitySupervision/components/transformInfo.vue @@ -112,10 +112,10 @@
-
+
- 全部整改完成,提交审核 + 全部整改完成,提交审核
@@ -151,11 +151,7 @@
整改情况 - 新增整改记录
@@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框 const recordData = ref([]); // 整改记录表格数据 const recordRowData = ref(); // 整改记录表格行数据 const basicData = ref(); // 基础信息 -const isFinished = ref(true); // 是否全部问题整改完成 const dialogStyle = ref({ "min-width": "824px" }); @@ -344,9 +339,6 @@ const getInfo = async () => { recordData.value = res.result.inspectQuestionList; recordData.value.map(item => { item.image = eval(item.image); - if (item.state == 1 || item.state == 4) { - isFinished.value = false; - } }); console.log(recordData); }; diff --git a/src/views/project/safetySupervision/components/transformInfo.vue b/src/views/project/safetySupervision/components/transformInfo.vue index f7ff942..a5963a1 100644 --- a/src/views/project/safetySupervision/components/transformInfo.vue +++ b/src/views/project/safetySupervision/components/transformInfo.vue @@ -112,10 +112,10 @@
-
+
- 全部整改完成,提交审核 + 全部整改完成,提交审核
@@ -151,11 +151,7 @@
整改情况 - 新增整改记录
@@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框 const recordData = ref([]); // 整改记录表格数据 const recordRowData = ref(); // 整改记录表格行数据 const basicData = ref(); // 基础信息 -const isFinished = ref(true); // 是否全部问题整改完成 const dialogStyle = ref({ "min-width": "824px" }); @@ -343,9 +338,6 @@ const getInfo = async () => { recordData.value = res.result.inspectQuestionList; recordData.value.map(item => { item.image = eval(item.image); - if (item.state == 1 || item.state == 4) { - isFinished.value = false; - } }); console.log(recordData); };