From c32f4ff056b564331a2b81f2b6981f8b27dd7aa4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 14 八月 2025 09:44:59 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_y_ztns
---
src/views/business/inspectionTask/components/InspectionWord.vue | 2
src/views/login.vue | 4 +-
package.json | 1
src/views/statisticalCharts/itemInspectionAnalysis/index.vue | 2
src/views/business/inspectionTask/inspection.vue | 93 ++++++++++------------------------------------
5 files changed, 25 insertions(+), 77 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 0d72b63..d750b75 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -406,24 +406,24 @@
<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)">
@@ -526,7 +526,6 @@
:purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
<!--鏌ョ湅宸ユ椂寮规-->
<viewManHourDia ref="viewManHourDia" @submit="openAddVerifyDia"></viewManHourDia>
- <button @click="sss">杩炴帴涓插彛</button>
</div>
</template>
@@ -667,18 +666,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
},
],
},
@@ -688,10 +679,6 @@
{
name: "鎴嚦娉㈤暱",
arr: [12, 13, 14, 15],
- // 鍒濆鍖� getDataIndex1 涓烘暟缁�
- getDataIndex1: [],
- isShowSelect: false,
- maxNum: 5
},
],
},
@@ -824,7 +811,6 @@
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
- disconnect()
},
activated() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -912,7 +898,7 @@
},
methods: {
sss() {
- console.log(this.$store.state.weightList) //
+ console.log(this.$store.state.weightList) //
},
// 鏂囦欢绠＄悊--寮�濮�
getList() {
@@ -1201,41 +1187,6 @@
});
});
},
- // getDataAcquisitionDevice() {
- // if (this.isSerialConnected) {
- // connect();
- // }
- // // return
- // let itemIds = [];
- // this.currentSample.insProduct.forEach((item) => {
- // if (item.inspectionItemType === "1") {
- // itemIds.push(item.id);
- // }
- // });
- // const params = {
- // entrustCode: this.insOrder.entrustCode,
- // sampleCode: this.currentSample.sampleCode,
- // id: this.currentSample.id,
- // itemIds: itemIds,
- // };
- // this.dataAcquisitionLoading = true;
- // dataCollection(params).then((res) => {
- // this.dataAcquisitionLoading = false;
- // if (res.code != 200) {
- // return;
- // }
- // this.dataAcquisitionInfoNew = this.HaveJson(res.data);
- // // 瀵规暟閲囧洖鏉ョ殑鍊艰繘琛屽鐞�
- // this.handleDataAcquisition(res.data);
- // }).catch(err => {
- // this.dataAcquisitionLoading = false;
- // });
- // },
- // 鍋囪瀛樺湪涓�涓柟娉曠敤浜庢洿鏂颁覆鍙ｈ繛鎺ョ姸鎬�
- // updateSerialConnectionStatus(status) {
- // this.isSerialConnected = status;
- // },
-
objectOrder(obj) {
let newkey = Object.keys(obj).sort();
let newObj = {};
@@ -1245,7 +1196,6 @@
return newObj;
},
handleDataAcquisition(data, noDialog) {
- console.log(data);
// 鏄惁鍙互缂栬緫鏁伴噰鏁版嵁
if (this.dataAcquisitionEidtAble) {
this.getDataType = 1;
@@ -1298,7 +1248,6 @@
};
}
let list = this.tableList[0].arr;
- console.log(this.tableList[0]);
// 寰幆椤甸潰鍒楄〃淇℃伅锛屽垽鏂暟閲囨暟鎹搴旈〉闈㈠垪琛ㄤ俊鎭殑妫�楠岄」鏄摢涓紝骞剁粰褰撳墠妫�楠岄」缁戝畾璁惧淇℃伅
list.forEach((item, index) => {
let num0 = 0;
@@ -1366,7 +1315,6 @@
}
};
let list = this.tableList[0].arr;
- console.log(this.tableList[0]);
let maxNum = 0;
list.forEach((item, index) => {
let num0 = 0;
@@ -1471,7 +1419,6 @@
} else {
// 濡傛灉閮戒笉瀛樺湪锛屽垯锛岃繘鍏ュ鐞嗘暟閲囩嚎绋嬮噷鍘诲鐞嗘暟鎹�
try {
- console.log(this.dataAcquisitionInfo);
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.getDataIndexLoading = false;
this.dataGetDia = false;
@@ -3278,11 +3225,11 @@
.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%;
}
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: ""
diff --git a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue b/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
index 315bd84..ff7e1e5 100644
--- a/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
+++ b/src/views/statisticalCharts/itemInspectionAnalysis/index.vue
@@ -423,7 +423,7 @@
},
// 鏌ヨ鍥炶皟
refreshTable(row) {
- selectSampleAndProductByOrderId({id: row.id, ...this.page}).then(res => {
+ selectSampleAndProductByOrderId({id: row.enterOrderId, ...this.page}).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.tableData = res.data.records
--
Gitblit v1.9.3