diff --git a/public/js/config.js b/public/js/config.js index 6068e7b1..cecd9d3d 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -45,8 +45,8 @@ var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目 var showNotBuyMoudle = false; //是否展示未解锁产品 var isDockingToWoer = false; //是否是和沃尔平台对接 // var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws' -var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; -// var mqttUrl = "mqtt://219.147.96.219:1883/ws"; // 包头地址 +// var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; +var mqttUrl = "ws://219.147.96.219:8083/mqtt"; // 包头地址 diff --git a/src/util/tool.js b/src/util/tool.js index b1ab392f..0429b2b2 100644 --- a/src/util/tool.js +++ b/src/util/tool.js @@ -29,7 +29,8 @@ export function verifyFormData(formItems, formData, verifyFlagList = []) { } export function verifyFormInfo(formItems, formData) { - const requiredList = getFormData(formItems); + const newformItems = structuredClone(formItems) + const requiredList = getFormData(newformItems); const verifyFlag = verifyFormData(requiredList, formData); diff --git a/src/views/projectFront/guidancePartyBuilding/thematicActivitie.vue b/src/views/projectFront/guidancePartyBuilding/thematicActivitie.vue index bf878c6a..d5a5ba84 100644 --- a/src/views/projectFront/guidancePartyBuilding/thematicActivitie.vue +++ b/src/views/projectFront/guidancePartyBuilding/thematicActivitie.vue @@ -179,7 +179,7 @@ import { isReadPartyBuildingGuidanceApi, deletePartyBuildingGuidanceInfo } from '@/assets/js/api/guidancePartyBuilding'; - +import { isJSON } from '@/util/nowDate'; import { getCooperatorListApi } from '@/assets/js/api/cooperationUnit'; import { encode } from 'js-base64'; @@ -359,22 +359,35 @@ export default { type: 2 }).then(result => { if (result.success) { - result.result.records.map(item => { - if (item.file.includes('[')) { - item.file = JSON.parse(item.file); - if (item.file.length !== 0 && !item.file[0].url.includes(this.$store.state.FILEURL)) { - item.file[0].url = this.$store.state.FILEURL + item.file[0].url; - } - } else { - let url = item.file; + // result.result.records.map(item => { + // if (item.file.includes('[')) { + // item.file = JSON.parse(item.file); + // if (item.file.length !== 0 && !item.file[0].url.includes(this.$store.state.FILEURL)) { + // item.file[0].url = this.$store.state.FILEURL + item.file[0].url; + // } + // } else { + // let url = item.file; - if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) { - item.file = [{}]; - item.file[0].url = this.$store.state.FILEURL + url; - } - } + // if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) { + // item.file = [{}]; + // item.file[0].url = this.$store.state.FILEURL + url; + // } + // } + // }); + this.List = result.result.records.map(item => { + return { + ...item, + file: + isJSON(item.file) && JSON.parse(item.file) instanceof Array + ? JSON.parse(item.file).map(item => { + return { + ...item, + url: item.url.includes(this.$store.state.FILEURL) ? item.url : this.$store.state.FILEURL + item.url + }; + }) + : [] + }; }); - this.List = result.result.records; this.pagInfo.total = result.result.total; console.log(' this.List', this.List); } diff --git a/src/views/projectFront/pipelineWelding/welderAssessmentRequest.vue b/src/views/projectFront/pipelineWelding/welderAssessmentRequest.vue index 9c7076e0..1761592d 100644 --- a/src/views/projectFront/pipelineWelding/welderAssessmentRequest.vue +++ b/src/views/projectFront/pipelineWelding/welderAssessmentRequest.vue @@ -1113,7 +1113,7 @@ export default { prev.push({ id: 'id-' + Math.random().toString(36).substr(2, 9), code: item['field9226498463854'], - pipeDiameter: item['field5649098552937'], + pipeDiameter: item['field3820208123794'], deviceName: item['field7069298503592'], typeSpecification: item['field9680998508539'], quantity: item['field4745598560972'], @@ -1171,7 +1171,7 @@ export default { const newTableList2 = this.cardForm.tableList2.reduce((prev, item) => { prev.push({ field9226498463854: item.code, - field5649098552937: item.pipeDiameter, + field3820208123794: item.pipeDiameter, field7069298503592: item.deviceName, field9680998508539: item.typeSpecification, field4745598560972: item.quantity, @@ -1485,7 +1485,7 @@ export default { prev.push({ id: 'id-' + Math.random().toString(36).substr(2, 9), code: item['field9226498463854'], - pipeDiameter: item['field5649098552937'], + pipeDiameter: item['field3820208123794'], deviceName: item['field7069298503592'], typeSpecification: item['field9680998508539'], quantity: item['field4745598560972'],