From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化
---
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 15 +++-
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 8 ++
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue | 19 +++++
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue | 2
src/mixins/JeecgListMixin.js | 1
src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue | 9 ++-
src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue | 2
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 9 --
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue | 16 +++++
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue | 10 +++
src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue | 2
src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue | 12 +++
src/components/jeecgbiz/JSelectEquipmentProduction.vue | 2
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 62 ++++++++++++--------
src/views/mdc/base/modules/shift/ShiftSystem.vue | 10 ++
15 files changed, 128 insertions(+), 51 deletions(-)
diff --git a/src/components/jeecgbiz/JSelectEquipmentProduction.vue b/src/components/jeecgbiz/JSelectEquipmentProduction.vue
index 2f3ac51..e0bacfa 100644
--- a/src/components/jeecgbiz/JSelectEquipmentProduction.vue
+++ b/src/components/jeecgbiz/JSelectEquipmentProduction.vue
@@ -3,7 +3,7 @@
<!---->
<a-input @click="openModal" placeholder="璇风偣鍑婚�夋嫨杞﹂棿" v-model="textVals" readOnly :disabled="disabled">
<a-icon slot="prefix" type="cluster" title="杞﹂棿閫夋嫨鎺т欢"/>
- <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
+ <a-icon v-if="storeVals&&!disabled" slot="suffix" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
</a-input>
<j-select-equipment-production-modal
ref="innerDepartSelectModal"
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 6e90b0a..95fa270 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -256,7 +256,6 @@
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "缂栬緫";
this.$refs.modalForm.disableSubmit = false;
-
},
handleAdd: function () {
this.$refs.modalForm.add();
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 4a2268f..4d41e23 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -3,7 +3,7 @@
:title="title"
:maskClosable="true"
:width="drawerWidth"
- @cancel="handleCancel"
+ @cancel="visible=false"
:visible="visible"
:footer="null"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
@@ -55,9 +55,6 @@
<a-col :span="12">
<a-form-model-item label="杞﹂棿鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled" ref="selectedProduction" prop="selectedProduction">
<!--<j-select-equipment-production v-decorator="['selectedProduction',{rules:[{required:true,message:'璇烽�夋嫨杞﹂棿!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
-
-
-
<j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
</a-form-model-item>
@@ -549,9 +546,7 @@
// }
// })
// },
- handleCancel () {
- this.close()
- },
+
// validatequipmentId(rule, value, callback){
// if(!value){
// callback()
diff --git a/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue b/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
index a51bb0c..15be1d3 100644
--- a/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
+++ b/src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue
@@ -102,7 +102,7 @@
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
index 17ef5f5..4e0393b 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
@@ -112,6 +112,22 @@
},
],
},
+ vacationDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨浼戝亣鏃堕棿"
+ },
+ ],
+ },
+ vacationType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍋囨湡绫诲瀷"
+ },
+ ],
+ },
},
url: {
@@ -126,7 +142,6 @@
},
created() {
},
-
methods: {
// disabledDate(current){
// //Can not slect days before today and today
@@ -248,7 +263,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("娣诲姞鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"娣诲姞鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
index 9283a4c..48c1e83 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
@@ -126,6 +126,22 @@
},
],
},
+ vacationDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨浼戝亣鏃堕棿"
+ },
+ ],
+ },
+ vacationType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍋囨湡绫诲瀷"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
diff --git a/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue b/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
index 2d78b50..60c8e55 100644
--- a/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
+++ b/src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue
@@ -7,8 +7,7 @@
<a-form-model-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planCloseType">
<j-dict-select-tag :readOnly="disableSubmit" placeholder="璇烽�夋嫨绫诲瀷"
:triggerChange="true" dictCode="mdc_plan_type "
- v-model="model.planCloseType" allow-clear/>
-
+ v-model="model.planCloseType" allow-clear />
</a-form-model-item>
</a-col>
<a-col :span="24">
@@ -70,6 +69,15 @@
},
confirmLoading: false,
validatorRules: {
+ planCloseType:[
+ {required: true,message:'璇烽�夋嫨绫诲瀷!'}
+ ],
+ planCloseTimeType:[
+ {required: true,message:'璇烽�夋嫨鏃堕棿绫诲瀷!'}
+ ],
+ planCloseTimeLong:[
+ {required: true,message:'璇疯緭鍏ユ椂闀�!'}
+ ],
},
url: {
add: "/mdc/mdcPlanClose/add",
diff --git a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index bdfde0f..85a2cc5 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -269,7 +269,8 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
},
itemStyle: {
normal: {
@@ -312,7 +313,8 @@
// },
tooltip: {
trigger: 'item',
- formatter: "{a} <br/>{b} : {c} ({d}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)"锛�
+ formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}锛�${String(params.value).slice(1)}锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${params.value}锛�${params.percent}%锛塦
},
legend: {
orient: 'vertical',
@@ -335,7 +337,8 @@
label: {
show: true,
position: 'top',
- formatter: '{b}\n{c}'
+ // formatter: '{b}\n{c}',
+ formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
}
}
},
@@ -354,7 +357,8 @@
// },
tooltip: {
trigger: 'item',
- formatter: "{a} <br/>{b} : {c} ({d}%)"
+ // formatter: "{a} <br/>{b} : {c} ({d}%)",
+ formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}锛�${String(params.value).slice(1)}锛�${params.percent}%锛塦:`${params.seriesName}<br/>${params.name}锛�${params.value}锛�${params.percent}%锛塦
},
legend: {
orient: 'vertical',
@@ -377,7 +381,8 @@
label: {
show: true,
position: 'top',
- formatter: '{b}\n{c}'
+ // formatter: '{b}\n{c}',
+ formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
}
}
},
diff --git a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
index eec09ae..24eb98a 100644
--- a/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
+++ b/src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue
@@ -359,7 +359,8 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
},
itemStyle: {
normal: {
@@ -456,7 +457,8 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
},
itemStyle: {
normal: {
@@ -549,7 +551,8 @@
textStyle:{
color:'#000',
},
- formatter:"鏃堕暱锛歿c}H"
+ // formatter:"鏃堕暱锛歿c}H",
+ formatter:params=>String(params.value).length==2?`鏃堕暱锛�${String(params.value).slice(1)}H`:`鏃堕暱锛�${String(params.value)}H`
},
itemStyle: {
normal: {
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
index be82f57..d57d514 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue
@@ -530,7 +530,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
index 0ef247e..aea8dae 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue
@@ -120,6 +120,14 @@
},
],
},
+ noplanType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨绫诲瀷"
+ },
+ ],
+ },
},
url: {
@@ -253,7 +261,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("娣诲姞鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"娣诲姞鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index a508e48..2624eba 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -136,6 +136,14 @@
},
],
},
+ noplanType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨绫诲瀷"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index cb49c1c..f48a441 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -115,11 +115,18 @@
},
confirmLoading: false, form: this.$form.createForm(this),
validatorRules: {
- // shiftId:{
- // rules: [{
- // required: true, message: '璇烽�夋嫨鐝埗!',
- // }],
- // },
+ equipmentId:{
+ rules:[
+ {
+ required:true,message:'璇烽�夋嫨璁惧缁�!'
+ }
+ ]
+ },
+ shiftId:{
+ rules: [{
+ required: true, message: '璇烽�夋嫨鐝埗!',
+ }],
+ }
},
url: {
add: '/mdc/mdcDeviceCalendar/add',
@@ -300,27 +307,34 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
-
formData.dateList = this.sendDte
- postAction(this.url.settingCalendar, formData).then((res) => {
- if (res.success) {
- // that.$message.success(res.message)
- that.$notification.success({
- message:'娑堟伅',
- description:res.message
- });
- that.$emit('ok', res.result)
- } else {
- // that.$message.warning(res.message)
- that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
- }
- }).finally(() => {
+ if(formData.dateList&&formData.dateList.length>0){
+ postAction(this.url.settingCalendar, formData).then((res) => {
+ if (res.success) {
+ // that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+ that.$emit('ok', res.result)
+ } else {
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ }else{
that.confirmLoading = false
- that.close()
- })
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:'璇烽�夋嫨鐢熸晥鏃堕棿!'
+ });
+ }
}
})
},
diff --git a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
index 9a6d8f9..8c83625 100644
--- a/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
+++ b/src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue
@@ -115,7 +115,7 @@
}).then((res) => {
if (res.success) {
// that.$message.success("淇濆瓨鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇濆瓨鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index 864b89b..3d53d7d 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -117,10 +117,16 @@
let _this = this
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
- _this.$message.success('鎿嶄綔鎴愬姛锛�')
+ _this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ })
_this.loadData()
} else {
- _this.$message.warning('鎿嶄綔澶辫触锛�')
+ _this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
})
},
--
Gitblit v1.9.3