From 6805c28706987f9c3bf0f4ceb179ede47667fe90 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期日, 04 八月 2024 15:24:11 +0800
Subject: [PATCH] 修改检验任务列表
---
src/main.js | 3
src/components/do/b1-inspect-order-plan/Inspection.vue | 213 ++++++++++++++++++++++++++---------------------------
src/components/do/b3-work-time-management/work-time-management.vue | 2
src/components/view/b1-inspect-order-plan.vue | 10 +-
4 files changed, 112 insertions(+), 116 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 256e86d..655d45b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -323,8 +323,8 @@
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
- <el-button type="primary" size="small" v-if="(dataAcquisitionEidt>0||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&temDataAcquisition)&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
- <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(dataAcquisitionEidt>0||(tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'))&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
+ <el-button type="primary" size="small" v-if="(isGet||tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&temDataAcquisition)&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="(isGet||(tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'))&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))">
@@ -792,7 +792,7 @@
<el-button type="primary" @click="submit()">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁閲囬泦-璁＄畻鏁版嵁閫夋嫨" :visible.sync="dataGetDia" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" custom-class="custom-dialog">
+ <el-dialog title="鏁版嵁閲囬泦" :visible.sync="dataGetDia" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" custom-class="custom-dialog">
<div>
<table border="1" cellpadding="10" class="thermal-table">
<tr>
@@ -806,7 +806,7 @@
<td>{{ item.child[0].name }}</td>
<td style="text-align: left;">
<el-checkbox-group
- v-model="getDataIndex" :max="item.child[0].maxNum">
+ v-model="item.child[0].value" :max="item.child[0].maxNum" @change="n=>handleChangeGetDia(n,item.child[0])">
<el-checkbox v-for="(n,j) in item.child[0].arr" :label="j" :key="j+'ppppppppp'">{{n}}</el-checkbox>
</el-checkbox-group>
</td>
@@ -815,7 +815,7 @@
<td>{{ m.name }}</td>
<td style="text-align: left;">
<el-checkbox-group
- v-model="getDataIndex" :max="m.maxNum">
+ v-model="m.value" :max="m.maxNum" @change="n=>handleChangeGetDia(n,m)">
<el-checkbox v-for="(n,j) in m.arr" :label="j" :key="j+'bbbbbbbbbbbbbb'" >{{n}}</el-checkbox>
</el-checkbox-group>
</td>
@@ -992,8 +992,8 @@
wareLength:[],
dataAcquisitionInfo:{},
dataAcquisitionInfoNew:{},
- dataAcquisitionEidt:0,
dataAcquisitionEidtAble:false,
+ isGet:false,
dataAcquisitionLoading:false,
collected:false,
// 鐑惊鐜�---寮�濮�
@@ -1100,6 +1100,7 @@
insResult: null
}
})
+ this.determineWhetherToCollectData()
this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
@@ -1208,21 +1209,6 @@
}
}
},
- param:{
- deep:true,
- handler(val){
- this.dataAcquisitionEidt = 0
- if(val){
- for (let key in val) {
- val[key].equipValue.forEach(m=>{
- if(m.isItADataAcquisitionDevice){
- this.dataAcquisitionEidt++
- }
- })
- }
- }
- }
- }
},
beforeDestroy() {
// 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
@@ -1281,12 +1267,12 @@
child:[]
}
for(let j in data[i]){
- if(j!='frequency'&&data[i][j]&&!data[i][j].isCalculation){
+ if(j!='frequency'&&data[i][j]&&typeof data[i][j].result == 'string'){
this.dataAcquisitionInfo[i+','+j] = {
value:data[i][j].result,
frequency:data[i].frequency
}
- }else if(j!='frequency'&&data[i][j]&&data[i][j].isCalculation){
+ }else if(j!='frequency'&&data[i][j]&&Array.isArray(data[i][j].result)){
let str0 = i+','+j
let list = this.tableList[0].arr
let maxNum = 0
@@ -1315,16 +1301,27 @@
if(str0==str){
maxNum = num
}
+ if(data[i][j].equipName&&data[i][j].equipValue){
+ if(!m.v.v){
+ this.changeEquip(data[i][j].equipValue,m)
+ }
+ }
}
})
})
- console.log(44444444444,maxNum)
let obj0 = {
name:j,
arr:data[i][j].result,
- maxNum:maxNum
+ maxNum:maxNum,
+ value:[]
}
- obj.child.push(obj0)
+ if(data[i][j].result&&Array.isArray(data[i][j].result)&&data[i][j].result.length>maxNum){
+ obj.child.push(obj0)
+ }else{
+ this.dataAcquisitionInfo[i+','+j] = {
+ value:data[i][j].result
+ }
+ }
}
}
if(obj.child.length>0){
@@ -1334,6 +1331,7 @@
if(this.getData.length>0){
this.dataGetDia = true
}else{
+ console.log(555555555555)
try {
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.worker0.postMessage(JSON.stringify({
@@ -1354,68 +1352,66 @@
}
};
},
- beforeDataGetDia(done){
- this.$confirm('鏄惁鍙栨秷鏁版嵁閲囬泦?', "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- if(done){
- done()
- }else{
- this.dataGetDia = false
- this.getDataIndex = []
- }
- }).catch(() => {})
- },
submitDataGet(){
if(this.getDataIndex.length==0){
this.$message.error('璇烽�夋嫨闇�瑕佽绠楃殑鏁版嵁')
return
}
- this.getDataIndex.sort((a, b) => a - b);
- for (let i in this.dataAcquisitionInfoNew){
- for(let j in this.dataAcquisitionInfoNew[i]){
- if(j!='frequency'&&this.dataAcquisitionInfoNew[i]&&this.dataAcquisitionInfoNew[i][j]&&this.dataAcquisitionInfoNew[i][j].isCalculation){
- let arr = []
- for(let k = 0;k<this.dataAcquisitionInfoNew[i][j].result.length;k++){
- if(this.getDataIndex.includes(k)){
- arr.push(this.dataAcquisitionInfoNew[i][j].result[k])
- }
- }
- if(arr.length>0){
- this.dataAcquisitionInfoNew[i][j].result = arr
- }
- }
+ // this.getDataIndex.sort((a, b) => a - b);
+ // for (let i in this.dataAcquisitionInfoNew){
+ // for(let j in this.dataAcquisitionInfoNew[i]){
+ // if(j!='frequency'&&this.dataAcquisitionInfoNew[i]&&this.dataAcquisitionInfoNew[i][j]&&this.dataAcquisitionInfoNew[i][j].isCalculation){
+ // let arr = []
+ // for(let k = 0;k<this.dataAcquisitionInfoNew[i][j].result.length;k++){
+ // if(this.getDataIndex.includes(k)){
+ // arr.push(this.dataAcquisitionInfoNew[i][j].result[k])
+ // }
+ // }
+ // if(arr.length>0){
+ // this.dataAcquisitionInfoNew[i][j].result = arr
+ // }
+ // }
+ // }
+ // }
+ // this.getDataIndexLoading = true;
+ // this.$axios.post(this.$api.deviceScope.formulaCalculation,{
+ // ...this.dataAcquisitionInfoNew
+ // }, {
+ // headers: {
+ // 'Content-Type': 'application/json'
+ // },
+ // noQs:true
+ // }).then(res=>{
+ // this.getDataIndexLoading = false;
+ // if(res.code!=200){
+ // return
+ // }
+ // this.dataGetDia = false
+ // this.handleDataAcquisition(res.data)
+ // this.getDataIndex = []
+ // })
+ },
+ handleChangeGetDia(n,m){
+ console.log(22222,n,m);
+ for (let i in this.getData){
+ for(let j in this.getData[i].child){
+ let len = this.getData[i].child[j].arr.length
+ let value = this.getData[i].child[j].value
+ let maxNum = this.getData[i].child[j].maxNum
+ if(len){}
+ // if(){}
}
}
- this.getDataIndexLoading = true;
- this.$axios.post(this.$api.deviceScope.formulaCalculation,{
- ...this.dataAcquisitionInfoNew
- }, {
- headers: {
- 'Content-Type': 'application/json'
- },
- noQs:true
- }).then(res=>{
- this.getDataIndexLoading = false;
- if(res.code!=200){
- return
- }
- this.dataGetDia = false
- this.handleDataAcquisition(res.data)
- this.getDataIndex = []
- })
},
// 澶氱嚎绋�
startWorker() {
if (this.worker) {
- this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
this.worker = new Worker('/static/js/worker.js');
if (this.worker0) {
- this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
this.worker0 = new Worker('/static/js/worker0.js');
@@ -2453,15 +2449,18 @@
b.i && this.param[b.i].comValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧缂栫爜') {
- b.v.v = ''
+ // b.v.v = ''
+ this.$set(b.v, 'v', '' )
b.i && this.param[b.i].equipValue.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '璁惧鍚嶇О') {
- b.v.v = ''
+ this.$set(b.v, 'v', '' )
+ // b.v.v = ''
b.i && this.param[b.i].equipName.push(b)
}
if (b.v.ps != undefined && b.v.ps.value === '鏈�缁堝��') {
- b.v.v = ''
+ // b.v.v = ''
+ this.$set(b.v, 'v', '' )
/* if (b.i === undefined) {
for (var c in this.param) {
this.param[c].resValue = b
@@ -2542,23 +2541,6 @@
this.param[a.id].equipValue[i].v.v = equipValue[i].v
}else{
this.param[a.id].equipValue[i].v.v = equipValue[i].v
- if(equipValue[i].v){
- let isItADataAcquisitionDevice = await this.determineWhetherToCollectData(equipValue[i].v)
- this.param[a.id].equipValue[i].isItADataAcquisitionDevice = isItADataAcquisitionDevice
-
- }else{
- this.param[a.id].equipValue[i].isItADataAcquisitionDevice = false
- }
- this.dataAcquisitionEidt = 0
- if(this.param){
- for (let key in this.param) {
- this.param[key].equipValue.forEach(m=>{
- if(m.isItADataAcquisitionDevice){
- this.dataAcquisitionEidt++
- }
- })
- }
- }
}
}
} catch (e) {}
@@ -2592,6 +2574,33 @@
this.handleExcelMethod()
},
changeInput(m, code, n) {
+ let str = code.split('-')
+ let pId = str[3]
+ if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){
+ let inspectionItem = ''
+ let idS = []
+ let child = 0
+ for (let i in this.currentSample.insProduct) {
+ if(this.currentSample.insProduct[i].id==pId){
+ inspectionItem = this.currentSample.insProduct[i].inspectionItem
+ }
+ }
+ for (let i in this.currentSample.insProduct) {
+ if(this.currentSample.insProduct[i].inspectionItem==inspectionItem&&this.currentSample.insProduct[i].id!=pId){
+ idS.push(this.currentSample.insProduct[i].id)
+ }
+ }
+ for (let i = 0;i<idS.length;i++) {
+ if(this.param[idS[i]].equipValue&&this.param[idS[i]].equipValue.length>0&&this.param[idS[i]].equipValue[0].v.v){
+ child++
+ }
+ }
+ if(child==0){
+ n.v.v = null
+ this.$message.error('璇峰厛濉啓璁惧淇℃伅')
+ return
+ }
+ }
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
@@ -2668,9 +2677,9 @@
}
};
},
- async determineWhetherToCollectData(managementNumber){
- let res = await this.$axios.get(this.$api.deviceScope.determineWhetherToCollectData+'?managementNumber='+managementNumber)
- return res.data
+ async determineWhetherToCollectData(){
+ let res = await this.$axios.get(this.$api.deviceScope.determineWhetherToCollectData+"?managementNumber=''")
+ this.isGet = res.data
},
handleFraction(str){
if(str&&typeof(str)=='string'&&str.includes('/')){
@@ -3092,22 +3101,10 @@
this.$set(this.param[n.i].equipValue[i1].v,'v',val)
this.$delete(this.param[n.i].equipName[i1].v,'v')
this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
- this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
}
}
}
}
- this.dataAcquisitionEidt = 0
- if(this.param){
- for (let key in this.param) {
- this.param[key].equipValue.forEach(m=>{
- if(m.isItADataAcquisitionDevice){
- this.dataAcquisitionEidt++
- }
- })
- }
- }
- // console.log(this.param)
this.saveInsContext()
},
getAuthorizedPerson() {
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index add61f4..95dcc1c 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -747,7 +747,7 @@
}
this.formData0.state = e==0?this.formData0.state:'宸插鏍�'
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.check, {
- ...this.formData0
+ auxiliaryWorkingHoursDays:[this.formData0]
}, {
headers: {
'Content-Type': 'application/json'
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 09f1c1a..ecb1397 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -248,7 +248,7 @@
type: 'text',
method: 'handleInspection',
disabFun: (row, index) => {
- return row.userId == null || row.insState == 3 || row.insState == 5||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName == null || row.insState == 3 || row.insState == 5||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
}
// disabFun: (row, index) => {
// return row.userId == null || row.insState == 3 || row.insState == 5
@@ -259,7 +259,7 @@
type: 'text',
method: 'handleConnect',
disabFun: (row, index) => {
- return row.userId == null || row.orderUserId == null || row.insState == 5 || row.insState == 3||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName == null || row.insState == 5 || row.insState == 3||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
}
},
{
@@ -267,8 +267,8 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- disabFun: (row, index) => {
- return row.userId == null || row.insState != 3 ||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ disabFun: (row, userName) => {
+ return row.userId == null || row.insState != 3 ||(row.checkName&&!row.checkName.includes(JSON.parse(localStorage.getItem("user")).name))
}
}, {
id: '',
@@ -276,7 +276,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userId != null
+ return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
}
}
],
diff --git a/src/main.js b/src/main.js
index 904e933..067310d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,8 +20,7 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.31.6:8001';
-
+const javaApi = 'http://172.20.10.5:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
--
Gitblit v1.9.3