From 9b88cfcbf0f60f0a44f5350c754788144296eba8 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 11:07:57 +0800
Subject: [PATCH] ABC评分
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 2
src/views/eam/EquipmentListOfPressureVessel.vue | 2
src/views/eam/EquipmentListOfRide.vue | 2
src/views/eam/EquipmentListOfTester.vue | 2
src/views/eam/EquipmentListOfWeldingMachine.vue | 2
src/views/eam/EquipmentListOfProduct.vue | 2
src/views/eam/EquipmentListOfTruck.vue | 2
src/views/eam/EquipmentListOfEnvProEquipment.vue | 2
src/views/eam/EquipmentListOfCrane.vue | 2
src/views/eam/ABC/StreamList.vue | 10 +++--
src/views/eam/EquipmentListOfAll.vue | 2
src/views/eam/ABC/modules/StreamForm.vue | 37 +++++++++++-------
12 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/views/eam/ABC/StreamList.vue b/src/views/eam/ABC/StreamList.vue
index 974f945..be4304f 100644
--- a/src/views/eam/ABC/StreamList.vue
+++ b/src/views/eam/ABC/StreamList.vue
@@ -86,9 +86,9 @@
</template>
<span slot="action" slot-scope="text, record">
<div v-if="nodeValue===record.status">
- <a @click="handleStreamNext(record)" :disabled="nodeSort===1&&nodeValue!==record.status" >{{button1.name}}</a>
- <a-divider type="vertical" />
- <a @click="handleStreamLast(record)" :disabled="nodeSort===1" >{{button2.name}}</a>
+ <a @click="handleStreamNext(record)" :disabled="nodeSort===1&&nodeValue!==record.status" v-if="button1!={}">{{button1.name}}</a>
+ <a-divider type="vertical" v-if="button2!={}"/>
+ <a @click="handleStreamLast(record)" :disabled="nodeSort===1" v-if="button2!={}" >{{button2.name}}</a>
</div>
<div v-if="nodeSort===1&&nodeValue===record.status">
<a-divider type="vertical" />
@@ -331,7 +331,9 @@
getAction(this.url.getPreInfo).then(res=>{
if(res.result.msg==='ok'){
this.button1 = res.result.buttons[0];
- this.button2 = res.result.buttons[1];
+ if(res.result.buttons.length===2){
+ this.button2 = res.result.buttons[1];
+ }
this.nodeSort = res.result.nodeSort;
this.nodeValue = res.result.nodeValue;
}
diff --git a/src/views/eam/ABC/modules/StreamForm.vue b/src/views/eam/ABC/modules/StreamForm.vue
index 7f32450..648f836 100644
--- a/src/views/eam/ABC/modules/StreamForm.vue
+++ b/src/views/eam/ABC/modules/StreamForm.vue
@@ -153,7 +153,7 @@
:loading="aBCAssessmentTable.loading"
:columns="aBCAssessmentTable.columns"
:dataSource="aBCAssessmentTable.dataSource"
- :maxHeight="300"
+ :maxHeight="1000"
:disabled="formDisabled"
:rowNumber="true"
:rowSelection="true"
@@ -224,7 +224,7 @@
title: '缁熶竴缂栫爜',
key: 'num',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -234,7 +234,7 @@
title: '璁惧鍚嶇О',
key: 'name',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -244,7 +244,7 @@
title: '璁惧鍨嬪彿',
key: 'model',
type: JVXETypes.normal,
- width:"250px",
+ width:"160px",
placeholder: '璇疯緭鍏�${title}',
disabled:true,
align:'center',
@@ -263,7 +263,7 @@
title: '骞冲潎浣跨敤鐜�',
key: 'standardA',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardA',
@@ -280,7 +280,7 @@
title: '鍙浛鎹㈡��',
key: 'standardB',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardB',
@@ -297,7 +297,7 @@
title: '鏁呴殰褰卞搷搴�',
key: 'standardC',
type: JVXETypes.select,
- width:"250px",
+ width:"230px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardC',
@@ -314,7 +314,7 @@
title: '鐢熶骇瓒呭樊搴�',
key: 'standardD',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardD',
@@ -331,7 +331,7 @@
title: '鏁呴殰棰戠巼',
key: 'standardE',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardE',
@@ -348,7 +348,7 @@
title: '璁惧浠峰��',
key: 'standardF',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standardF',
@@ -365,7 +365,7 @@
title: '鏃ф爣璇�',
key: 'equipmentImportanceId',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
disabled:true,
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
@@ -377,7 +377,7 @@
title: '鏂版爣璇�',
key: 'finalStandard',
type: JVXETypes.select,
- width:"250px",
+ width:"180px",
placeholder: '璇疯緭鍏�${title}',
defaultValue:'',
dictCode:'ABC-standard-result',
@@ -483,7 +483,7 @@
}
var standardA = this.model.standardA == null || this.model.standardA == undefined || this.model.standardA == '' ? 0 : parseInt(this.model.standardA);
var standardB = this.model.standardB == null || this.model.standardB == undefined || this.model.standardB == '' ? 0 : parseInt(this.model.standardB);
- var standardC = this.model.standardA == null || this.model.standardC == undefined || this.model.standardC == '' ? 0 : parseInt(this.model.standardC);
+ var standardC = this.model.standardC == null || this.model.standardC == undefined || this.model.standardC == '' ? 0 : parseInt(this.model.standardC);
var standardD = this.model.standardD == null || this.model.standardD == undefined || this.model.standardD == '' ? 0 : parseInt(this.model.standardD);
var standardE = this.model.standardE == null || this.model.standardE == undefined || this.model.standardE == '' ? 0 : parseInt(this.model.standardE);
var standardF = this.model.standardF == null || this.model.standardF == undefined || this.model.standardF == '' ? 0 : parseInt(this.model.standardF);
@@ -524,7 +524,14 @@
num: data[i].num,
name: data[i].name,
model:data[i].model,
+ standardA:data[i].standardA,
+ standardB:data[i].standardB,
+ standardC:data[i].standardC,
+ standardD:data[i].standardD,
+ standardE:data[i].standardE,
+ standardF:data[i].standardF,
equipmentImportanceId:data[i].equipmentImportanceId,
+ finalStandard:data[i].equipmentImportanceId,
}
}
addRows.push(equipment)
@@ -534,7 +541,7 @@
changeDate(target){
var standardA = target.row.standardA == null || target.row.standardA == undefined || target.row.standardA == '' ? 0 : parseInt(target.row.standardA);
var standardB = target.row.standardB == null || target.row.standardB == undefined || target.row.standardB == '' ? 0 : parseInt(target.row.standardB);
- var standardC = target.row.standardA == null || target.row.standardC == undefined || target.row.standardC == '' ? 0 : parseInt(target.row.standardC);
+ var standardC = target.row.standardC == null || target.row.standardC == undefined || target.row.standardC == '' ? 0 : parseInt(target.row.standardC);
var standardD = target.row.standardD == null || target.row.standardD == undefined || target.row.standardD == '' ? 0 : parseInt(target.row.standardD);
var standardE = target.row.standardE == null || target.row.standardE == undefined || target.row.standardE == '' ? 0 : parseInt(target.row.standardE);
var standardF = target.row.standardF == null || target.row.standardF == undefined || target.row.standardF == '' ? 0 : parseInt(target.row.standardF);
@@ -551,7 +558,7 @@
changeDateByRow(row){
var standardA = row.standardA == null || row.standardA == undefined || row.standardA == '' ? 0 : parseInt(row.standardA);
var standardB = row.standardB == null || row.standardB == undefined || row.standardB == '' ? 0 : parseInt(row.standardB);
- var standardC = row.standardA == null || row.standardC == undefined || row.standardC == '' ? 0 : parseInt(row.standardC);
+ var standardC = row.standardC == null || row.standardC == undefined || row.standardC == '' ? 0 : parseInt(row.standardC);
var standardD = row.standardD == null || row.standardD == undefined || row.standardD == '' ? 0 : parseInt(row.standardD);
var standardE = row.standardE == null || row.standardE == undefined || row.standardE == '' ? 0 : parseInt(row.standardE);
var standardF = row.standardF == null || row.standardF == undefined || row.standardF == '' ? 0 : parseInt(row.standardF);
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index e32488d..d6c2606 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 03bfe29..0088eda 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -415,7 +415,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 942856f..c3e12a8 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="缁翠繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 3a99fc0..9b87068 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index 6421f59..9666751 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index 8e91469..67641e2 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index 0ceefe8..a24c40d 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 8dee022..370079e 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index aa4a7e8..a04453b 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index 40a9220..ca41240 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -430,7 +430,7 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender>
--
Gitblit v1.9.3