From 90e466c3e52c189e802ad1898becba54c55d91e8 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 09 八月 2023 15:03:58 +0800
Subject: [PATCH] 部门产线的权限控制、设备工作日历界面的样式调整
---
src/views/mdc/base/EfficiencyReport.vue | 21 +
src/store/modules/DepartTree.js | 53 +++
src/views/mdc/base/mdcPassRate.vue | 23 +
src/views/mdc/base/DeviceRepair.vue | 24 +
src/views/mdc/base/openRateFractionAnalysis.vue | 21 +
src/views/mdc/base/equipmentAvailCompare.vue | 23 +
src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue | 5
src/store/getters.js | 6
src/views/mdc/base/mdcStandardProcessDuration.vue | 21 +
src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue | 1
src/views/mdc/base/openRateTrendAnalysis.vue | 21 +
src/store/modules/Production.js | 1
src/store/index.js | 6
src/views/mdc/base/Torqueconfiguration.vue | 22 +
src/views/mdc/base/DeviceCalendar.vue | 21 +
src/views/system/modules/QuartzJobDetails.vue | 2
src/views/mdc/base/UnplannedDowntimemManager.vue | 21 +
src/views/mdc/base/mdcProcessQuantity.vue | 21 +
src/views/mdc/base/ComparativeAnalysis.vue | 28 +
src/store/mutation-types.js | 4
src/views/mdc/base/HolidayManagement.vue | 21 +
src/main.js | 6
src/views/mdc/base/equipmentDayAvail.vue | 23 +
src/views/mdc/base/EfficiencyShiftReport.vue | 21 +
src/views/mdc/base/EfficiencyPOReport.vue | 21 +
src/store/modules/Departs.js | 1
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 405 +++++++++++++++++----------
27 files changed, 611 insertions(+), 232 deletions(-)
diff --git a/src/main.js b/src/main.js
index f0c4cbe..8bc9dcf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,6 +51,12 @@
import { rules } from '@/utils/rules'
import * as echarts from 'echarts'
import qs from 'qs'
+import VCalendar from 'v-calendar'; // 寮曞叆鏃ュ巻鎻掍欢
+
+Vue.use(VCalendar, {
+ componentPrefix: 'vc',
+});
+
// import 'echarts-liquidfill'
Vue.prototype.$echarts = echarts
Vue.prototype.$qs = qs
diff --git a/src/store/getters.js b/src/store/getters.js
index cafecce..5bcfbea 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,5 +1,6 @@
import Vue from 'vue'
import { USER_INFO, ENHANCE_PRE } from "@/store/mutation-types"
+import DepartTree from './modules/DepartTree'
const getters = {
device: state => state.app.device,
theme: state => state.app.theme,
@@ -19,7 +20,10 @@
},
sysSafeMode: state => state.user.sysSafeMode,
ProductionNode:state => state.Production.ProductionTree,
- DepartNode:state => state.Depart.DepartTree
+ DepartNode:state => state.Depart.DepartTree,
+
+ DepartTree:state => state.DepartTree.DepartTreeType
+
}
export default getters
diff --git a/src/store/index.js b/src/store/index.js
index 6e1a279..9124886 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,7 +11,8 @@
import Production from './modules/Production'
//閮ㄩ棬鏍�
import Departs from './modules/Departs'
-
+//閮ㄩ棬鏍戞潈闄�
+import DepartTree from './modules/DepartTree'
Vue.use(Vuex)
export default new Vuex.Store({
@@ -22,7 +23,8 @@
enhance,
online,
Production,
- Departs
+ Departs,
+ DepartTree
},
state: {
diff --git a/src/store/modules/DepartTree.js b/src/store/modules/DepartTree.js
new file mode 100644
index 0000000..ea9c359
--- /dev/null
+++ b/src/store/modules/DepartTree.js
@@ -0,0 +1,53 @@
+import Vue from 'vue'
+import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
+import { SET_DEPARTTREE } from "@/store/mutation-types"
+import { getAction } from '@/api/manage'
+
+const DepartTree = {
+ state: {
+ token: '',
+ //閮ㄩ棬鏍戠殑鏉冮檺
+ DepartTreeType:""
+
+ },
+
+ mutations: {
+ SET_TOKEN: (state, token) => {
+ state.token = token
+ },
+ SET_DEPARTTREE:(state,DepartTreeType) => {
+ state.DepartTreeType = DepartTreeType
+ }
+ },
+
+ actions: {
+ // 浜х嚎鏍�
+ QueryDepartTree({ commit }) {
+ return new Promise((resolve, reject) => {
+
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems('depart_is', null).then((res) => {
+ if (res.success) {
+ const result = res.result
+ Vue.ls.set(SET_DEPARTTREE, result)
+ commit('SET_DEPARTTREE', result)
+ resolve(res)
+ }else{
+ resolve(res)
+
+ }
+ }).catch(error => {
+ reject(error)
+ })
+
+ })
+ },
+
+
+
+
+
+ }
+}
+
+export default DepartTree
\ No newline at end of file
diff --git a/src/store/modules/Departs.js b/src/store/modules/Departs.js
index f1835e5..d485eb9 100644
--- a/src/store/modules/Departs.js
+++ b/src/store/modules/Departs.js
@@ -25,7 +25,6 @@
QueryDepart({ commit }) {
return new Promise((resolve, reject) => {
getAction("/mdc/mdcEquipment/queryTreeListByDepart").then(response => {
- console.log("----閮ㄩ棬鏍�--------",response);
if(response.success){
const result = response.result
Vue.ls.set(SYS_DEPART, result)
diff --git a/src/store/modules/Production.js b/src/store/modules/Production.js
index 9749cbd..fc21e70 100644
--- a/src/store/modules/Production.js
+++ b/src/store/modules/Production.js
@@ -25,7 +25,6 @@
QueryProduction({ commit }) {
return new Promise((resolve, reject) => {
getAction("/mdc/mdcEquipment/queryTreeListByProduction").then(response => {
- console.log("----浜х嚎鏍�--------",response);
if(response.success){
const result = response.result
Vue.ls.set(SYS_PRODUCTION, result)
diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js
index a32659d..ab0c16d 100644
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -30,4 +30,6 @@
//浜х嚎鏍�
export const SYS_PRODUCTION = 'SYS_PRODUCTION'
//閮ㄩ棬鏍�
-export const SYS_DEPART = 'SYS_DEPART'
\ No newline at end of file
+export const SYS_DEPART = 'SYS_DEPART'
+//閮ㄩ棬鏍戞潈闄�
+export const SET_DEPARTTREE = 'SYS_DEPARTTREE'
\ No newline at end of file
diff --git a/src/views/mdc/base/ComparativeAnalysis.vue b/src/views/mdc/base/ComparativeAnalysis.vue
index a3649cc..aa781b7 100644
--- a/src/views/mdc/base/ComparativeAnalysis.vue
+++ b/src/views/mdc/base/ComparativeAnalysis.vue
@@ -2,23 +2,17 @@
<a-card :bordered="false">
<div style="width: 100%; height: 100%;overflow: hidden">
<a-row type="flex" :gutter="16">
- <!--<a-col :md="5" :sm="24">-->
- <!--<base-tree @getCurrSelected="changeSelectionNode"></base-tree>-->
- <!--</a-col>-->
<a-col :md="5">
<a-tabs :activeKey="activeKey" @change="tabChange">
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
<a-col :md="24-5" :sm="24">
- <!--<statistical-analysis-main :equip="selectEquementnode"></statistical-analysis-main>-->
- <!--<device-repair-list ref="DeviceRepairList" :nodeTree='selectEquement' :nodePeople='selectPeople' :Type="slectTypeTree" />-->
<comparative-analysismain ref="comparativeAnalysismain" :nodeTree='selectEquement' :nodePeople='selectPeople' :Type="slectTypeTree"></comparative-analysismain>
</a-col>
</a-row>
@@ -30,6 +24,7 @@
import BaseTree from '../common/BaseTree'
import comparativeAnalysismain from './modules/comparativeAnalysis/comparativeAnalysismain'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'ComparativeAnalysis',
components:{
@@ -47,10 +42,25 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
+ created() {
+ this.queryTreeData()
+ },
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
diff --git a/src/views/mdc/base/DeviceCalendar.vue b/src/views/mdc/base/DeviceCalendar.vue
index bdf53ca..792b2fd 100644
--- a/src/views/mdc/base/DeviceCalendar.vue
+++ b/src/views/mdc/base/DeviceCalendar.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'DeviceCalendar',
components: {
@@ -51,12 +51,25 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
diff --git a/src/views/mdc/base/DeviceRepair.vue b/src/views/mdc/base/DeviceRepair.vue
index 41f4a78..fc3ea7a 100644
--- a/src/views/mdc/base/DeviceRepair.vue
+++ b/src/views/mdc/base/DeviceRepair.vue
@@ -2,17 +2,13 @@
<div style="width: 100%; height: 100%;">
<a-card :bordered="false">
<a-row type="flex" :gutter="16">
- <!--<a-col :md="5">
- <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
- </a-col>-->
<a-col :md="5">
<a-tabs :activeKey="activeKey" @change="tabChange">
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -36,6 +32,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'DeviceRepair',
@@ -57,12 +54,25 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
diff --git a/src/views/mdc/base/EfficiencyPOReport.vue b/src/views/mdc/base/EfficiencyPOReport.vue
index 67a3e1b..a3c60c7 100644
--- a/src/views/mdc/base/EfficiencyPOReport.vue
+++ b/src/views/mdc/base/EfficiencyPOReport.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+import {mapActions} from 'vuex'
export default {
name: 'EfficiencyPOReport',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/EfficiencyReport.vue b/src/views/mdc/base/EfficiencyReport.vue
index b438494..692b34e 100644
--- a/src/views/mdc/base/EfficiencyReport.vue
+++ b/src/views/mdc/base/EfficiencyReport.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+import {mapActions} from 'vuex'
export default {
name: 'EfficiencyPOReport',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/EfficiencyShiftReport.vue b/src/views/mdc/base/EfficiencyShiftReport.vue
index 2e90585..bde51f6 100644
--- a/src/views/mdc/base/EfficiencyShiftReport.vue
+++ b/src/views/mdc/base/EfficiencyShiftReport.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -33,6 +32,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'EfficiencyShiftReport',
components: {
@@ -53,12 +53,25 @@
selectPeople:{},
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/HolidayManagement.vue b/src/views/mdc/base/HolidayManagement.vue
index 443b7d3..9b3c858 100644
--- a/src/views/mdc/base/HolidayManagement.vue
+++ b/src/views/mdc/base/HolidayManagement.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'HolidayManagement',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/Torqueconfiguration.vue b/src/views/mdc/base/Torqueconfiguration.vue
index 6196264..012027d 100644
--- a/src/views/mdc/base/Torqueconfiguration.vue
+++ b/src/views/mdc/base/Torqueconfiguration.vue
@@ -7,14 +7,12 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
<a-col :md="20">
- <!--<EfficiencyList ref="EfficiencyList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></EfficiencyList>-->
<torqueconfiguration-list ref="TorqueconfigurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></torqueconfiguration-list>
</a-col>
</a-row>
@@ -33,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'Torqueconfiguration',
components: {
@@ -53,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/UnplannedDowntimemManager.vue b/src/views/mdc/base/UnplannedDowntimemManager.vue
index cba9b67..9bd289a 100644
--- a/src/views/mdc/base/UnplannedDowntimemManager.vue
+++ b/src/views/mdc/base/UnplannedDowntimemManager.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'UnplannedDowntimemManager',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/equipmentAvailCompare.vue b/src/views/mdc/base/equipmentAvailCompare.vue
index 7a38279..4d2061c 100644
--- a/src/views/mdc/base/equipmentAvailCompare.vue
+++ b/src/views/mdc/base/equipmentAvailCompare.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -25,6 +24,7 @@
import BaseTree from '../common/BaseTree'
import equipmentAvailCompareMain from './modules/equipmentAvailCompare/equipmentAvailCompareMain'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'equipmentAvailCompare',
components:{
@@ -42,10 +42,25 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
+ created() {
+ this.queryTreeData()
+ },
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
diff --git a/src/views/mdc/base/equipmentDayAvail.vue b/src/views/mdc/base/equipmentDayAvail.vue
index 7b67954..9c8ae48 100644
--- a/src/views/mdc/base/equipmentDayAvail.vue
+++ b/src/views/mdc/base/equipmentDayAvail.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -25,6 +24,7 @@
import BaseTree from '../common/BaseTree'
import equipmentDayAvailMain from './modules/equipmentDayAvail/equipmentDayAvailMain'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'equipmentDayAvail',
components:{
@@ -42,10 +42,25 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
+ created() {
+ this.queryTreeData()
+ },
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
diff --git a/src/views/mdc/base/mdcPassRate.vue b/src/views/mdc/base/mdcPassRate.vue
index 16380a1..c84a741 100644
--- a/src/views/mdc/base/mdcPassRate.vue
+++ b/src/views/mdc/base/mdcPassRate.vue
@@ -7,14 +7,13 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
<a-col :md="20">
- <mdc-pass-rate-list ref="MdcStandardProcessDurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></mdc-pass-rate-list>
+ <mdc-pass-rate-list ref="MdcStandardProcessDurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></mdc-pass-rate-list>
</a-col>
</a-row>
</a-card>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'mdcPassRate',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/mdcProcessQuantity.vue b/src/views/mdc/base/mdcProcessQuantity.vue
index 605b07c..939fe41 100644
--- a/src/views/mdc/base/mdcProcessQuantity.vue
+++ b/src/views/mdc/base/mdcProcessQuantity.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'mdcProcessQuantity',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/mdcStandardProcessDuration.vue b/src/views/mdc/base/mdcStandardProcessDuration.vue
index a7f2a69..8edc29e 100644
--- a/src/views/mdc/base/mdcStandardProcessDuration.vue
+++ b/src/views/mdc/base/mdcStandardProcessDuration.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'mdcStandardProcessDuration',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index 6a82095..bb315ce 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -1,6 +1,6 @@
<template>
<div ref="device">
- <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => this.$refs.device"
+ <a-modal :title="title" :width="900" :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => this.$refs.device"
:okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
@@ -13,22 +13,8 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item label="鐢熸晥鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-date-picker v-decorator="['takeEffectDate',validatorRules.takeEffectDate]" :disabled="disableSubmit"
- :readOnly="disableSubmit" :disabledDate="disabledDate"/>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="澶辨晥鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-date-picker v-decorator="['invalidDate',validatorRules.invalidDate]" :disabled="disableSubmit"
- :readOnly="disableSubmit" :disabledDate="disabledDateEnd"/>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-col :span="24">
+ <a-form-item label="鐝埗" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
<a-select v-decorator="['monShiftId', validatorRules.monShiftId]" placeholder="璇烽�夋嫨鐝埗"
:allowClear='allowClear' @change="initShiftSubList">
<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
@@ -37,112 +23,24 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡浜�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['tueShiftId', validatorRules.tueShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
</a-row>
+
<a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['wedShiftId', validatorRules.wedShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡鍥�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['thuShiftId', validatorRules.thuShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
+ <a-col :span="24">
+ <a-form-item label="鐢熸晥鏃堕棿" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <div class="mainBox">
+ <Calendar
+ v-on:choseDay="clickDay"
+ v-on:changeMonth="changeDate"
+ v-on:isToday="clickToday"
+ :markDate = 'shiData'
+ :agoDayHide = 'value'
+ ></Calendar>
+ </div>
+
+ </a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡浜�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['friShiftId', validatorRules.friShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡鍏�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['satShiftId', validatorRules.satShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡鏃�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['sunShiftId', validatorRules.sunShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- </a-col>
- </a-row>
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="璁惧" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['equmentName',validatorRules.equmentName]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="鏄惁璺ㄥぉ" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-switch v-model="isDaySpan" :disabled="true" checked-children="鏄�" un-checked-children="鍚�"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['startDate',validatorRules.startDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['endDate',validatorRules.endDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="寮�濮嬩紤鎭椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['sleepStartDate',validatorRules.sleepStartDate]" :disabled="true"-->
- <!--:readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="缁撴潫浼戞伅鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['sleepEndDate',validatorRules.sleepEndDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
</a-form>
</a-spin>
<device-calend-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-calend-list-model>
@@ -163,12 +61,19 @@
duplicateCheck
} from '@/api/api'
+ import Calendar from 'vue-calendar-component';
+
export default {
name: 'ShiftInfoModel',
- components: {DeviceCalendListModel},
+ components: {DeviceCalendListModel,Calendar},
props: {},
data() {
return {
+ value:'',
+ date:'',
+ week:"",
+ selectDate: [],
+ // 褰撳墠鏃ユ湡
allowClear:true,
title: '',
isDaySpan: false,
@@ -226,13 +131,112 @@
},
shiftList: [],
shiftSubList: [],
- disableSubmit: true
+ disableSubmit: true,
+ calData:undefined,
+ shiData:[],
+ sendDte:[]
}
},
created() {
+ this.value = Math.round(new Date().getTime()/1000).toString()
+ var now = new Date();
+ this.date = now.getDate();//寰楀埌鏃ユ湡
+ var day = now.getDay();//寰楀埌鍛ㄥ嚑
+ var arr_week = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
+ this.week = arr_week[day];
+ this.getWorking()
},
methods: {
+ // clickDay(data) {
+ // console.log(data); //閫変腑鏌愬ぉ
+ // },
+ changeDate(data) {
+ console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
+ },
+ clickToday(data) {
+ console.log(data); // 璺冲埌浜嗘湰鏈�
+ },
+ // markChange(){
+ //
+ // },
+ getWorking(){//鑾峰彇褰撳墠鏈堝伐浣滄棩
+ let myDate = new Date();
+ let tY = myDate.getFullYear();//寰楀埌褰撳墠骞�
+ let tM = myDate.getMonth();//寰楀埌褰撳墠鏈�+1
+ let tD = new Date(tY,tM+1,0);
+ let tT=tD.getDate();//寰楀埌褰撳墠鏈堢殑澶╂暟
+
+ for(var i=1;i<=tT;i++){
+ let week =new Date(tY,tM,i).getDay()
+ if(week>=1&&week<=5){
+ let dd = tY + "/" + (tM + 1) + "/" + i;
+ let temp={className: "mark1",date:dd}
+ this.selectDate.push(temp)
+ }
+ }
+//console.log(JSON.stringify(this.selectDate))
+ },
+ resetSelect(){//閲嶇疆閫変腑鐨勬棩鏈�
+ this.selectDate=[]
+ this.shiData = []
+ this.sendDte = []
+ },
+ fun(obj){
+ console.log(obj)
+ if(obj){
+ if(obj = obj.split("/")){
+ var timShi = obj[1];
+ var timFen = obj[2];
+ if(timShi < 10){
+ timShi = '0'+timShi
+ }
+ if(timFen < 10){
+ timFen = '0'+timFen
+ }
+ var dd = (obj[0] + timShi +timFen)
+ return dd
+ }
+ }
+ },
+ clickDay(today){//閫変腑鏃ユ湡
+ // today = this.fun(today)
+ console.log("褰撳墠閫変腑鏃ユ湡===>", today);
+ let existDate = this.selectDate;
+ let isExist = true;
+ for (var i = 0; i < existDate.length; i++) {
+ if (existDate[i].date === today) {
+ console.log("褰撳墠鏃ユ湡瀛樺凡鍦�===>",today);
+ this.selectDate.splice(i,1);
+ this.shiData.splice(i,1);
+ this.sendDte.splice(i,1)
+ isExist = false;
+ }
+ }
+ if (isExist) {//褰撳墠鏃ユ湡瀛樺湪绉婚櫎
+ console.log("涓嶅瓨鍦�-娣诲姞===>");
+ let tempDate = {date: today, className: "mark1"}
+ // let ddd = this.fun(today)
+ let ddd = today
+ let ccc = this.fun(today)
+ this.selectDate.push(tempDate)
+ this.shiData.push(ddd)
+ this.sendDte.push(ccc)
+ }
+ console.log("this.selectDate===>",JSON.stringify(this.selectDate));
+ console.log(this.sendDte)
+ },
+ onSelect(value) {
+ console.log(value);
+ let arr = []
+ arr.push(value);
+ this.value = arr
+ // this.value = value;
+ // this.selectedValue = value;
+ },
+ onPanelChange(value) {
+ this.value = value;
+ },
deviceSearch() {
this.$refs.deviceRepairListModel.openPage()
this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
@@ -276,16 +280,17 @@
// })
},
add(record) {
+ this.resetSelect()
let _this = this
this.visible = true
this.form.resetFields()
this.model = Object.assign({}, record)
this.initShiftList()
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equmentName'))
+ this.form.setFieldsValue(pick(this.model))
this.form.setFieldsValue({
- takeEffectDate: moment(),
- invalidDate: moment().endOf('month')
+ // takeEffectDate: moment(),
+ // invalidDate: moment().endOf('month')
})
})
},
@@ -301,6 +306,9 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
+
+ formData.dateList = this.sendDte
+ console.log(formData)
postAction(this.url.settingCalendar, formData).then((res) => {
if (res.success) {
that.$message.success(res.message)
@@ -318,37 +326,14 @@
handleCancel() {
this.close()
},
- // shiftSubChange(val) {
- // let _this = this
- // getAction(this.url.getShiftSubById, { shiftSubId: val }).then((res) => {
- // if (res.success) {
- // if (res.result.isDaySpan == 'true') {
- // _this.isDaySpan = true
- // } else {
- // _this.isDaySpan = false
- // }
- // _this.form.setFieldsValue({
- // startDate: res.result.startDate,
- // endDate: res.result.endDate
- // })
- // if (res.result.sleepStartDate) {
- // _this.form.setFieldsValue({
- // sleepStartDate: res.result.sleepStartDate
- // })
- // }
- // if (res.result.sleepStartDate) {
- // _this.form.setFieldsValue({
- // sleepEndDate: res.result.sleepEndDate
- // })
- // }
- // }
- // })
- // }
+
}
}
</script>
<style scoped lang="less">
+
+
/deep/ .ant-modal-content{
/*background: -moz-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.27) 100%);*/
/*background: -webkit-gradient(linear, left left, right right, color-stop(0%, rgba(0, 0, 0, 0.66)), color-stop(100%, rgba(0, 0, 0, 0.4)));*/
@@ -383,4 +368,124 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+ /deep/ .mark1{
+ color:white!important;
+ background-color: #1890ff!important;
+ border-radius: 50%;
+ }
+ /deep/.mainBox .wh_content_all{
+ background-color: #ffffff;
+ border: 1px silver solid;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ }
+ /deep/ .mainBox .wh_content_all .wh_jiantou1{
+ border-top: 2px solid #000000;
+ border-left: 2px solid #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_jiantou2{
+ border-top: 2px solid #000000;
+ border-right: 2px solid #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_top_changge li{
+ color: black;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item{
+ margin-top: 5px;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_top_tag{
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date {
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date:hover{
+ color: #1890ff;
+ border:1px solid #1890ff;
+ border-radius: 50%;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_other_dayhide{
+ color: #bfbfbf!important;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_want_dayhide{
+ color: #bfbfbf!important;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_chose_day{
+ background: #ffffff;
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_isMark {
+ color: #1890ff;
+ border:1px solid #1890ff;
+ border-radius: 50%;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_isToday {
+ /*background: #33ad53;*/
+ /*background: #ff4d4d!important;*/
+ background-color: #ffffff;
+ color: #000000;
+ }
+
</style>
+
+<!--<style lang="scss">-->
+
+ <!--.mark1 {-->
+ <!--color: white !important;-->
+ <!--background: #1890ff !important;-->
+ <!--border-radius: 50%;-->
+ <!--}-->
+
+ <!--.mainBox {-->
+ <!--.wh_content_all { /*涓讳綋*/-->
+ <!--background-color: #ffffff;-->
+ <!--border: 1px silver solid;-->
+ <!--border-radius: 5px;-->
+ <!--.wh_jiantou1{/*宸︾澶�*/-->
+ <!--border-top: 2px solid #000000;-->
+ <!--border-left: 2px solid #000000;-->
+ <!--}-->
+ <!--.wh_jiantou2{/*鍙崇澶�*/-->
+ <!--border-top: 2px solid #000000;-->
+ <!--border-right: 2px solid #000000;-->
+ <!--}-->
+ <!--.wh_top_changge li { /*褰撳墠骞存湀鏍囬*/-->
+ <!--color: black;-->
+ <!--}-->
+ <!--.wh_content_item {-->
+ <!--margin-top: 5px;-->
+ <!--.wh_top_tag{/*鏄熸湡鏍囬*/-->
+ <!--color: #000000;-->
+ <!--}-->
+ <!--.wh_item_date {/*褰撳墠鏈�*/-->
+ <!--color: #000000;-->
+ <!--}-->
+ <!--.wh_item_date:hover { //鎮诞-->
+ <!--color: #1890ff;-->
+ <!--background: #ffffff;-->
+ <!--border-radius: 50%;-->
+ <!--}-->
+ <!--.wh_other_dayhide { /*涓婃湀鍜屼笅鏈堟椂闂�*/-->
+ <!--color: #bfbfbf;-->
+ <!--}-->
+ <!--.wh_chose_day { //閫変腑-->
+ <!--background: #ffffff;-->
+ <!--color: #000000;-->
+ <!--}-->
+ <!--.wh_isToday { /*褰撳墠澶�*/-->
+ <!--/*background: #33ad53;*/-->
+ <!--background: #ff4d4d;-->
+ <!--color: #ffffff;-->
+ <!--}-->
+ <!--}-->
+
+ <!--}-->
+ <!--}-->
+<!--</style>-->
+
+
+
+
+
diff --git a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
index 903b3e5..c8e7a4f 100644
--- a/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
+++ b/src/views/mdc/base/modules/equipmentAvailCompare/equipmentAvailCompareMain.vue
@@ -419,8 +419,11 @@
this.queryParam.startTime = '00:00'
this.queryParam.endTime = "08:00"
this.queryParams.typeTree = "1";
- this.initEquipment()
+
+ },
+ mounted() {
+ this.initEquipment()
},
}
</script>
diff --git a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
index 2adf041..0c5a80c 100644
--- a/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
+++ b/src/views/mdc/base/modules/equipmentDayAvail/equipmentDayAvailMain.vue
@@ -163,6 +163,7 @@
}
},
methods: {
+ moment,
drawTu(){
let dayAvailBar = this.$echarts.init(document.getElementById('dayAvailBar'), 'macarons');
//dayAvailLine = echarts.init(document.getElementById('dayAvailLine'));
diff --git a/src/views/mdc/base/openRateFractionAnalysis.vue b/src/views/mdc/base/openRateFractionAnalysis.vue
index e54e962..fc741c6 100644
--- a/src/views/mdc/base/openRateFractionAnalysis.vue
+++ b/src/views/mdc/base/openRateFractionAnalysis.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'openRateFractionAnalysis',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/mdc/base/openRateTrendAnalysis.vue b/src/views/mdc/base/openRateTrendAnalysis.vue
index f2df369..4540346 100644
--- a/src/views/mdc/base/openRateTrendAnalysis.vue
+++ b/src/views/mdc/base/openRateTrendAnalysis.vue
@@ -7,9 +7,8 @@
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></base-tree>
</a-tab-pane>
- <a-tab-pane key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -32,6 +31,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'openRateTrendAnalysis',
components: {
@@ -52,12 +52,25 @@
slectTypeTree:"",
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
created() {
+ this.queryTreeData()
},
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val);
this.activeKey = val
diff --git a/src/views/system/modules/QuartzJobDetails.vue b/src/views/system/modules/QuartzJobDetails.vue
index 916b9f7..d96e548 100644
--- a/src/views/system/modules/QuartzJobDetails.vue
+++ b/src/views/system/modules/QuartzJobDetails.vue
@@ -41,7 +41,7 @@
},
methods: {
showDetails(record){
- console.log(record)
+ // console.log(record)
this.visible = true
this.textContent = record.exceptionDetail
},
--
Gitblit v1.9.3