From 487754376a1eb675d430a64b7a4aa9e7ffeb405b Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 25 八月 2023 09:54:15 +0800
Subject: [PATCH] 调整
---
src/views/system/modules/DepartList/DepartAuthModal.vue | 9
src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue | 2
src/components/tools/UserMenu.vue | 8
src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue | 2
src/views/mdc/base/modules/deviceLog/WorkLogList.vue | 22 +
src/views/system/modules/QuartzJobListModal.vue | 23 +
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue | 2
src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue | 2
src/views/system/modules/UserModal.vue | 23 +
src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue | 2
src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue | 2
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue | 2
src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue | 2
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue | 2
src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue | 2
src/views/mdc/base/EquipmentList.vue | 2
src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue | 10
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 2
ip | 5
src/views/mdc/base/modules/deviceLog/AlarmLogList.vue | 22 +
src/views/mdc/base/modules/deviceLog/LogList.vue | 22 +
src/views/system/QuartzJobList.vue | 40 ++
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue | 2
src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisBar.vue | 324 +++++++++++++++++++++++-
src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue | 4
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 22
src/views/system/UserList.vue | 163 ++++++++++++
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue | 2
src/views/system/modules/QuartzJobModal.vue | 8
29 files changed, 652 insertions(+), 81 deletions(-)
diff --git a/ip b/ip
index d2a836c..c7ef253 100644
--- a/ip
+++ b/ip
@@ -1,8 +1,5 @@
-娌堥: 172.19.128.73
鏈満: 127.0.0.1
-椋庡崕锛�10.103.1.7
-
-椋庡崕2锛�10.16.120.13
+430:166.0.1.10
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index 83f62a2..8f462d8 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -50,10 +50,10 @@
<!--<span>璐︽埛璁剧疆</span>-->
<!--</router-link>-->
<!--</a-menu-item>-->
- <a-menu-item key="3" @click="systemSetting">
- <a-icon type="tool"/>
- <span>绯荤粺璁剧疆</span>
- </a-menu-item>
+ <!--<a-menu-item key="3" @click="systemSetting">-->
+ <!--<a-icon type="tool"/>-->
+ <!--<span>绯荤粺璁剧疆</span>-->
+ <!--</a-menu-item>-->
<a-menu-item key="4" @click="updatePassword">
<a-icon type="setting"/>
<span>瀵嗙爜淇敼</span>
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 92f802e..78fc6ff 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -485,7 +485,7 @@
frozenBatch({ids: ids, status: status}).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/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 30a09dd..8b6dc30 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -39,18 +39,10 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+ <a-form-model-item v-if="isDepartType == 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-equipment-depart :disabled="disableSubmit" v-model="model.selectedDeparts" :multi="false" @back="backDepartInfo" :backDepart="true" :treeOpera="true"></j-select-equipment-depart>
</a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item v-if="isDepartType == 0" 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>
<a-form-model-item v-if="isDepartType == -1" label="璁惧绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇烽�夋嫨璁惧绫诲瀷"
:triggerChange="true"
@@ -60,6 +52,16 @@
</a-select-option>
</a-select>
</a-form-model-item>
+ </a-col>
+ <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>
+
</a-col>
</a-row>
<a-row :gutter="24">
@@ -489,7 +491,7 @@
obj.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/StatisticalAnalysis/StatisticalAnalysisMain.vue b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
index 24c8bbf..1b52d6a 100644
--- a/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
+++ b/src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue
@@ -321,8 +321,8 @@
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
calculable: true,
@@ -334,7 +334,7 @@
itemStyle: {
normal: {
color: function (params) {
- let colorList = ['#849db8', '#6496e9'];
+ let colorList = [ '#6496e9','#849db8'];
return colorList[params.dataIndex]
},
label: {
@@ -363,8 +363,8 @@
},
legend: {
orient: 'vertical',
- x: 'left',
- y: 'bottom',
+ x: '85%',
+ y: '50%',
data: ['杩愯鏃堕棿', '寰呮満鏃堕棿']
},
calculable: true,
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index 3cd9d33..118aa60 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -281,7 +281,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/alarmManager/alarmManagerModal.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
index c889ccb..9156b7c 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerModal.vue
@@ -220,7 +220,7 @@
putAction(this.url.add, formData).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/comparativeAnalysis/comparativeAnalysisBar.vue b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisBar.vue
index 18c9796..2cedc86 100644
--- a/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisBar.vue
+++ b/src/views/mdc/base/modules/comparativeAnalysis/comparativeAnalysisBar.vue
@@ -1,5 +1,5 @@
<template>
- <div class="comparative_Bar" style="width: 100%;height: 700px;display: flex;flex-direction: column;overflow: scroll">
+ <div class="comparative_Bar" style="width: 100%;height: 900px;display: flex;flex-direction: column;overflow: scroll">
<div id="compAnalBar1" style="flex: 1;"></div>
<div id="compAnalBar2" style="flex: 1;"></div>
</div>
@@ -56,6 +56,7 @@
textStyle: {
color: '#90979c'
},
+ color: ['#6496e9', '#4fe1c5'],
data: ['寮�鏈虹巼', '鍒╃敤鐜�']
},
toolbox: {
@@ -154,14 +155,34 @@
name: '寮�鏈虹巼',
type: 'bar',
//barWidth: 30,
+ barWidth: 25,
itemStyle: {
normal: {
- color: '#4169E1'
+ color: function(params) {
+ let colorList = [
+ ["#6496e9","#6bded3"],
+ // ["#849db8","#b4b8cc"],
+ // ["#4fe1c5","#4ecee1"],
+ // // ["#9978fa","#88a1fa"],
+ // ["#ffbb65","#fdc68b"],
+ ];
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex];
+ return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ offset:0,
+ color:'#6496e9'
+ },
+ {
+ offset:1,
+ color:"#6bded3"
+ }],false)
+ },
+ barBorderRadius: [5, 5, 0, 0],
}
},
data: [0],
- barCategoryGap: '20%',
- barGap : '-10%',
+ // barCategoryGap: '20%',
+ // barGap : '-10%',
markPoint : {
data : [
{type : 'max', name: '鏈�澶у��',symbolSize:70},
@@ -178,11 +199,31 @@
name: '鍒╃敤鐜�',
type: 'bar',
//barWidth: 30,
- barCategoryGap: '20%',
- barGap : '-10%',
+ barWidth: 25,
+ // barCategoryGap: '20%',
+ // barGap : '-10%',
itemStyle: {
normal: {
- color: '#00ee00'
+ color: function(params) {
+ let colorList = [
+ // ["#6496e9","#6bded3"],
+ // ["#849db8","#b4b8cc"],
+ ["#4fe1c5","#4ecee1"],
+ // ["#9978fa","#88a1fa"],
+ // ["#ffbb65","#fdc68b"],
+ ];
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex];
+ return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ offset:0,
+ color:"#4fe1c5"
+ },
+ {
+ offset:1,
+ color:"#4ecee1"
+ }],false)
+ },
+ barBorderRadius: [5, 5, 0, 0],
}
},
data: [0],
@@ -200,7 +241,187 @@
}
]
};
- let compAnalBarOption2 = {
+ // let compAnalBarOption2 = {
+ // tooltip: {
+ // trigger: 'axis',
+ // axisPointer: {
+ // type: "shadow",
+ // textStyle: {
+ // color: "#fff"
+ // }
+ //
+ // }
+ // },
+ // legend: {
+ // x: '4%',
+ // top: '11%',
+ // textStyle: {
+ // color: '#90979c'
+ // },
+ // data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿'],
+ // color:['#6496e9','#b4b8cc']
+ // },
+ // toolbox: {
+ // show : true,
+ // feature : {
+ // mark : {show: true},
+ // magicType : {show: true, type: ['line', 'bar']},
+ // restore : {show: true},
+ // saveAsImage : {show: true,name:'璁惧杩愯鏃堕棿瀵规瘮鍒嗘瀽鍥�'}
+ // }
+ // },
+ // calculable: true,
+ // grid: {
+ // borderWidth: 0,
+ // top: 110,
+ // bottom: 95,
+ // textStyle: {
+ // color: "#fff"
+ // }
+ // },
+ // xAxis: [
+ // {
+ // type: 'category',
+ // splitLine: {
+ // "show": false
+ // },
+ // axisTick: {
+ // "show": false
+ // },
+ // splitArea: {
+ // show: false
+ // },
+ // boundaryGap : true,
+ // axisLabel : {
+ // interval : 0,
+ // rotate : 0,
+ // show: true,
+ // wigth:20,
+ // splitNumber: 8,
+ // textStyle: {
+ // fontFamily: "寰蒋闆呴粦",
+ // fontSize: 12
+ // }
+ // },
+ // data : [0]
+ // }
+ // ],
+ // yAxis: [
+ // {
+ // type: 'value',
+ // splitLine: {
+ // show: false
+ // },
+ // axisLine: {
+ // lineStyle: {
+ // color: '#90979c'
+ // }
+ // },
+ // axisTick: {
+ // show: false
+ // },
+ // axisLabel: {
+ // interval: 0
+ //
+ // },
+ // splitArea: {
+ // show: false
+ // }
+ // }
+ // ],
+ // dataZoom: [{
+ // show: true,
+ // height: 30,
+ // xAxisIndex: [0],
+ // bottom: 30,
+ // start: 0,
+ // end: 100,
+ // handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+ // handleSize: '110%',
+ // handleStyle: {
+ // color: "#d3dee5"
+ // },
+ // textStyle: {
+ // color: "#fff"
+ // },
+ // borderColor: "#90979c"
+ // }, {
+ // type: "inside",
+ // show: true,
+ // height: 15,
+ // start: 1,
+ // end: 35
+ // }],
+ // series: [
+ // {
+ // name: '寮�鏈烘椂闂�',
+ // type: 'bar',
+ // //barWidth: 30,
+ // barWidth: 25,
+ // // stack: 'sum',
+ // // barCategoryGap: '20%',
+ // itemStyle: {
+ // normal: {
+ // color: function(params) {
+ // let colorList = [
+ // ["#6496e9","#6bded3"],
+ // // ["#849db8","#b4b8cc"],
+ // // ["#4fe1c5","#4ecee1"],
+ // // // ["#9978fa","#88a1fa"],
+ // // ["#ffbb65","#fdc68b"],
+ // ];
+ // // return colorList[params.dataIndex];
+ // let colorItem = colorList[params.dataIndex];
+ // return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ // offset:0,
+ // color:'#6496e9'
+ // },
+ // {
+ // offset:1,
+ // color:"#6bded3"
+ // }],false)
+ // },
+ // barBorderRadius: [5, 5, 0, 0],
+ // }
+ // },
+ // data: [0]
+ // },
+ // {
+ // name: '鍏虫満鏃堕棿',
+ // type: 'bar',
+ // //barWidth: 30,
+ // barWidth: 25,
+ // // stack: 'sum',
+ // // barCategoryGap: '20%',
+ // itemStyle: {
+ // normal: {
+ // color: function(params) {
+ // let colorList = [
+ // // ["#6496e9","#6bded3"],
+ // ["#849db8","#b4b8cc"],
+ // // ["#4fe1c5","#4ecee1"],
+ // // // ["#9978fa","#88a1fa"],
+ // // ["#ffbb65","#fdc68b"],
+ // ];
+ // // return colorList[params.dataIndex];
+ // let colorItem = colorList[params.dataIndex];
+ // return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ // offset:0,
+ // color:'#849db8'
+ // },
+ // {
+ // offset:1,
+ // color:"#b4b8cc"
+ // }],false)
+ // },
+ // barBorderRadius: [5, 5, 0, 0],
+ // }
+ // },
+ // data: [0]
+ // }
+ // ]
+ // };
+ let compAnalBarOption2 = {
tooltip: {
trigger: 'axis',
axisPointer: {
@@ -217,6 +438,7 @@
textStyle: {
color: '#90979c'
},
+ color:['#6496e9','#b4b8cc'],
data: ['寮�鏈烘椂闂�', '鍏虫満鏃堕棿']
},
toolbox: {
@@ -225,7 +447,7 @@
mark : {show: true},
magicType : {show: true, type: ['line', 'bar']},
restore : {show: true},
- saveAsImage : {show: true,name:'璁惧杩愯鏃堕棿瀵规瘮鍒嗘瀽鍥�'}
+ saveAsImage : {show: true,name:'璁惧杩愯鏁堢巼瀵规瘮鍒嗘瀽鍥�'}
}
},
calculable: true,
@@ -315,31 +537,92 @@
name: '寮�鏈烘椂闂�',
type: 'bar',
//barWidth: 30,
- stack: 'sum',
- barCategoryGap: '20%',
+ barWidth: 25,
itemStyle: {
normal: {
- color: '#4169E1'
+ color: function(params) {
+ let colorList = [
+ ["#6496e9","#6bded3"],
+ // ["#849db8","#b4b8cc"],
+ // ["#4fe1c5","#4ecee1"],
+ // // ["#9978fa","#88a1fa"],
+ // ["#ffbb65","#fdc68b"],
+ ];
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex];
+ return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ offset:0,
+ color:'#6496e9'
+ },
+ {
+ offset:1,
+ color:"#6bded3"
+ }],false)
+ },
+ barBorderRadius: [5, 5, 0, 0],
}
},
- data: [0]
+ data: [0],
+ // barCategoryGap: '20%',
+ // barGap : '-10%',
+ markPoint : {
+ data : [
+ {type : 'max', name: '鏈�澶у��',symbolSize:70},
+ {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ ]
+ },
+ markLine : {
+ data : [
+ {type : 'average', name: '骞冲潎鍊�'}
+ ]
+ }
},
{
name: '鍏虫満鏃堕棿',
type: 'bar',
//barWidth: 30,
- stack: 'sum',
- barCategoryGap: '20%',
+ barWidth: 25,
+ // barCategoryGap: '20%',
+ // barGap : '-10%',
itemStyle: {
normal: {
- color: '#A8A8A8'
+ color: function(params) {
+ let colorList = [
+ // ["#6496e9","#6bded3"],
+ ["#849db8","#b4b8cc"],
+ // ["#4fe1c5","#4ecee1"],
+ // ["#9978fa","#88a1fa"],
+ // ["#ffbb65","#fdc68b"],
+ ];
+ // return colorList[params.dataIndex];
+ let colorItem = colorList[params.dataIndex];
+ return new echarts.graphic.LinearGradient(0,0,0,1,[{
+ offset:0,
+ color:"#849db8"
+ },
+ {
+ offset:1,
+ color:"#b4b8cc"
+ }],false)
+ },
+ barBorderRadius: [5, 5, 0, 0],
}
},
- data: [0]
+ data: [0],
+ markPoint : {
+ data : [
+ {type : 'max', name: '鏈�澶у��',symbolSize:70},
+ {type : 'min', name: '鏈�灏忓��',symbolSize:70}
+ ]
+ },
+ markLine : {
+ data : [
+ {type : 'average', name: '骞冲潎鍊�'}
+ ]
+ }
}
]
};
-
if(this.OpenCloseList != null){
this.equipmentList = []
this.openRate =[]
@@ -348,8 +631,9 @@
this.closeLong = []
for(var i = 0;i<this.OpenCloseList.length;i++){
this.equipmentList.push(this.OpenCloseList[i].equipmentId)
- this.openRate.push(this.OpenCloseList[i].openRate)
- this.utilizationRate.push(this.OpenCloseList[i].utilizationRate)
+ this.openRate.push((this.OpenCloseList[i].openRate*100).toFixed(2))
+ // (this.openRate * 100).toFixed(2)
+ this.utilizationRate.push((this.OpenCloseList[i].utilizationRate*100).toFixed(2))
this.openLong.push(this.OpenCloseList[i].openLong)
this.closeLong.push(this.OpenCloseList[i].closeLong)
}
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
index df84949..ff78e6b 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
@@ -364,7 +364,7 @@
deleteAction(that.url.deleteBatch, { ids: ids }).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/deviceLog/AlarmLogList.vue b/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
index 40f73fd..4aa3935 100644
--- a/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/AlarmLogList.vue
@@ -77,7 +77,27 @@
const hour = parseInt(ss / 3600) < 10 ? '0' + parseInt(ss / 3600) : parseInt(ss / 3600)
const min = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
const sec = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- return hour + '鏃�' + min + '鍒�' + sec + '绉�'
+ if(min == '00') {
+ if(sec == '00'){
+ return hour + '灏忔椂'
+ }else{
+ return hour + '灏忔椂'+ sec + '绉�'
+ }
+
+ }else{
+ if(sec == '00') {
+ return hour + '灏忔椂' + min + '鍒�'
+ }else{
+ return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
+ }
+ }
+ // if(sec == '00'){
+ // return hour + '灏忔椂' + min + '鍒�'
+ // }
+ // if(min == '00' && sec == '00'){
+ // return hour + '灏忔椂'
+ // }
+ // return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}else if(60<ss && ss<3600){
const min1 = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
diff --git a/src/views/mdc/base/modules/deviceLog/LogList.vue b/src/views/mdc/base/modules/deviceLog/LogList.vue
index d58caea..e5da78a 100644
--- a/src/views/mdc/base/modules/deviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogList.vue
@@ -101,7 +101,27 @@
const hour = parseInt(ss / 3600) < 10 ? '0' + parseInt(ss / 3600) : parseInt(ss / 3600)
const min = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
const sec = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- return hour + '鏃�' + min + '鍒�' + sec + '绉�'
+ if(min == '00') {
+ if(sec == '00'){
+ return hour + '灏忔椂'
+ }else{
+ return hour + '灏忔椂'+ sec + '绉�'
+ }
+
+ }else{
+ if(sec == '00') {
+ return hour + '灏忔椂' + min + '鍒�'
+ }else{
+ return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
+ }
+ }
+ // if(sec == '00'){
+ // return hour + '灏忔椂' + min + '鍒�'
+ // }
+ // if(min == '00' && sec == '00'){
+ // return hour + '灏忔椂'
+ // }
+ // return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}else if(60<ss && ss<3600){
const min1 = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
diff --git a/src/views/mdc/base/modules/deviceLog/WorkLogList.vue b/src/views/mdc/base/modules/deviceLog/WorkLogList.vue
index 6f5390b..8b2a7f3 100644
--- a/src/views/mdc/base/modules/deviceLog/WorkLogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/WorkLogList.vue
@@ -81,7 +81,27 @@
const hour = parseInt(ss / 3600) < 10 ? '0' + parseInt(ss / 3600) : parseInt(ss / 3600)
const min = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
const sec = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- return hour + '鏃�' + min + '鍒�' + sec + '绉�'
+ if(min == '00') {
+ if(sec == '00'){
+ return hour + '灏忔椂'
+ }else{
+ return hour + '灏忔椂'+ sec + '绉�'
+ }
+
+ }else{
+ if(sec == '00') {
+ return hour + '灏忔椂' + min + '鍒�'
+ }else{
+ return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
+ }
+ }
+ // if(sec == '00'){
+ // return hour + '灏忔椂' + min + '鍒�'
+ // }
+ // if(min == '00' && sec == '00'){
+ // return hour + '灏忔椂'
+ // }
+ // return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}else if(60<ss && ss<3600){
const min1 = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
diff --git a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
index 32e1b5f..fd413b7 100644
--- a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
@@ -198,7 +198,7 @@
series: [
{
name: '鍒╃敤鐜�',
- type: 'bar',
+ type: 'line',
barWidth: 50,
itemStyle: {
normal: {
diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index a141162..1f9b37a 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -209,7 +209,7 @@
series: [
{
name: '鍒╃敤鐜�',
- type: 'bar',
+ type: 'line',
barWidth: 50,
itemStyle: {
normal: {
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
index 18078ff..8828b41 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateEdit.vue
@@ -263,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/mdcPassRate/mdcPassRateList.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
index f5c23aa..1d6114e 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateList.vue
@@ -520,7 +520,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(1)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -562,7 +562,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
index 44e8c20..09d01ed 100644
--- a/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
+++ b/src/views/mdc/base/modules/mdcPassRate/mdcPassRateModal.vue
@@ -245,7 +245,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/mdcProcessQuantity/mdcProcessQuantityModal.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
index a1f329b..7a54404 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
@@ -275,7 +275,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/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
index aba7dad..c342b4e 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
@@ -283,7 +283,7 @@
if (res.success) {
// that.$message.success("淇敼鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇敼鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
index d9e155e..d55c64e 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
@@ -264,7 +264,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/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
index f599982..a72a331 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
@@ -257,7 +257,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/openRateFractionAnalysis/openRateFractionAnalysisMain.vue b/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
index 8a5052c..f6fd29a 100644
--- a/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
+++ b/src/views/mdc/base/modules/openRateFractionAnalysis/openRateFractionAnalysisMain.vue
@@ -339,7 +339,7 @@
series: [
{
name: '鍒╃敤鐜�',
- type: 'bar',
+ type: 'line',
data: this.YData,
markPoint: {
data: [
diff --git a/src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue b/src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue
index a8c7da6..97efeec 100644
--- a/src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue
+++ b/src/views/mdc/base/modules/openRateTrendAnalysis/openRateTrendAnalysisMain.vue
@@ -348,7 +348,7 @@
series: [
{
name: '鍒╃敤鐜�',
- type: 'bar',
+ type: 'line',
data: this.YData,
markPoint: {
data: [
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index b025d43..4e89a3d 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -7,8 +7,8 @@
<a-row :gutter="24">
<a-col :md="6" :sm="10">
- <a-form-model-item label="浠诲姟绫诲悕" prop="jobClassName">
- <a-input placeholder="璇疯緭鍏ヤ换鍔＄被鍚�" v-model="queryParam.jobClassName"></a-input>
+ <a-form-model-item label="浠诲姟鍚嶇О" prop="jobClassName">
+ <a-input placeholder="璇疯緭鍏ヤ换鍔″悕绉�" v-model="queryParam.jobName"></a-input>
</a-form-model-item>
</a-col>
<a-col :md="6" :sm="10">
@@ -245,11 +245,19 @@
onOk: function(){
getAction(that.url.pause,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
@@ -265,11 +273,19 @@
onOk: function(){
getAction(that.url.resume,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
@@ -284,11 +300,19 @@
onOk: function(){
getAction(that.url.execute,{id:record.id}).then((res)=>{
if(res.success){
- that.$message.success(res.message);
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.loadData();
that.onClearSelected();
}else{
- that.$message.warning(res.message);
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
});
}
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index df8c1ab..47e9d00 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -189,6 +189,7 @@
import UserRecycleBinModal from './modules/UserRecycleBinModal'
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
+ import {mapActions} from 'vuex'
export default {
name: "UserList",
@@ -279,12 +280,14 @@
{
title: '鎿嶄綔',
dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
+ scopedSlots: { customRender: 'action' },
align: "center",
width: 80
- }
+ },
+
],
+ isDepartType:'',
superQueryFieldList: [
{ type: 'input', value: 'username', text: '鐢ㄦ埛璐﹀彿', },
{ type: 'input', value: 'realname', text: '鐢ㄦ埛濮撳悕', },
@@ -305,7 +308,161 @@
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
- methods: {
+ created() {
+ this.queryTreeData()
+ },
+ methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ if(this.isDepartType == -1){
+ this.columns=[
+ {
+ title: '鐢ㄦ埛璐﹀彿',
+ align: "center",
+ dataIndex: 'username',
+ width: 120,
+ sorter: true
+ },
+ {
+ title: '鐢ㄦ埛濮撳悕',
+ align: "center",
+ width: 100,
+ dataIndex: 'realname',
+ },
+ {
+ title: '澶村儚',
+ align: "center",
+ width: 80,
+ dataIndex: 'avatar',
+ scopedSlots: {customRender: "avatarslot"}
+ },
+
+ // {
+ // title: '鎬у埆',
+ // align: "center",
+ // width: 80,
+ // dataIndex: 'sex_dictText',
+ // sorter: true
+ // },
+ // {
+ // title: '鐢熸棩',
+ // align: "center",
+ // width: 100,
+ // dataIndex: 'birthday'
+ // },
+ // {
+ // title: '鎵嬫満鍙风爜',
+ // align: "center",
+ // width: 100,
+ // dataIndex: 'phone'
+ // },
+ {
+ title: '杞﹂棿',
+ align: "center",
+ width: 240,
+ dataIndex: 'productionName'
+ },
+ {
+ title: '鐘舵��',
+ align: "center",
+ width: 80,
+ dataIndex: 'status_dictText'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: "center",
+ width: 80
+ },
+
+
+ ]
+ }else{
+ this.columns= [
+ {
+ title: '鐢ㄦ埛璐﹀彿',
+ align: "center",
+ dataIndex: 'username',
+ width: 120,
+ sorter: true
+ },
+ {
+ title: '鐢ㄦ埛濮撳悕',
+ align: "center",
+ width: 100,
+ dataIndex: 'realname',
+ },
+ {
+ title: '澶村儚',
+ align: "center",
+ width: 80,
+ dataIndex: 'avatar',
+ scopedSlots: {customRender: "avatarslot"}
+ },
+
+ // {
+ // title: '鎬у埆',
+ // align: "center",
+ // width: 80,
+ // dataIndex: 'sex_dictText',
+ // sorter: true
+ // },
+ // {
+ // title: '鐢熸棩',
+ // align: "center",
+ // width: 100,
+ // dataIndex: 'birthday'
+ // },
+ // {
+ // title: '鎵嬫満鍙风爜',
+ // align: "center",
+ // width: 100,
+ // dataIndex: 'phone'
+ // },
+ {
+ title: '閮ㄩ棬',
+ align: "center",
+ width: 240,
+ dataIndex: 'orgCodeTxt'
+ },
+ {
+ title: '杞﹂棿',
+ align: "center",
+ width: 240,
+ dataIndex: 'productionName'
+ },
+ {
+ title: '鐘舵��',
+ align: "center",
+ width: 80,
+ dataIndex: 'status_dictText'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: "center",
+ width: 80
+ }
+
+
+ ]
+ }
+
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
getAvatarView: function (avatar) {
return getFileAccessHttpUrl(avatar)
},
diff --git a/src/views/system/modules/DepartList/DepartAuthModal.vue b/src/views/system/modules/DepartList/DepartAuthModal.vue
index 85b1a18..a4d88ad 100644
--- a/src/views/system/modules/DepartList/DepartAuthModal.vue
+++ b/src/views/system/modules/DepartList/DepartAuthModal.vue
@@ -252,7 +252,12 @@
postAction(this.url.removeEquipmentForDepart,qs.stringify({departId:this.departId,equipmentId:equipmentId})).then((res)=>{
if (res.success) {
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
+
this.loadData(this.departId);
}else{
// this.$message.warning(res.message)
@@ -299,7 +304,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/system/modules/QuartzJobListModal.vue b/src/views/system/modules/QuartzJobListModal.vue
index 89f4297..b9e07b4 100644
--- a/src/views/system/modules/QuartzJobListModal.vue
+++ b/src/views/system/modules/QuartzJobListModal.vue
@@ -193,6 +193,29 @@
title: '鎵ц鏃堕棿锛堟绉掞級',
align: 'center',
dataIndex: 'executionTime',
+ customRender:(t,r,index) =>{
+ var milliseconds = parseInt(t)
+ let hours = Math.floor(milliseconds / 3600000);
+ milliseconds = milliseconds % 3600000;
+ let minutes = Math.floor(milliseconds / 60000);
+ milliseconds = milliseconds % 60000;
+ let seconds = Math.floor(milliseconds / 1000);
+ milliseconds = milliseconds % 1000;
+ if(hours == 0){
+ if(minutes == 0){
+ if(seconds == 0) {
+ return `${milliseconds}姣`
+ }else{
+ return `${seconds}绉� ${milliseconds}姣`
+ }
+ }else{
+ return `${minutes}鍒嗛挓 ${seconds}绉� ${milliseconds}姣`;
+ }
+ }else{
+ return `${hours}灏忔椂 ${minutes}鍒嗛挓 ${seconds}绉� ${milliseconds}姣`;
+ }
+
+ }
},
{
diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue
index ba9368d..d55163e 100644
--- a/src/views/system/modules/QuartzJobModal.vue
+++ b/src/views/system/modules/QuartzJobModal.vue
@@ -12,8 +12,8 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="浠诲姟绫诲悕" prop="jobClassName" hasFeedback >
- <a-input placeholder="璇疯緭鍏ヤ换鍔＄被鍚�" v-model="model.jobClassName" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="浠诲姟鍚嶇О" prop="jobName" hasFeedback >
+ <a-input placeholder="璇疯緭鍏ヤ换鍔″悕绉�" v-model="model.jobName" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Cron琛ㄨ揪寮�" prop="cronExpression">
<!-- <j-cron v-model="model.cronExpression"/>-->
@@ -22,8 +22,8 @@
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鍙傛暟" prop="parameter" >
<a-textarea placeholder="璇疯緭鍏ュ弬鏁�" :rows="5" v-model="model.parameter" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鎻忚堪" prop="description">
- <a-textarea placeholder="璇疯緭鍏ユ弿杩�" :rows="3" v-model="model.description" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="璇存槑" prop="description">
+ <a-textarea placeholder="璇疯緭鍏ヨ鏄�" :rows="3" v-model="model.description" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="鐘舵��" prop="status">
<j-dict-select-tag type="radioButton" v-model="model.status" dictCode="quartz_status"/>
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 2abe65b..ce46390 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -58,7 +58,7 @@
</a-form-model-item>
<!--閮ㄩ棬鍒嗛厤-->
- <a-form-model-item label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+ <a-form-model-item v-if="isDepartType== 0" label="閮ㄩ棬鍒嗛厤" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
<j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
</a-form-model-item>
@@ -134,6 +134,7 @@
import { disabledAuthFilter } from "@/utils/authFilter"
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
+ import {mapActions} from 'vuex'
export default {
name: "UserModal",
@@ -194,7 +195,9 @@
tenantsOptions: [],
rolesOptions:[],
nextDepartOptions:[],
- nextProductionOptions:[]
+ nextProductionOptions:[],
+ isDepartType:'',
+
}
},
created () {
@@ -202,6 +205,7 @@
this.headers = {"X-Access-Token":token}
this.initRoleList()
this.initTenantList()
+ this.queryTreeData()
},
computed:{
uploadAction:function () {
@@ -209,6 +213,21 @@
}
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
add () {
this.refresh();
this.edit({activitiSync:'1',userIdentity:1});
--
Gitblit v1.9.3