From f7cc97f27910c7d570f07df5d0dbd29d3f06049c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期六, 12 十月 2024 15:14:27 +0800
Subject: [PATCH] 1、调整导航栏为侧边模式时的项目标题 2、调整页面顶部栏颜色 3、解决设备报警页面由于缩放引起的组件遮挡文字问题 4、总控车间看板右侧图表调整为自动轮播 5、分控车间看板每日生产计划仅展示3项，完整表格在右上角查看更多中查看
---
src/views/mdc/base/SubControlWorkshopSignage.vue | 68 +++-
src/components/tools/Logo.vue | 2
src/views/mdc/base/modules/EquipmentAlarmNumberRetrieval/EquipmentAlarmNumberRetrievalList.vue | 5
src/components/page/GlobalHeader.vue | 43 +++
src/views/mdc/base/MasterControlWorkshopSignage.vue | 392 ++++++++++++++++-------------
src/views/mdc/base/modules/SubControlWorkshopSignage/SignageModal.vue | 210 ++++++++++++++++
src/components/page/GlobalLayout.vue | 3
src/views/mdc/base/modules/EquipmentAlarmSort/EquipmentAlarmSortList.vue | 5
src/views/mdc/base/modules/EquipmentAlarmRetrieval/EquipmentAlarmRetrievalList.vue | 7
9 files changed, 533 insertions(+), 202 deletions(-)
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index d4224a6..58c201e 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -17,7 +17,7 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/>
- <span v-if="device === 'desktop'">娆㈣繋杩涘叆 Jeecg-Boot 浼佷笟绾т綆浠ｇ爜骞冲彴</span>
+ <span v-if="device === 'desktop'">涓浗涓�鎷栭泦鍥㈡湁闄愬叕鍙�</span>
<span v-else>Jeecg-Boot</span>
<user-menu :theme="theme"/>
@@ -59,7 +59,7 @@
components: {
UserMenu,
SMenu,
- Logo,
+ Logo
},
mixins: [mixin],
props: {
@@ -98,7 +98,7 @@
headerIndexRight: {},
topSmenuStyle: {}
},
- chatStatus: '',
+ chatStatus: ''
}
},
watch: {
@@ -163,7 +163,7 @@
// update-begin-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
handleUpdateMenuTitle(value) {
this.$emit('updateMenuTitle', value)
- },
+ }
// update-end-author:sunjianlei date:20210508 for: 淇鍔ㄦ�佸姛鑳芥祴璇曡彍鍗曘�佸甫鍙傛暟鑿滃崟鏍囬閿欒銆佸睍寮�閿欒鐨勯棶棰�
}
@@ -223,5 +223,40 @@
}
/* update_end author:scott date:20190220 for: 缂╁皬棣栭〉甯冨眬椤堕儴鐨勯珮搴�*/
+ /deep/ .ant-menu {
+ background-color: #E74C3C;
+ color: #fff;
+ .ant-menu-submenu {
+ color: #fff;
+ }
+ .ant-menu-submenu:hover {
+ }
+ .ant-menu-submenu-title:hover {
+ color: #fff;
+ /*background-color: #F65B4B !important;*/
+ }
+ .ant-menu-submenu-open {
+ /*background-color: #F65B4B !important;*/
+ }
+ .ant-menu-submenu-selected {
+ color: #fff !important;
+ /*background-color: #F65B4B !important;*/
+ }
+ .ant-menu-item {
+ a {
+ color: #fff;
+ &:hover {
+ color: #fff;
+ }
+ }
+ &.ant-menu-item-active {
+ /*background-color: #F65B4B;*/
+ }
+
+ &.ant-menu-item-selected {
+ /*background-color: #F65B4B;*/
+ }
+ }
+ }
</style>
\ No newline at end of file
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 842d256..22dd22b 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -451,6 +451,7 @@
padding: 0 20px 0 0;
display: flex;
height: 59px;
+ color: #fff;
.ant-menu.ant-menu-horizontal {
border: none;
@@ -498,7 +499,7 @@
}
&.light {
- background-color: #fff;
+ background-color: #E74C3C;
.header-index-wide {
.header-index-left {
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index 2fe9c07..c5f8e93 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -7,7 +7,7 @@
<img v-else src="~@/assets/logo-yt.jpg" alt="logo">
<!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo棰滆壊鏍规嵁涓婚棰滆壊鍙樺寲 -->
- <h1 v-if="showTitle">{{ title }}</h1>
+ <h1 v-if="showTitle" style="color: #fff">{{ title }}</h1>
</router-link>
</div>
</template>
diff --git a/src/views/mdc/base/MasterControlWorkshopSignage.vue b/src/views/mdc/base/MasterControlWorkshopSignage.vue
index 8ee1d78..69ef55e 100644
--- a/src/views/mdc/base/MasterControlWorkshopSignage.vue
+++ b/src/views/mdc/base/MasterControlWorkshopSignage.vue
@@ -136,6 +136,8 @@
rightColChart2: '',
rightColChart3: '',
rightColChart2And3Data: '',
+ rightColChart2CarouselTime: null,
+ rightColChart3CarouselTime: null,
rightColChart4: '',
rightColChart4Data: '',
rightColChart4CarouselTime: null
@@ -149,6 +151,8 @@
},
beforeDestroy() {
window.removeEventListener('resize', this.handleWindowResize)
+ if (this.rightColChart2CarouselTime) clearInterval(this.rightColChart2CarouselTime)
+ if (this.rightColChart3CarouselTime) clearInterval(this.rightColChart3CarouselTime)
if (this.rightColChart4CarouselTime) clearInterval(this.rightColChart4CarouselTime)
},
methods: {
@@ -1250,6 +1254,95 @@
]
const xAxisData = []
const seriesData = []
+ const colorList = [
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+
+ { offset: 0, color: '#4A7DBD' },
+ { offset: 1, color: '#31557B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#BD4D4A' },
+ { offset: 1, color: '#7B3031' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#94AF52' },
+ { offset: 1, color: '#637A39' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#7B61A4' },
+ { offset: 1, color: '#52416B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#4AAAC6' },
+ { offset: 1, color: '#29697B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#F79642' },
+ { offset: 1, color: '#9C5D29' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+
+ { offset: 0, color: '#4A7DBD' },
+ { offset: 1, color: '#31557B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#BD4D4A' },
+ { offset: 1, color: '#7B3031' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#94AF52' },
+ { offset: 1, color: '#637A39' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#7B61A4' },
+ { offset: 1, color: '#52416B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#4AAAC6' },
+ { offset: 1, color: '#29697B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#F79642' },
+ { offset: 1, color: '#9C5D29' }
+ ]
+ )
+ ]
+
this.rightColChart2And3Data.forEach(item => {
xAxisData.push(item.equipmentName == null ? '' : item.equipmentName)
seriesData.push({ value: item.openRate })
@@ -1289,6 +1382,7 @@
color: '#fff',
// rotate: 45,
margin: 15,
+ interval: 0,
fontSize: '55%',
formatter(value) {
const data = xAxisData
@@ -1347,94 +1441,6 @@
itemStyle: {
barBorderRadius: '',
color: function(params) {
- const colorList = [
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
-
- { offset: 0, color: '#4A7DBD' },
- { offset: 1, color: '#31557B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#BD4D4A' },
- { offset: 1, color: '#7B3031' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#94AF52' },
- { offset: 1, color: '#637A39' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#7B61A4' },
- { offset: 1, color: '#52416B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#4AAAC6' },
- { offset: 1, color: '#29697B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#F79642' },
- { offset: 1, color: '#9C5D29' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
-
- { offset: 0, color: '#4A7DBD' },
- { offset: 1, color: '#31557B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#BD4D4A' },
- { offset: 1, color: '#7B3031' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#94AF52' },
- { offset: 1, color: '#637A39' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#7B61A4' },
- { offset: 1, color: '#52416B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#4AAAC6' },
- { offset: 1, color: '#29697B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#F79642' },
- { offset: 1, color: '#9C5D29' }
- ]
- )
- ]
return colorList[params.dataIndex]
// build a color map as your need.
@@ -1447,11 +1453,27 @@
}
}
}
+ ],
+ dataZoom: [
+ {
+ show: false,
+ startValue: 0, // 浠庡ご寮�濮嬨��
+ endValue: 9 // 涓�娆℃�у睍绀哄嚑涓�
+ }
]
}
option.xAxis.data = xAxisData
option.series[0].data = seriesData
this.rightColChart2.setOption(option, true)
+
+ this.rightColChart2CarouselTime = setInterval(() => {
+ xAxisData.push(xAxisData.shift())
+ seriesData.push(seriesData.shift())
+ colorList.push(colorList.shift())
+ this.$nextTick(() => {
+ this.rightColChart2.setOption(option, true)
+ })
+ }, 3000)
},
/* 缁樺埗鍙充晶绗笁涓浘琛� */
@@ -1530,6 +1552,94 @@
]
const xAxisData = []
const seriesData = []
+ const colorList = [
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+
+ { offset: 0, color: '#4A7DBD' },
+ { offset: 1, color: '#31557B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#BD4D4A' },
+ { offset: 1, color: '#7B3031' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#94AF52' },
+ { offset: 1, color: '#637A39' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#7B61A4' },
+ { offset: 1, color: '#52416B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#4AAAC6' },
+ { offset: 1, color: '#29697B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#F79642' },
+ { offset: 1, color: '#9C5D29' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+
+ { offset: 0, color: '#4A7DBD' },
+ { offset: 1, color: '#31557B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#BD4D4A' },
+ { offset: 1, color: '#7B3031' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#94AF52' },
+ { offset: 1, color: '#637A39' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#7B61A4' },
+ { offset: 1, color: '#52416B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#4AAAC6' },
+ { offset: 1, color: '#29697B' }
+ ]
+ ),
+ new echarts.graphic.LinearGradient(
+ 0, 0, 1, 0,
+ [
+ { offset: 0, color: '#F79642' },
+ { offset: 1, color: '#9C5D29' }
+ ]
+ )
+ ]
this.rightColChart2And3Data.forEach(item => {
xAxisData.push(item.equipmentName == null ? '' : item.equipmentName)
seriesData.push({ value: item.utilizationRate })
@@ -1568,6 +1678,7 @@
axisLabel: {
color: '#fff',
// rotate: 45,
+ interval: 0,
margin: 15,
fontSize: '55%',
formatter(value) {
@@ -1603,7 +1714,6 @@
show: false
}
},
-
series: [
{
name: '鍒╃敤鐜�',
@@ -1628,94 +1738,6 @@
itemStyle: {
barBorderRadius: '',
color: function(params) {
- const colorList = [
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
-
- { offset: 0, color: '#4A7DBD' },
- { offset: 1, color: '#31557B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#BD4D4A' },
- { offset: 1, color: '#7B3031' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#94AF52' },
- { offset: 1, color: '#637A39' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#7B61A4' },
- { offset: 1, color: '#52416B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#4AAAC6' },
- { offset: 1, color: '#29697B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#F79642' },
- { offset: 1, color: '#9C5D29' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
-
- { offset: 0, color: '#4A7DBD' },
- { offset: 1, color: '#31557B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#BD4D4A' },
- { offset: 1, color: '#7B3031' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#94AF52' },
- { offset: 1, color: '#637A39' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#7B61A4' },
- { offset: 1, color: '#52416B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#4AAAC6' },
- { offset: 1, color: '#29697B' }
- ]
- ),
- new echarts.graphic.LinearGradient(
- 0, 0, 1, 0,
- [
- { offset: 0, color: '#F79642' },
- { offset: 1, color: '#9C5D29' }
- ]
- )
- ]
return colorList[params.dataIndex]
// build a color map as your need.
@@ -1728,11 +1750,27 @@
}
}
}
+ ],
+ dataZoom: [
+ {
+ show: false,
+ startValue: 0, // 浠庡ご寮�濮嬨��
+ endValue: 9 // 涓�娆℃�у睍绀哄嚑涓�
+ }
]
}
option.xAxis.data = xAxisData
option.series[0].data = seriesData
this.rightColChart3.setOption(option, true)
+
+ this.rightColChart3CarouselTime = setInterval(() => {
+ xAxisData.push(xAxisData.shift())
+ seriesData.push(seriesData.shift())
+ colorList.push(colorList.shift())
+ this.$nextTick(() => {
+ this.rightColChart3.setOption(option, true)
+ })
+ }, 3000)
},
/* 缁樺埗鍙充晶绗洓涓浘琛� */
diff --git a/src/views/mdc/base/SubControlWorkshopSignage.vue b/src/views/mdc/base/SubControlWorkshopSignage.vue
index abad12b..9d66565 100644
--- a/src/views/mdc/base/SubControlWorkshopSignage.vue
+++ b/src/views/mdc/base/SubControlWorkshopSignage.vue
@@ -6,6 +6,10 @@
<div>{{currentProductionInfo.productionName}}</div>
</div>
+ <div class="load-more">
+ <div @click="modalVisible=true">鐐瑰嚮鏌ョ湅鏇村>></div>
+ </div>
+
<table class="plan-table">
<thead>
<tr style="position: relative">
@@ -36,22 +40,24 @@
<tbody>
<tr v-for="(item,index) in todayProductionPlanList" :key="index">
- <td colspan="2">{{item.equipmentId}}</td>
- <td colspan="2">{{item.equipmentName}}</td>
- <a-tooltip :destroyTooltipOnHide="true" placement="topRight" @mouseenter="mouseEnterItem">
- <template slot="title">
- <span style="font-size: 1vw">{{item.productNo}}</span>
- </template>
- <td colspan="2">{{item.productNo}}</td>
- </a-tooltip>
- <td colspan="2">{{item.productName}}</td>
- <td>{{item.planCount}}</td>
- <td>{{item.completionCount}}</td>
- <td>{{item.qualifiedCount}}</td>
- <td>{{item.passRate+'%'}}</td>
- <td colspan="2">{{item.processRoute}}</td>
- <td colspan="2">{{item.orderId}}</td>
- <td>{{item.clazz}}</td>
+ <template v-if="index<3">
+ <td colspan="2">{{item.equipmentId}}</td>
+ <td colspan="2">{{item.equipmentName}}</td>
+ <a-tooltip :destroyTooltipOnHide="true" placement="topRight" @mouseenter="mouseEnterItem">
+ <template slot="title">
+ <span style="font-size: 1vw">{{item.productNo}}</span>
+ </template>
+ <td colspan="2">{{item.productNo}}</td>
+ </a-tooltip>
+ <td colspan="2">{{item.productName}}</td>
+ <td>{{item.planCount}}</td>
+ <td>{{item.completionCount}}</td>
+ <td>{{item.qualifiedCount}}</td>
+ <td>{{item.passRate+'%'}}</td>
+ <td colspan="2">{{item.processRoute}}</td>
+ <td colspan="2">{{item.orderId}}</td>
+ <td>{{item.clazz}}</td>
+ </template>
</tr>
</tbody>
</table>
@@ -121,16 +127,20 @@
</div>
</div>
</div>
+
+ <SignageModal :todayProductionPlanList="todayProductionPlanList" :modalVisible="modalVisible"
+ @closeModal="modalVisible=false"/>
</div>
</template>
<script>
import moment from 'moment'
import api from '@/api/mdc'
+ import SignageModal from './modules/SubControlWorkshopSignage/SignageModal'
export default {
name: 'SubControlWorkshopSignage',
- components: {},
+ components: { SignageModal },
data() {
return {
currentProductionInfo: {
@@ -352,7 +362,8 @@
brandList: [],
lifeList: []
},
- maxBrandToolLifeListLength: null
+ maxBrandToolLifeListLength: null,
+ modalVisible: false
}
},
created() {
@@ -384,12 +395,18 @@
if (res.success) this.todayProductionPlanList = res.result
})
},
+
+ clickToLoadMore() {
+
+ },
+
getEquipmentStatusByApi() {
api.getEquipmentStatusApi(this.currentProductionInfo.productionId)
.then(res => {
if (res.success) this.equipmentStatusList = res.result
})
},
+
getToolLifeListByApi() {
api.getToolLifeListApi(this.currentProductionInfo.productionId)
.then(res => {
@@ -414,6 +431,7 @@
}
})
},
+
getToolCurrentLifeDataBgColor(record) {
if (record.currentLife / record.ratedLife > 0.8) {
return '#FF9A10'
@@ -462,6 +480,20 @@
font-size: 2.5vw;
}
+ .load-more {
+ display: flex;
+ justify-content: flex-end;
+ -webkit-justify-content: flex-end;
+ font-size: 1vw;
+
+ div {
+ background-color: #83BF31;
+ margin: 0 0.5% 0.5% 0;
+ padding: 0 0.3%;
+ cursor: pointer;
+ }
+ }
+
table {
td {
border: 0.1vw solid #fff;
diff --git a/src/views/mdc/base/modules/EquipmentAlarmNumberRetrieval/EquipmentAlarmNumberRetrievalList.vue b/src/views/mdc/base/modules/EquipmentAlarmNumberRetrieval/EquipmentAlarmNumberRetrievalList.vue
index 63adbf4..5b9cc63 100644
--- a/src/views/mdc/base/modules/EquipmentAlarmNumberRetrieval/EquipmentAlarmNumberRetrievalList.vue
+++ b/src/views/mdc/base/modules/EquipmentAlarmNumberRetrieval/EquipmentAlarmNumberRetrievalList.vue
@@ -269,4 +269,9 @@
.ant-table-striped /deep/ .table-striped td {
background-color: #fafafa;
}
+
+ /deep/ .ant-col .ant-form-item-control-wrapper .ant-form-item-control .ant-form-item-children .ant-calendar-picker {
+ width: 100%;
+ min-width: 0 !important;
+ }
</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/EquipmentAlarmRetrieval/EquipmentAlarmRetrievalList.vue b/src/views/mdc/base/modules/EquipmentAlarmRetrieval/EquipmentAlarmRetrievalList.vue
index d81d3ac..6b77464 100644
--- a/src/views/mdc/base/modules/EquipmentAlarmRetrieval/EquipmentAlarmRetrievalList.vue
+++ b/src/views/mdc/base/modules/EquipmentAlarmRetrieval/EquipmentAlarmRetrievalList.vue
@@ -208,7 +208,7 @@
} else {
this.$notification.warning({
message: '娑堟伅',
- description:res.message
+ description: res.message
})
}
}).finally(() => {
@@ -264,4 +264,9 @@
.ant-table-striped /deep/ .table-striped td {
background-color: #fafafa;
}
+
+ /deep/ .ant-col .ant-form-item-control-wrapper .ant-form-item-control .ant-form-item-children .ant-calendar-picker {
+ width: 100%;
+ min-width: 0 !important;
+ }
</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/EquipmentAlarmSort/EquipmentAlarmSortList.vue b/src/views/mdc/base/modules/EquipmentAlarmSort/EquipmentAlarmSortList.vue
index 826aecc..d6a2490 100644
--- a/src/views/mdc/base/modules/EquipmentAlarmSort/EquipmentAlarmSortList.vue
+++ b/src/views/mdc/base/modules/EquipmentAlarmSort/EquipmentAlarmSortList.vue
@@ -266,4 +266,9 @@
.ant-table-striped /deep/ .table-striped td {
background-color: #fafafa;
}
+
+ /deep/ .ant-col .ant-form-item-control-wrapper .ant-form-item-control .ant-form-item-children .ant-calendar-picker {
+ width: 100%;
+ min-width: 0 !important;
+ }
</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/SubControlWorkshopSignage/SignageModal.vue b/src/views/mdc/base/modules/SubControlWorkshopSignage/SignageModal.vue
new file mode 100644
index 0000000..647e42c
--- /dev/null
+++ b/src/views/mdc/base/modules/SubControlWorkshopSignage/SignageModal.vue
@@ -0,0 +1,210 @@
+<template>
+ <a-modal title="褰撴棩鐢熶骇璁″垝" :width="modalWidth" :visible="modalVisible" :footer="null" @cancel="$emit('closeModal')">
+ <a-table :columns="modalTableColumns" :dataSource="todayProductionPlanList" :pagination="false" :loading="loading" rowKey="equipmentId"></a-table>
+ </a-modal>
+</template>
+
+<script>
+ export default {
+ name: 'SignageModal',
+ components: {},
+ props: {
+ modalWidth: {
+ type: Number,
+ default: 1448
+ },
+ todayProductionPlanList: {
+ type: Object
+ },
+ modalVisible: {
+ type: Boolean
+ }
+ },
+ data() {
+ return {
+ dataSource: [],
+ modalTableColumns: [
+ // {
+ // title: '#',
+ // dataIndex: '',
+ // key: 'rowIndex',
+ // width: 60,
+ // align: 'center',
+ // customRender: function(t, r, index) {
+ // return parseInt(index) + 1
+ // }
+ // },
+ {
+ width: 100,
+ align: 'center',
+ title: '鏈哄簥ID',
+ dataIndex: 'equipmentId',
+ key: 'equipmentId'
+ },
+ {
+ width: 100,
+ align: 'center',
+ title: '鏈哄簥鍚嶇О',
+ dataIndex: 'equipmentName',
+ key: 'equipmentName'
+ },
+ {
+ width: 160,
+ align: 'center',
+ title: '闆朵欢鍙�',
+ dataIndex: 'productNo',
+ key: 'productNo'
+ },
+ {
+ width: 100,
+ align: 'center',
+ title: '闆朵欢鍚嶇О',
+ key: 'productName',
+ dataIndex: 'productName'
+ },
+ {
+ width: 75,
+ align: 'center',
+ title: '璁″垝閲�',
+ key: 'planCount',
+ dataIndex: 'planCount'
+ },
+ {
+ width: 75,
+ align: 'center',
+ title: '瀹屾垚閲�',
+ key: 'completionCount',
+ dataIndex: 'completionCount'
+ },
+ {
+ width: 75,
+ align: 'center',
+ title: '鍚堟牸閲�',
+ key: 'qualifiedCount',
+ dataIndex: 'qualifiedCount'
+ },
+ {
+ width: 75,
+ align: 'center',
+ title: '鍚堟牸鐜�',
+ key: 'passRate',
+ dataIndex: 'passRate'
+ },
+ {
+ width: 100,
+ align: 'center',
+ title: '宸ュ簭鍙�',
+ key: 'processRoute',
+ dataIndex: 'processRoute'
+ },
+ {
+ width: 120,
+ align: 'center',
+ title: '宸ュ崟鍙�',
+ key: 'orderId',
+ dataIndex: 'orderId'
+ },
+ {
+ width: 100,
+ align: 'center',
+ title: '鐝粍',
+ key: 'clazz',
+ dataIndex: 'clazz'
+ }
+ ]
+ }
+ },
+ methods: {}
+ }
+</script>
+
+<style scoped>
+ /deep/ .ant-modal-content {
+ background-color: #000;
+ }
+
+ /deep/ .ant-modal-header {
+ background-color: #000;
+ }
+
+ /deep/ .ant-modal-title {
+ color: #fff;
+ }
+
+ /deep/ .ant-modal-close {
+ color: #fff;
+ }
+
+ /deep/ .ant-input {
+ color: #fff;
+ background-color: #000;
+ }
+
+ /deep/ .ant-form-item-label label {
+ color: #fff;
+ }
+
+ /deep/ .ant-table-thead th {
+ background-color: #5C5C5C;
+ color: #fff;
+ }
+
+ /deep/ .ant-table-tbody td {
+ background-color: #262626;
+ color: #fff;
+ }
+
+ /deep/ .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td {
+ background: #7E7E7E;
+ }
+
+ /deep/ .ant-table-placeholder {
+ background-color: #000;
+ }
+
+ /deep/ .ant-table-placeholder .ant-empty-description {
+ color: #fff;
+ }
+
+ /deep/ .ant-pagination-item a {
+ background-color: #000;
+ color: #fff;
+ }
+
+ /deep/ .ant-pagination-item-link {
+ background-color: #000;
+ color: #fff;
+ }
+
+ /deep/ .ant-pagination-item-link:hover {
+ color: #1890FF;
+ border-color: #1890FF;
+ }
+
+ /deep/ .ant-pagination-item-active {
+ background-color: #000;
+ }
+
+ /deep/ .ant-select-selection--single {
+ background-color: #000;
+ color: #fff;
+ }
+
+ /deep/ .ant-pagination-options-quick-jumper {
+ color: #fff;
+ }
+
+ /deep/ .ant-pagination-options-quick-jumper input {
+ background-color: #000;
+ color: #fff;
+ }
+
+ /deep/ .ant-select-dropdown-menu-item {
+ background-color: #000;
+ color: #fff;
+ }
+
+ /deep/ .ant-select-dropdown-menu-item:hover:not(.ant-select-dropdown-menu-item-disabled) {
+ background-color: #1890FF;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.3