From a1ff69f228b7a0d08959e6b25eff2dac6085df8d Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 21 九月 2023 17:59:23 +0800
Subject: [PATCH] 1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue | 2
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 16 +++
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 22 +++
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue | 2
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 6
src/mixins/JeecgListMixin.js | 3
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue | 26 ++++-
src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue | 16 +++
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue | 16 +++
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 16 +++
src/views/mdc/common/BaseTree.vue | 25 ++--
src/main.js | 3
src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue | 5
src/views/mdc/base/MdcDriveTypeParamConfigList.vue | 29 +++--
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue | 16 +++
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 30 ++++--
src/views/mdc/base/modules/deviceLog/LogInfo.vue | 20 ++-
17 files changed, 191 insertions(+), 62 deletions(-)
diff --git a/src/main.js b/src/main.js
index d473f6d..0f8047f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -93,6 +93,9 @@
new Vue({
router,
store,
+ beforeCreate() {
+ Vue.prototype.$bus = new Vue()
+ },
mounted () {
store.commit('SET_SIDEBAR_TYPE', Vue.ls.get(SIDEBAR_TYPE, true))
store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 9f078b6..c18cf87 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -81,11 +81,10 @@
this.ipagination.current = 1;
}
var params = this.getQueryParams();//鏌ヨ鏉′欢
-
+ console.log('params',params)
if(!params){
return false;
}
-
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
diff --git a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
index 513d9e5..bb1382a 100644
--- a/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
+++ b/src/views/mdc/base/MdcDriveTypeParamConfigList.vue
@@ -60,11 +60,15 @@
:sm="24"
>
<a-form-item label="鏄剧ず鏍囧織">
- <j-switch
- placeholder="璇烽�夋嫨鏄剧ず鏍囧織"
- v-model="queryParam.showFlag"
- query
- ></j-switch>
+ <!--<j-switch-->
+ <!--placeholder="璇烽�夋嫨鏄剧ず鏍囧織"-->
+ <!--v-model="queryParam.showFlag"-->
+ <!--query-->
+ <!--></j-switch>-->
+ <a-select v-model='queryParam.showFlag' placeholder="璇烽�夋嫨鏄剧ず鏍囧織">
+ <a-select-option value="Y">鏄�</a-select-option>
+ <a-select-option value="N">鍚�</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
<a-col
@@ -74,11 +78,15 @@
:sm="24"
>
<a-form-item label="宸ヤ綔鏇茬嚎鏍囧織">
- <j-switch
- placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織"
- v-model="queryParam.curveGenerationFlags"
- query
- ></j-switch>
+ <!--<j-switch-->
+ <!--placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織"-->
+ <!--v-model="queryParam.curveGenerationFlags"-->
+ <!--query-->
+ <!--></j-switch>-->
+ <a-select v-model='queryParam.curveGenerationFlags' placeholder="璇烽�夋嫨宸ヤ綔鏇茬嚎鏍囧織">
+ <a-select-option value="Y">鏄�</a-select-option>
+ <a-select-option value="N">鍚�</a-select-option>
+ </a-select>
</a-form-item>
</a-col>
</template>
@@ -386,7 +394,6 @@
fieldList.push({ type: 'int', value: 'sortNo', text: '搴忓彿', dictCode: '' })
fieldList.push({ type: 'switch', value: 'showFlag', text: '鏄剧ず鏍囧織' })
fieldList.push({ type: 'switch', value: 'curveGenerationFlags', text: '宸ヤ綔鏇茬嚎鏍囧織' })
-
this.superFieldList = fieldList
},
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
index 0be2eb3..51dfb35 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -19,14 +19,11 @@
<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
- <a-col :md="2" :sm="3" :xs="3">
+ <a-col :md="2" :sm="2" :xs="2">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-col>
<a-col :md="2" :sm="2" :xs="2">
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
- </a-col>
- <a-col :lg="2" :md="3" :sm="3" :xs="3">
- <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-col>
</a-row>
</a-form>
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
index f7ef79c..aff3728 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
@@ -192,6 +192,7 @@
Type(valmath){
this.dataList = [];
this.queryParams.typeTree = valmath
+ console.log(valmath,'瑙﹀彂Type鐨剋atch鏂规硶')
// console.log(this.queryParams.typeTree)
},
nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
@@ -240,8 +241,12 @@
onOk(value) {
console.log('onOk: ', value);
},
+ /**
+ * 鏌ヨ鍖哄煙閲嶇疆鎸夐挳
+ */
searchReset() {
if(this.queryParams.typeTree == "1"){
+ console.log('绗竴涓殑typeTree',this.queryParams.typeTree)
this.typeTree = this.queryParams.typeTree
this.typeParent = this.queryParams.parentId
this.typeEquipment = this.queryParams.equipmentId
@@ -250,6 +255,7 @@
this.dates = []
this.queryParams.typeTree = this.typeTree
this.queryParams.parentId = this.typeParent
+ console.log('杩涘叆绗竴涓�')
if(this.queryParams.parentId != ""){
this.queryParams.equipmentId = ""
}else{
@@ -258,12 +264,12 @@
}else{
this.queryParams.equipmentId = this.queryParamEquip.equipmentId
}
-
}
-
this.ipagination.current = 1
this.ResetloadData();
}else{
+ console.log('杩涘叆绗簩涓�')
+ console.log('绗簩涓殑typeTree',this.queryParams.typeTree)
this.typeTree = this.queryParams.typeTree
this.typeParent = this.queryParams.parentId
// this.typeEquipment = this.queryParams.equipmentId
@@ -411,10 +417,8 @@
if(this.queryParams.typeTree == "1"){
this.queryParams.parentId = this.queryParamEquip.parentId
// this.queryParams.equipmentId = this.queryParamEquip.equipmentId
-
}else{
this.queryParams.parentId = this.queryParamPeople.parentId
-
// this.queryParams.equipmentId = ""
}
this.dataSource = [];
@@ -432,7 +436,7 @@
param.equipmentId = this.queryParams.equipmentId;
param.startTime = this.queryParam.startTime;
param.endTime = this.queryParam.endTime;
- // console.log(param);
+ console.log('param',param);
getAction(this.url.list,param).then((res) => {
if(res.success){
this.dataSource = res.result.records||res.result;
@@ -657,9 +661,19 @@
exclude_inputs: true
});
},
+ // /**
+ // * 杞﹂棿閫変腑椤瑰彇娑堝悗瑙﹀彂姝や簨浠讹紝鐢盉aseTree缁勪欢鐢变簨浠舵�荤嚎瑙﹀彂
+ // * @param value 鎻愮ず淇℃伅
+ // */
+ // treeClearSelected(value){
+ // this.queryParams.equipmentId=''
+ // this.queryParams.parentId=''
+ // this.ResetloadData()
+ // }
},
created() {
this.queryParam.typeTree = "1"
+ // this.$bus.$on('treeClearSelected',this.treeClearSelected)
}
}
</script>
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index 53648ff..2fab0bc 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -111,6 +111,22 @@
},
],
},
+ torqueDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鏃堕棿"
+ },
+ ],
+ },
+ torqueValue:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ユ壄鐭╁��"
+ },
+ ],
+ },
},
url: {
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
index 683850e..d12b328 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
@@ -125,6 +125,22 @@
},
],
},
+ torqueDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鏃堕棿"
+ },
+ ],
+ },
+ torqueValue:{
+ rules:[
+ {
+ required:true,
+ message: "璇疯緭鍏ユ壄鐭╁��"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
index d57d514..5b1a8a2 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
index aea8dae..2a2ffdb 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
@@ -128,6 +128,22 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
},
url: {
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index 2624eba..538504e 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -144,6 +144,22 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
diff --git a/src/views/mdc/base/modules/deviceLog/LogInfo.vue b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
index 0321998..3bdc973 100644
--- a/src/views/mdc/base/modules/deviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -6,12 +6,12 @@
<a-row :gutter="24">
<a-col :md="6" :sm="6">
<a-form-item label="璁惧缂栧彿">
- <a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
+ <a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
<a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
+ <a-input placeholder="璇烽�夋嫨璁惧" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="6">
@@ -152,7 +152,6 @@
</div>
<work-chart-model ref="workChartModel"></work-chart-model>
<work-history-model ref="workHistoryModel"></work-history-model>
-
</div>
</template>
@@ -327,15 +326,22 @@
// console.log(this.queryParams.collectTime)
if(this.queryParams.collectTime != undefined){
this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
+ if(!this.queryParams.equipmentId||!this.queryParams.equipmentName){
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨璁惧"
+ });
+ return false
+ }
this.queryChart()
}else{
// this.$message.warning("璇烽�夋嫨鏃堕棿")
+ console.log('瑙﹀彂鎻愮ず')
this.$notification.warning({
message:'娑堟伅',
description:"璇烽�夋嫨鏃堕棿"
});
}
-
// this.queryList()
},
searchReset() {
@@ -417,6 +423,7 @@
message:'娑堟伅',
description:res.message
});
+
}
})
}
@@ -427,11 +434,10 @@
this.initEquipment();
// this.queryTreeData();
},
- mounted() {
-
- },
watch: {
equement(val) {
+ console.log('閫氳繃watch瑙﹀彂')
+
if (val && val.equipmentId) {
this.$set(this.queryParams, 'equipmentName', val.equipmentName)
this.$set(this.queryParams, 'equipmentId', val.equipmentId)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
index 89fc233..f4c5aa5 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue
@@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :md="9" :sm="9">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
<a-col :md="4" :sm="4">
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 75e4a67..0557b03 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -136,11 +136,11 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- equipmentId:{
+ equipmentIds:{
rules:[
{
required:true,
- message: ""
+ message: "璇烽�夋嫨璁惧"
},
],
},
@@ -160,7 +160,23 @@
},
],
initialValue: 1
- }
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
},
url: {
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index edb7cca..f2c0d43 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -120,6 +120,22 @@
},
],
},
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 15e6758..e401e89 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -10,13 +10,13 @@
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
</a-form-item>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
</a-col>
- <a-col :lg="3" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="3" :sm="3" :xs="3">
<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-col>
</a-row>
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 19f2705..e37659d 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -33,7 +33,7 @@
</a-row>
<a-row :gutter="24">
- <a-col :md="14" :sm="14" :xs="14">
+ <a-col :md="15" :sm="15" :xs="15">
<a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
@change="efficiencyOptionsOnChange"/>
</a-col>
@@ -49,7 +49,7 @@
</a-row>
</a-form>
</div>
- <div style="width: 400px;top: 20px; right: 0px;">
+ <div style="width: 530px;top: 20px; right: 0px;">
<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
<td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -370,11 +370,11 @@
})
},
initShiftSubList(val) {
- this.queryParam.shiftSubId = null;
+ //姣忔閲嶆柊閫夋嫨鐝埗鏃剁彮娆℃竻绌轰笖鏄剧ずplaceholder鍐呭
+ this.queryParam.shiftSubId = undefined;
getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
if (res.success) {
this.shiftSubList = res.result;
-
}
})
},
@@ -420,14 +420,24 @@
this.checkedList = checkedList
},
searchQuery() {
- if(this.queryParam.typeTree == "1"){
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ if(this.dates != ''){
+ if(this.queryParam.typeTree == "1"){
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
+ }else{
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ""
+ }
+ this.loadData()
}else{
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ""
+ // this.$message.warning("璇烽�夋嫨鏃堕棿")
+ console.log('瑙﹀彂鎻愮ず')
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:"璇烽�夋嫨鏃堕棿"
+ });
}
- this.loadData()
+
// this.onClearSelected()
},
searchReset() {
diff --git a/src/views/mdc/common/BaseTree.vue b/src/views/mdc/common/BaseTree.vue
index 0aab780..809f02f 100644
--- a/src/views/mdc/common/BaseTree.vue
+++ b/src/views/mdc/common/BaseTree.vue
@@ -112,21 +112,24 @@
...mapActions(['QueryProduction']),
getCurrSelectedTitle() {
return !this.currSelected.title ? '' : this.currSelected.title
- }
- ,
+ },
+ /**
+ * 鍙栨秷杞﹂棿閫変腑椤�
+ */
onClearSelected() {
this.hiding = true
this.currSelected = {}
this.selectedKeys = []
+ console.log('鍙戦��')
+ // this.$bus.$emit('treeClearSelected','閲嶇疆鍒楄〃')
this.$emit('sendSelectBaseTree', '')
},
-
onSelect(selectedKeys, e) {
this.hiding = false
let record = e.node.dataRef
this.currSelected = Object.assign({}, record)
this.selectedKeys = [record.key]
- console.log(this.selectedKeys)
+ console.log('閫変腑鏍戜腑椤�',this.selectedKeys)
this.$emit('sendSelectBaseTree', this.selectedKeys)
},
handleEdit(entity) {
@@ -167,8 +170,7 @@
// this.loading = false
// this.cardLoading = false
// })
- }
- ,
+ },
handleChange() {
let search = this.searchInput
let expandedKeys = this.dataList
@@ -186,8 +188,7 @@
searchValue: search,
autoExpandParent: true
})
- }
- ,
+ },
handleSearch(value) {
let search = value
let expandedKeys = this.dataList
@@ -206,8 +207,7 @@
searchValue: search,
autoExpandParent: true
})
- }
- ,
+ },
getParentKey(key, tree) {
let parentKey
for (let i = 0; i < tree.length; i++) {
@@ -223,7 +223,6 @@
}
return parentKey
},
-
generateList(data) {
for (let i = 0; i < data.length; i++) {
const node = data[i]
@@ -288,9 +287,7 @@
this.queryTreeData()
// 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
}
-
- }
- ,
+ },
//鐩戝惉
watch: {
currSelected(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
--
Gitblit v1.9.3