From f7d03c28caa3c922c1bf25f4f8ef9e62765c3f75 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 八月 2025 14:00:51 +0800
Subject: [PATCH] Merge branch 'dev_ywx_ztns' into dev_ztns
---
src/views/business/inspectionTask/components/InspectionWord.vue | 2
src/views/login.vue | 4
package.json | 1
src/views/business/inspectionTask/inspection.vue | 146 +++++++++++++++++-------------------------------
4 files changed, 57 insertions(+), 96 deletions(-)
diff --git a/package.json b/package.json
index 7e70330..6d2ff7c 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
+ "thread-loader": "^4.0.4",
"vue-template-compiler": "2.6.12",
"worker-loader": "^3.0.8"
},
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 755730e..e4095f4 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -207,7 +207,7 @@
<td>{{ m.name }}</td>
<td style="text-align: left;">
<el-checkbox-group v-model="getDataIndex" :max="m.maxNum">
- <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j">{{ n }}</el-checkbox>
+ <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j" >{{ n }}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index b441fb0..2368abb 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -141,7 +141,7 @@
<el-button :loading="dataAcquisitionLoading" v-if="state == 1" size="small" type="primary"
@click="getDataAcquisitionDevice">鏁版嵁閲囬泦</el-button>
<el-button :type="dataAcquisitionEidtAble ? '' : 'primary'" v-if="state == 1" size="small"
- @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble,disconnect()">{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰"
+ @click="dataAcquisitionEidtAble = !dataAcquisitionEidtAble">{{ dataAcquisitionEidtAble ? "鍏抽棴缂栬緫" : "缂栬緫鏁伴噰"
}}</el-button>
</div>
</div>
@@ -406,92 +406,89 @@
<el-button :loading="submitLoading" type="primary" @click="submit()">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
- :visible.sync="dataGetDia" title="鏁版嵁閲囬泦" width="80%">
- <div>
- <table border="1" cellpadding="10" class="thermal-table">
- <tr>
- <td style="width: 120px">妫�楠岄」鍒嗙被</td>
- <td style="width: 120px">妫�楠岄」</td>
- <td style="width: 120px">妫�楠屽瓙椤�</td>
- <td>鏁伴噰鏁版嵁</td>
- </tr>
- <template v-for="(item, index) in getData">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false"
+ :visible.sync="dataGetDia" title="鏁版嵁閲囬泦" width="80%">
+ <div>
+ <table border="1" cellpadding="10" class="thermal-table">
<tr>
- <td :rowspan="item.child.length">{{ item.sortName }}</td>
- <td :rowspan="item.child.length">{{ item.faName }}</td>
- <td>{{ item.child[0].name }}</td>
- <td style="text-align: left">
- <!-- 娣诲姞瀹瑰櫒 div -->
- <div class="data-collection-items">
+ <td style="width: 120px">妫�楠岄」鍒嗙被</td>
+ <td style="width: 120px">妫�楠岄」</td>
+ <td style="width: 120px">妫�楠屽瓙椤�</td>
+ <td>鏁伴噰鏁版嵁</td>
+ </tr>
+ <template v-for="(item, index) in getData">
+ <tr>
+ <td :rowspan="item.child.length">{{ item.sortName }}</td>
+ <td :rowspan="item.child.length">{{ item.faName }}</td>
+ <td>{{ item.child[0].name }}</td>
+ <td style="text-align: left">
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
<el-select v-if="item.child[0].isShowSelect" v-model="item.child[0].getDataIndex1"
:multiple-limit="item.child[0].maxNum" clearable filterable multiple placeholder="璇烽�夋嫨"
@change="setData(item)">
- <el-option v-for="(subItem, subIndex) in item.child[0].arr" :key="index + '-' + subIndex" :filter-method="filterMethod"
- :label="subIndex + 1 + '^' + subItem.result" :value="subIndex + '^' + subItem.result">
+ <el-option v-for="(item, index) in item.child[0].arr" :key="index" :filter-method="filterMethod"
+ :label="index + 1 + '^' + item.result" :value="index + '^' + item.result">
<span>{{
"搴忓彿锛�" +
- (subIndex + 1) +
+ (index + 1) +
"锛�" +
"缁撴灉锛�" +
- subItem.result +
+ item.result +
"锛�" +
"鍘氬害锛�" +
- subItem.thickness +
+ item.thickness +
"锛�" +
"鏃堕棿锛�" +
- subItem.mergedDateTime
+ item.mergedDateTime
}}</span>
</el-option>
</el-select>
<el-checkbox-group v-if="!item.child[0].isShowSelect" v-model="item.child[0].getDataIndex1"
:max="item.child[0].maxNum">
- <el-checkbox v-for="(n, j) in item.child[0].arr" :key="index + '-' + j + 'aaaaaa'" :label="j + '^' + n"
- @change="handleGroupSelect(item.child[0], j)" >{{ n }}</el-checkbox>
+ <el-checkbox v-for="(n, j) in item.child[0].arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
</el-checkbox-group>
- </div>
- </td>
- </tr>
- <tr v-for="(m, i) in item.child" v-show="i > 0" :key="index + '-' + i + 'bbbbbbbbbbbbbb'">
- <td>{{ m.name }}</td>
- <td style="text-align: left">
- <!-- 娣诲姞瀹瑰櫒 div -->
- <div class="data-collection-items">
+ </div>
+ </td>
+ </tr>
+ <tr v-for="(m, i) in item.child" v-show="i > 0" :key="i + 'bbbbbbbbbbbbbb'">
+ <td>{{ m.name }}</td>
+ <td style="text-align: left">
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
<el-select v-if="m.isShowSelect" v-model="m.getDataIndex1" :multiple-limit="m.maxNum" clearable
filterable multiple placeholder="璇烽�夋嫨">
- <el-option v-for="(subItem, index1) in m.arr" :key="index + '-' + index1 + 'cccccccc'"
- :label="index1 + 1 + '^' + subItem.result" :value="index1 + '^' + subItem.result">
+ <el-option v-for="(item, index1) in m.arr" :key="index1" :label="index + 1 + '^' + item.result"
+ :value="index1 + '^' + item.result">
<span>{{
"搴忓彿锛�" +
(index1 + 1) +
"锛�" +
"缁撴灉锛�" +
- subItem.result +
+ item.result +
"锛�" +
"鍘氬害锛�" +
- subItem.thickness +
+ item.thickness +
"锛�" +
"鏃堕棿锛�" +
- subItem.mergedDateTime
+ item.mergedDateTime
}}</span>
</el-option>
</el-select>
<el-checkbox-group v-if="!m.isShowSelect" v-model="m.getDataIndex1" :max="m.maxNum">
- <el-checkbox v-for="(n, j) in m.arr" :key="index + '-' + j + 'dddddddd'" :label="j + '^' + n"
- @change="handleGroupSelect(m, j)" >{{ n }}</el-checkbox>
+ <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
</el-checkbox-group>
</div>
- </td>
- </tr>
- </template>
- </table>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dataGetDia = false">鍙� 娑�</el-button>
- <el-button :loading="getDataIndexLoading" type="primary" @click="submitDataGet()">纭� 瀹�</el-button>
- </span>
- </el-dialog>
-
+ </td>
+ </tr>
+ </template>
+ </table>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dataGetDia = false">鍙� 娑�</el-button>
+ <el-button :loading="getDataIndexLoading" type="primary" @click="submitDataGet()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<el-dialog :close-on-click-modal="false" :visible.sync="addCheck" title="鎸囧畾鎶ュ憡瀹℃牳浜哄憳" width="400px"
@close="closeAddVerifyDia">
<div class="body" style="display: flex; padding: 10px; align-items: center">
@@ -536,8 +533,6 @@
import AddUnPass from "../unpass/components/addUnPass.vue";
import InspectionWord from "./components/InspectionWord.vue";
import PurchaseVerification from "../unpass/components/PurchaseVerification.vue";
-import { connect,disconnect } from "@/utils/connect.js";
-
import {
doInsOrder,
getCableTag,
@@ -663,18 +658,10 @@
{
name: "1285nm~1330nm",
arr: [12, 13, 14, 15],
- // 鍒濆鍖� getDataIndex1 涓烘暟缁�
- getDataIndex1: [],
- isShowSelect: false,
- maxNum: 5
},
{
name: "1525nm~1575nm",
arr: [12, 13, 14, 15],
- // 鍒濆鍖� getDataIndex1 涓烘暟缁�
- getDataIndex1: [],
- isShowSelect: false,
- maxNum: 5
},
],
},
@@ -684,10 +671,6 @@
{
name: "鎴嚦娉㈤暱",
arr: [12, 13, 14, 15],
- // 鍒濆鍖� getDataIndex1 涓烘暟缁�
- getDataIndex1: [],
- isShowSelect: false,
- maxNum: 5
},
],
},
@@ -820,7 +803,6 @@
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
- disconnect()
},
activated() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -900,7 +882,6 @@
beforeDestroy() {
// 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
this.stopWorker();
- disconnect()
},
methods: {
// 鏂囦欢绠＄悊--寮�濮�
@@ -938,17 +919,6 @@
}).catch(() => { });
},
// 鏂囦欢绠＄悊--缁撴潫
- // 澶勭悊鏁寸粍鍕鹃�夐�昏緫鐨勬柟娉�
- handleGroupSelect(childItem, clickedIndex) {
- // 璁＄畻鎵�鍦ㄧ粍鐨勮捣濮嬬储寮�
- const groupStartIndex = Math.floor(clickedIndex / 5) * 5;
- // 娓呯┖褰撳墠宸查��
- childItem.getDataIndex1 = [];
- // 閬嶅巻褰撳墠缁勭殑 5 涓厓绱狅紝娣诲姞鍒伴�変腑鍒楄〃
- for (let i = groupStartIndex; i < groupStartIndex + 5 && i < childItem.arr.length; i++) {
- childItem.getDataIndex1.push(i + '^' + childItem.arr[i]);
- }
- },
// 浠诲姟鍒囨崲--寮�濮�
getList0() {
@@ -1132,8 +1102,6 @@
},
// 鏁版嵁閲囬泦
getDataAcquisitionDevice() {
- // connect()
- // return
let itemIds = [];
this.currentSample.insProduct.forEach((item) => {
if (item.inspectionItemType === "1") {
@@ -1285,9 +1253,8 @@
} else {
str0 = i + "," + j;
}
- };
+ }
let list = this.tableList[0].arr;
- console.log(this.tableList[0]);
let maxNum = 0;
list.forEach((item, index) => {
let num0 = 0;
@@ -1319,7 +1286,6 @@
}
let num = 0;
list[index].forEach((n) => {
- // console.log(n.v.ps.value);
if (
n.v.ps &&
n.v.ps.value &&
@@ -1392,7 +1358,6 @@
} else {
// 濡傛灉閮戒笉瀛樺湪锛屽垯锛岃繘鍏ュ鐞嗘暟閲囩嚎绋嬮噷鍘诲鐞嗘暟鎹�
try {
- console.log(this.dataAcquisitionInfo);
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.getDataIndexLoading = false;
this.dataGetDia = false;
@@ -2920,9 +2885,6 @@
this.$router.go(-1)
}
},
- destroyed() {
- disconnect()
- },
};
</script>
<style scoped>
@@ -3195,16 +3157,14 @@
max-width: 1000px;
/* 璁剧疆鏈�澶у搴� */
}
-
-
.data-collection-items {
display: flex;
- flex-wrap: wrap;
+ flex-wrap: wrap;
}
.data-collection-items .el-select,
.data-collection-items .el-checkbox {
- flex-basis: 20% ;
+ flex-basis: 20% ;
box-sizing: border-box;
- padding: 5px 2%;
+ padding: 5px 15px;
}
</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index abb6bd4..c9c9bba 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -58,8 +58,8 @@
return {
codeUrl: "",
loginForm: {
- username: "ZT-",
- password: "",
+ username: "admin",
+ password: "zttZTT123!",
rememberMe: false,
code: "",
uuid: ""
--
Gitblit v1.9.3