diff --git a/.env.development b/.env.development
index e274eaa..a8a9f1c 100644
--- a/.env.development
+++ b/.env.development
@@ -2,14 +2,14 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
-VITE_API_URL = 'http://192.168.34.155:6688'
+# VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://183.63.230.59:6090'
# VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
-# VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
+VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
# 上传
-VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
-# VITE_ULD_API_URL = 'http://jxjzw.zhgdyun.com:8012/onlinePreview?url='
+# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
+VITE_ULD_API_URL = 'http://jxjzw.zhgdyun.com:8012/onlinePreview?url='
diff --git a/src/enums/httpEnum.ts b/src/enums/httpEnum.ts
index 06b968f..b7d0147 100644
--- a/src/enums/httpEnum.ts
+++ b/src/enums/httpEnum.ts
@@ -6,7 +6,7 @@ export enum ResultEnum {
SUCCESS = 200,
ERROR = 500,
OVERDUE = 401,
- TIMEOUT = 30000,
+ TIMEOUT = 60000,
TYPE = "success"
}
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 270d57a..6145d1e 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -321,3 +321,16 @@ export function sendIframeMessage(msg: any, type: any, iframeEle: any | undefine
window.parent.postMessage(msg, "*");
}
}
+// 替换指定字符串内容
+export function getSubstringAfter(str: string, searchStr: string) {
+ // 查找searchStr在str中的位置
+ const index = str.indexOf(searchStr);
+ console.log(index, searchStr);
+ // 如果找到了,则截取searchStr之后的内容(包括searchStr之后的所有字符)
+ // 如果不想包括searchStr本身,可以调整startIndex为index + searchStr.length
+ if (index !== -1) {
+ return str.substring(index + searchStr.length);
+ }
+ // 如果没有找到,返回原字符串或null等,根据需求决定
+ return false; // 或者返回空字符串"",表示没有找到
+}
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
index ec54b52..256622a 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
@@ -88,7 +88,9 @@ const next = async (data: { [key: string]: OverviewForm }, isTemporary: any) =>
annexFileList.value.push(...item.files);
}
});
- addRepostData.value.annexFiles = annexFileList.value;
+ console.log(annexFileList.value, 22222222);
+ const map = new Map();
+ addRepostData.value.annexFiles = annexFileList.value.filter(v => !map.has(v.fileUrl) && map.set(v.fileUrl, v));
console.log(annexFileList.value, 111222);
console.log(addRepostData.value, 111222);
if (isTemporary) {
@@ -111,6 +113,7 @@ const submit = async () => {
if (Array.isArray(requestData.projectSecondType)) {
requestData.projectSecondType = requestData.projectSecondType.join(",");
}
+
if (!store.Message) {
const data = await addPreEngineering(requestData);
ElMessage.success(data.message);
@@ -129,7 +132,10 @@ const temporarySave = async () => {
let requestData = {
...addRepostData.value,
isDraft: 1 // 1代表暂存
- };
+ } as any;
+ if (Array.isArray(requestData.projectSecondType)) {
+ requestData.projectSecondType = requestData.projectSecondType.join(",");
+ }
if (!store.Message) {
const data = await addPreEngineering(requestData);
store.Message = { id: data.result };
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
index 807ded1..fc081f7 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
@@ -38,8 +38,8 @@
-
-
+
+
@@ -144,7 +144,7 @@
@@ -315,7 +315,11 @@ onMounted(async () => {
item.files = files;
});
}
- form.value.projectSecondType = store.Message.projectSecondType.split(",").map((item: string) => Number(item));
+ // console.log(111111, store.Message.projectSecondType, store.Message.projectSecondType.split(","));
+ form.value.projectSecondType =
+ store.Message.projectSecondType && store.Message.projectSecondType.split(",").map((item: string) => Number(item));
+ // console.log(form.value.projectSecondType);
+ form.value.allCost = store.Message.allCost;
}
// if (store.Message) {
// form.value = store.Message;
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
index 9993549..5739f37 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
@@ -116,7 +116,7 @@
@@ -150,7 +150,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
index ea80d7d..4334c6e 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
@@ -154,7 +154,7 @@
@@ -188,7 +188,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
index 9e1e5a2..0cda0e9 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
@@ -78,7 +78,7 @@
@@ -112,7 +112,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
index 0328153..808da60 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
@@ -105,7 +105,7 @@
@@ -139,7 +139,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
index ceaf051..9fcee36 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
@@ -102,7 +102,7 @@
@@ -136,7 +136,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
index 51d37df..db54f52 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
@@ -86,7 +86,7 @@
@@ -120,7 +120,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
index fdeb123..61643ff 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
@@ -242,7 +242,9 @@
@@ -276,7 +278,7 @@ const showFilesUpload = ref(false);
const current = ref({} as AnnexFilesOptions);
const dictLabel = ref(undefined);
-const store = GlobalStore();
+const store: any = GlobalStore();
const isOpen = ref(false);
const props = defineProps(["reportPersonList"]);
const emit = defineEmits<{
@@ -408,7 +410,7 @@ const addFormContentFn = (index: number) => {
form.value.isNine = true;
let arr = [
{ dictValue: "编制文件", files: [] },
- { dictValue: "批复文件", files: [] },
+ { dictValue: "批复文件", files: [] }
// { dictValue: "其他文件", files: [] }
];
form.value.engineeringSingles.push(...arr);
diff --git a/src/views/goverment/huizhou/preProjectManagement/components/readonlyDialogDiv/index.vue b/src/views/goverment/huizhou/preProjectManagement/components/readonlyDialogDiv/index.vue
index 74a872c..2d0b136 100644
--- a/src/views/goverment/huizhou/preProjectManagement/components/readonlyDialogDiv/index.vue
+++ b/src/views/goverment/huizhou/preProjectManagement/components/readonlyDialogDiv/index.vue
@@ -32,8 +32,8 @@
-
-
+
+
@@ -1214,9 +1214,10 @@ const onPreview = (row: any) => {
const onAppendix = row => {
console.log(row);
dialogVisible.value = true;
- if (row.files.length) {
- current.value = row.files;
- }
+ // if (row.files.length) {
+ // current.value = row.files;
+ // }
+ current.value = row.files;
};
const getDataDetail = async () => {
// console.log(row);
diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
index 62b6b5b..d25efa0 100644
--- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
@@ -313,6 +313,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment";
import { submitReform } from "@/api/modules/project";
+import { getSubstringAfter } from "@/utils/util";
import printJS from "print-js";
const props = defineProps({
detailsDialog: Boolean,
@@ -506,7 +507,13 @@ const getInfo = async () => {
basicData.value = res.result;
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
- item.image = eval(item.image);
+ item.image = eval(item.image).map((ele: any) => {
+ const newUrl = getSubstringAfter(ele.url, "https://xmgl.hyjgxt.cn:6090");
+ return {
+ ...ele,
+ url: newUrl == false ? ele.url : window.location.protocol + "//" + window.location.host + newUrl
+ };
+ });
});
console.log(recordData);
};
@@ -515,7 +522,13 @@ const getTimeLineList = async () => {
const res = await timeLineData({ inspectQuestionId: recordRowData.value.id });
res.result.map(item => {
- item.solveImage = eval(item.solveImage);
+ item.solveImage = eval(item.solveImage).map((ele: any) => {
+ const newUrl = getSubstringAfter(ele.url, "https://xmgl.hyjgxt.cn:6090");
+ return {
+ ...ele,
+ url: newUrl == false ? ele.url : window.location.protocol + "//" + window.location.host + newUrl
+ };
+ });
});
timelineList.value = res.result;
};
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
index ce35f6f..afebafb 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
@@ -307,6 +307,7 @@ import type { FormInstance, UploadProps } from "element-plus";
import { relativeInfo, timeLineData, singleOptionAudit, allOptionAudit } from "@/api/modules/goverment";
import { submitReform } from "@/api/modules/project";
import printJS from "print-js";
+import { getSubstringAfter } from "@/utils/util";
const baseUrl = window.location.protocol + "//" + window.location.host;
// const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({
@@ -492,13 +493,20 @@ const rowClick = row => {
};
// 相关信息接口调用
const getInfo = async () => {
- const res = await relativeInfo({ id: props.relativeId });
+ const res: any = await relativeInfo({ id: props.relativeId });
basicData.value = res.result;
recordData.value = res.result.inspectQuestionList;
- recordData.value.map(item => {
- item.image = eval(item.image);
+ recordData.value.map((item: any) => {
+ item.image = eval(item.image).map((ele: any) => {
+ const newUrl = getSubstringAfter(ele.url, "https://xmgl.hyjgxt.cn:6090");
+ return {
+ ...ele,
+ url: newUrl == false ? ele.url : window.location.protocol + "//" + window.location.host + newUrl
+ };
+ });
});
- console.log(recordData);
+
+ console.log(33333, recordRowData.value);
};
const timelineList = ref([{ name: 1 }]);
// 获取整改情况时间轴列表
@@ -506,7 +514,13 @@ const getTimeLineList = async () => {
const res = await timeLineData({ inspectQuestionId: recordRowData.value.id });
res.result.map(item => {
- item.solveImage = eval(item.solveImage);
+ item.solveImage = eval(item.solveImage).map((ele: any) => {
+ const newUrl = getSubstringAfter(ele.url, "https://xmgl.hyjgxt.cn:6090");
+ return {
+ ...ele,
+ url: newUrl == false ? ele.url : window.location.protocol + "//" + window.location.host + newUrl
+ };
+ });
});
timelineList.value = res.result;
};