From fca972e8f4478dbac7b88b579194a76b1c5c49b4 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 05 六月 2024 11:54:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/components/Shift.vue | 10 +++++++---
src/views/mdc/output-statistics.vue | 6 +++---
src/views/mdc/MYTree.vue | 13 +++++++------
src/views/console/base/CalenderTab.vue | 4 ++--
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue
index ddb9e40..73ac210 100644
--- a/src/views/console/base/CalenderTab.vue
+++ b/src/views/console/base/CalenderTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-04 22:45:43
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-05 21:20:22
+ * @LastEditTime: 2024-06-04 21:07:22
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -168,7 +168,7 @@
dates: data.calendarDayVOList.filter(item => {
console.log(moment(item).month(), '>>>123')
return moment(item.calendarDate).month() === i
- }),
+ }).map(v => v.calendarDate),
}
]
})
diff --git a/src/views/mdc/MYTree.vue b/src/views/mdc/MYTree.vue
index 4e70583..1713833 100644
--- a/src/views/mdc/MYTree.vue
+++ b/src/views/mdc/MYTree.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 19:53:35
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-26 15:49:11
+ * @LastEditTime: 2024-06-04 21:33:08
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/MYTree.vue
-->
<template>
@@ -37,7 +37,7 @@
defalutProps: {
label: 'title',
children: 'children',
- disabled: 'disabled',
+ disabled: this.showCheckbox ? '' : 'disabled',
class: (data, node) => {
return this.value.includes(data.id) ? 'active' : ''
},
@@ -61,13 +61,13 @@
this.getList()
},
methods: {
- renderContent(h, { data,node }) {
+ renderContent(h, { data, node }) {
let img = data.groupTag == 'fms_beltline'
return h('a', {
class: {
- disabled: this.props.disabled ? this.props.disabled(data,node) : data.disabled
+ disabled: this.props.disabled ? this.props.disabled(data, node) : data.disabled
},
- disabled: this.props.disabled ? this.props.disabled(data,node) : data.disabled
+ disabled: this.props.disabled ? this.props.disabled(data, node) : data.disabled
},
img ? h('img', {
src: pmsPng
@@ -139,9 +139,10 @@
</script>
<style lang="scss">
-.active .el-tree-node__content {
+.is-current .el-tree-node__content {
background: var(--el-color-primary) !important;
}
+
a.disabled {
color: #ccc;
}
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 326fbaf..692a0eb 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-20 21:05:43
+ * @LastEditTime: 2024-06-04 21:40:52
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -66,6 +66,10 @@
default() {
return {}
},
+ },
+ datasetNum: {
+ type: Number,
+ default: 100
}
},
components: {
@@ -122,7 +126,7 @@
...data
}).then(res => {
if (res.code === 200) {
- this.btnList = res.data
+ this.btnList = res.data.reverse()
this.btnListActive = res?.data?.[0]?.id
}
})
@@ -143,7 +147,7 @@
}
option2.dataset.source = [['product', '鐝1', '鐝2']]
res.data.items.records.forEach(v => {
- option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * 100, v.data[2] === '-' ? 0 : v.data[2] * 100])
+ option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * this.datasetNum, v.data[2] === '-' ? 0 : v.data[2] * this.datasetNum])
});
this.option2 = option2
console.log(option2)
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index c171885..0c19a39 100644
--- a/src/views/mdc/output-statistics.vue
+++ b/src/views/mdc/output-statistics.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-05-20 21:04:40
+ * @LastEditTime: 2024-06-04 21:23:21
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/output-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -34,8 +34,8 @@
<el-main>
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <Shift :options="chartOption" colname="浜ч噺" url="/api/blade-mdc/output" ref="shift"
- v-if="activeName == 'shift'">
+ <Shift :options="chartOption" :datasetNum="1" colname="浜ч噺" url="/api/blade-mdc/output"
+ ref="shift" v-if="activeName == 'shift'">
</Shift>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
--
Gitblit v1.9.3