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

Merge branch 'uat' of http://192.168.34.160:8023/admin/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
Rain_ 2025-06-21 11:48:19 +08:00
commit 2038b349e3
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/index.js
View File

@ -76,7 +76,7 @@ export default new Vuex.Store({
// FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信
// UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色
// FILEURL: 'http://101.43.164.214:11111/image/', // 百色
// WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色
WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地

46
src/views/projectFront/quality/businessModule/checkPoint.vue
View File

@ -274,6 +274,23 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="闸机设备">
<el-select
v-model="form.ufaceDevIds"
multiple
:placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%"
clearable
>
<el-option
v-for="item in allUfaceDev"
:key="item.id"
:label="item.devName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('message.quality.explain')">
<el-input prop="remark" v-model="form.remark" type="textarea"></el-input>
</el-form-item>
@ -319,6 +336,9 @@ import {
deleteBatchQualityRegionListApi,
getQualityRegionTreePageApi,
} from "@/assets/js/api/quality.js";
import {
ufaceDevList
} from "@/assets/js/api/laborPerson";
import {
getProjectChilderSystemUserListApi,
getEnterpriseInfoListApi,
@ -340,6 +360,8 @@ export default {
regionName: "",
dutyId: "",
aiDeviceId: "",
ufaceDevIds: [],
ufaceDevList: [],
personId: null,
intendanceIds: [],
intendanceNames: "",
@ -378,6 +400,7 @@ export default {
regionName: "",
},
total: 0,
allUfaceDev: []
};
},
created() {
@ -385,6 +408,7 @@ export default {
this.getQualityRegionList();
this.getUpdateUnitListFn();
this.getAIDeviceFn();
this.getMachineList();
},
methods: {
handleQuery() {
@ -434,6 +458,12 @@ export default {
if (item.children instanceof Array && item.children.length > 0) {
this.toggleSelectionAll(item.children, isExpandAll);
}
})
},
//获取所有的闸机设备
getMachineList() {
ufaceDevList({ projectSn: this.$store.state.projectSn }).then((list) => {
this.allUfaceDev = list.result;
});
},
// 获取AI设备
@ -472,6 +502,8 @@ export default {
dutyId: [],
personId: [],
aiDeviceId: "",
ufaceDevIds: [],
ufaceDevList: [],
intendanceIds: [],
intendanceNames: "",
remark: "",
@ -549,6 +581,13 @@ export default {
} else {
this.form.aiDeviceId = [];
}
if (value.ufaceDevList && value.ufaceDevList.length > 0) {
this.form.ufaceDevIds = value.ufaceDevList.map((item) => {
return item.id;
});
} else {
this.form.ufaceDevIds = []
}
this.form.remark = value.remark;
this.form.id = value.id;
this.title = "编辑区域";
@ -565,6 +604,8 @@ export default {
regionName: "",
dutyId: "",
aiDeviceId: "",
ufaceDevIds: [],
ufaceDevList: [],
intendanceIds: [],
intendanceNames: "",
remark: "",
@ -641,6 +682,11 @@ export default {
return { id: item };
});
}
if (this.form.ufaceDevIds && this.form.ufaceDevIds.length > 0) {
data.ufaceDevList = this.form.ufaceDevIds.map((item) => {
return { id: item };
});
}
if (this.form.dutyId && this.form.dutyId.length > 0) {
data.enterpriseInfos = this.form.dutyId.map((item) => {
return { id: item };