admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：修复工作流提交校验响应式问题 修改焊工field 修改党建专题无附件报错

Browse Source
This commit is contained in:
Rain_ 2025-05-07 17:35:58 +08:00
parent 27e5b6a04f
commit 957c9e160b
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -45,8 +45,8 @@ var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目
var showNotBuyMoudle = false; //是否展示未解锁产品 var showNotBuyMoudle = false; //是否展示未解锁产品
var isDockingToWoer = false; //是否是和沃尔平台对接 var isDockingToWoer = false; //是否是和沃尔平台对接
// var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws' // var mqttUrl = 'mqtt://jxj.zhgdyun.com:1883/ws'
var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt"; // var mqttUrl = "ws://jxj.zhgdyun.com:8083/mqtt";
// var mqttUrl = "mqtt://219.147.96.219:1883/ws"; // 包头地址 var mqttUrl = "ws://219.147.96.219:8083/mqtt"; // 包头地址

3
src/util/tool.js
View File

@ -29,7 +29,8 @@ export function verifyFormData(formItems, formData, verifyFlagList = []) {
} }
export function verifyFormInfo(formItems, formData) { export function verifyFormInfo(formItems, formData) {
const requiredList = getFormData(formItems); const newformItems = structuredClone(formItems)
const requiredList = getFormData(newformItems);
const verifyFlag = verifyFormData(requiredList, formData); const verifyFlag = verifyFormData(requiredList, formData);

43
src/views/projectFront/guidancePartyBuilding/thematicActivitie.vue
View File

@ -179,7 +179,7 @@ import {
isReadPartyBuildingGuidanceApi, isReadPartyBuildingGuidanceApi,
deletePartyBuildingGuidanceInfo deletePartyBuildingGuidanceInfo
} from '@/assets/js/api/guidancePartyBuilding'; } from '@/assets/js/api/guidancePartyBuilding';
import { isJSON } from '@/util/nowDate';
import { getCooperatorListApi } from '@/assets/js/api/cooperationUnit'; import { getCooperatorListApi } from '@/assets/js/api/cooperationUnit';
import { encode } from 'js-base64'; import { encode } from 'js-base64';
@ -359,22 +359,35 @@ export default {
type: 2 type: 2
}).then(result => { }).then(result => {
if (result.success) { if (result.success) {
result.result.records.map(item => { // result.result.records.map(item => {
if (item.file.includes('[')) { // if (item.file.includes('[')) {
item.file = JSON.parse(item.file); // item.file = JSON.parse(item.file);
if (item.file.length !== 0 && !item.file[0].url.includes(this.$store.state.FILEURL)) { // 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; // item.file[0].url = this.$store.state.FILEURL + item.file[0].url;
} // }
} else { // } else {
let url = item.file; // let url = item.file;
if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) { // if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
item.file = [{}]; // item.file = [{}];
item.file[0].url = this.$store.state.FILEURL + url; // 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; this.pagInfo.total = result.result.total;
console.log(' this.List', this.List); console.log(' this.List', this.List);
} }

6
src/views/projectFront/pipelineWelding/welderAssessmentRequest.vue
View File

@ -1113,7 +1113,7 @@ export default {
prev.push({ prev.push({
id: 'id-' + Math.random().toString(36).substr(2, 9), id: 'id-' + Math.random().toString(36).substr(2, 9),
code: item['field9226498463854'], code: item['field9226498463854'],
pipeDiameter: item['field5649098552937'], pipeDiameter: item['field3820208123794'],
deviceName: item['field7069298503592'], deviceName: item['field7069298503592'],
typeSpecification: item['field9680998508539'], typeSpecification: item['field9680998508539'],
quantity: item['field4745598560972'], quantity: item['field4745598560972'],
@ -1171,7 +1171,7 @@ export default {
const newTableList2 = this.cardForm.tableList2.reduce((prev, item) => { const newTableList2 = this.cardForm.tableList2.reduce((prev, item) => {
prev.push({ prev.push({
field9226498463854: item.code, field9226498463854: item.code,
field5649098552937: item.pipeDiameter, field3820208123794: item.pipeDiameter,
field7069298503592: item.deviceName, field7069298503592: item.deviceName,
field9680998508539: item.typeSpecification, field9680998508539: item.typeSpecification,
field4745598560972: item.quantity, field4745598560972: item.quantity,
@ -1485,7 +1485,7 @@ export default {
prev.push({ prev.push({
id: 'id-' + Math.random().toString(36).substr(2, 9), id: 'id-' + Math.random().toString(36).substr(2, 9),
code: item['field9226498463854'], code: item['field9226498463854'],
pipeDiameter: item['field5649098552937'], pipeDiameter: item['field3820208123794'],
deviceName: item['field7069298503592'], deviceName: item['field7069298503592'],
typeSpecification: item['field9680998508539'], typeSpecification: item['field9680998508539'],
quantity: item['field4745598560972'], quantity: item['field4745598560972'],