From 852e0f0918dc58b616cc81702efbfde3940866bb Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 14:50:43 +0800
Subject: [PATCH] 增加生产分支
---
src/views/dry/dataDefine/DryEquipment.data.ts | 2
src/views/dashboard/control/index.vue | 3
src/views/sys/login/TokenLoginPage.vue | 2
src/views/dry/bigScreen/BigWorkShop2.vue | 4
src/views/dry/bigScreen/BigWorkShop.vue | 22 ++--
src/layouts/default/header/index.vue | 2
src/views/dry/bigScreen/BigWorkShop1.vue | 2
.env.production | 2
src/views/dry/dataDefine/DryEqpType.data.ts | 54 ++++++++++
src/views/system/loginmini/MiniLogin.vue | 2
src/views/dry/dataDefine/DryOrder.data.ts | 20 +++-
src/views/dry/bigScreen/BigEqp.vue | 137 ++++++++++++++-------------
src/views/dry/monitor/Eqp.vue | 2
13 files changed, 163 insertions(+), 91 deletions(-)
diff --git a/.env.production b/.env.production
index be4611d..4e0c2bf 100644
--- a/.env.production
+++ b/.env.production
@@ -19,7 +19,7 @@
VITE_GLOB_API_URL=/herb
#鍚庡彴鎺ュ彛鍏ㄨ矾寰勫湴鍧�(蹇呭～)
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-gateway:9999
+VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8800/herb/
# 鎺ュ彛鐖惰矾寰勫墠缂�
VITE_GLOB_API_URL_PREFIX=
diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue
index 4fb6c62..de8ea79 100644
--- a/src/layouts/default/header/index.vue
+++ b/src/layouts/default/header/index.vue
@@ -11,7 +11,7 @@
/>
<LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
<!-- 娆㈣繋璇� -->
- <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 娆㈣繋杩涘叆 {{ '鏅鸿兘涓嵂骞茬嚗鏈烘暟瀛楀寲杞﹂棿' }} </span>
+ <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 娆㈣繋杩涘叆 {{ '涓嵂杞﹂棿鏅鸿兘鐢熶骇绠＄悊绯荤粺' }} </span>
</div>
<!-- left end -->
diff --git a/src/views/dashboard/control/index.vue b/src/views/dashboard/control/index.vue
index f376325..9cda79a 100644
--- a/src/views/dashboard/control/index.vue
+++ b/src/views/dashboard/control/index.vue
@@ -333,7 +333,8 @@
function clickButton(cmd, msg) {
console.log("target::::",cmd);
- var params = { msg: msg, code: cmd, tenantId: 1003, machineId: "GM001" };
+ let tenantId = userStore.getTenant;
+ var params = { msg: msg, code: cmd, tenantId: tenantId, machineId: "GM001" };
sendCommand(params).then(res => {
if (res.success) {
addLog("鍝嶅簲", res.message);
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index 6c53024..1b22771 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -29,21 +29,21 @@
<div class="formulaItem">
<Icon style="color: powderblue" icon="la:box" :size="38" />
<div>
- <div class="mainInfo2">{{ realData?.feed }} 绛�</div>
+ <div class="mainInfo2">{{ realData?.feed || 0 }} 绛�</div>
<div class="subhead2">鎶曟枡閲�</div>
</div>
</div>
<div class="formulaItem">
<Icon style="color: red" icon="bx:wind" :size="35" />
<div>
- <div class="mainInfo2">{{ realData?.windTemp }} 掳C</div>
+ <div class="mainInfo2">{{ realData?.windTemp || 0 }} 掳C</div>
<div class="subhead2">鐑</div>
</div>
</div>
<div class="formulaItem">
<Icon style="color: green" icon="tabler:target-arrow" :size="35" />
<div>
- <div class="mainInfo2">{{ realData?.target }} %</div>
+ <div class="mainInfo2">{{ realData?.target || 0 }} %</div>
<div class="subhead2">鐩爣</div>
</div>
</div>
@@ -65,7 +65,7 @@
<div class="center" style="height: 50%">
<div class="centerText">
<div class="mainInfo3"
- ><span>{{ realData?.target }}</span> %
+ ><span>{{ realData?.target || 0 }}</span> %
</div>
<div class="subhead2">鐩爣鍚按鐜�</div>
</div>
@@ -73,7 +73,7 @@
<div class="center" style="height: 50%">
<div>
<div class="mainInfo3"
- ><span>{{ realData?.initial }}</span> %</div
+ ><span>{{ realData?.initial || 0 }}</span> %</div
>
<div class="subhead2">鏉ユ枡鍚按鐜�</div>
</div>
@@ -205,8 +205,8 @@
<div class="chartTittle">
骞茬嚗鏁堢巼(kg/h)
<div class="rightLabel">
- <div class="label good">>{{ standard.xiaolv }} 浼� </div>
- <div class="label bad"><{{ standard.xlMin }} 宸�</div>
+ <div class="label good">>{{ eqp.dryEfficiency }} 浼� </div>
+ <div class="label bad"><{{ eqp.dryEfficiency * 0.9.toFixed(2) }} 宸�</div>
</div>
</div>
<div class="outDiv" style="padding-top: 20px">
@@ -228,7 +228,7 @@
</div>
<div class="rightChart center">
<div class="center compareBar">
- <div class="barTop">{{ standard.xiaolv }}</div>
+ <div class="barTop">{{ eqp.dryEfficiency }}</div>
<div class="barBack">
<div class="barDiv" :style="{ height: realData?.xlsHeight }"></div>
</div>
@@ -239,7 +239,7 @@
</div>
</div>
<div class="center compareBar">
- <div class="barTop">{{ realData?.xiaolv | 0 }}</div>
+ <div class="barTop">{{ realData?.xiaolv || 0 }}</div>
<div class="barBack">
<div
class="barDiv"
@@ -262,8 +262,8 @@
<div class="chartTittle"
>钂告苯娑堣��(m鲁/kg)
<div class="rightLabel">
- <div class="label bad">>{{ standard.zhengqi }} 宸�</div>
- <div class="label good"><{{ standard.zqMin }} 浼�</div>
+ <div class="label bad">>{{ eqp.steamConsumption }} 宸�</div>
+ <div class="label good"><{{ eqp.steamConsumption * 0.9.toFixed(2) }} 浼�</div>
</div>
</div>
<div class="outDiv" style="padding-top: 20px">
@@ -279,7 +279,7 @@
</div>
<div class="rightChart center">
<div class="center compareBar">
- <div class="barTop">{{ standard.zhengqi }}</div>
+ <div class="barTop">{{ eqp.steamConsumption }}</div>
<div class="barBack">
<div class="barDiv" :style="{ height: realData?.zqsHeight }"></div>
</div>
@@ -290,7 +290,7 @@
</div>
</div>
<div class="center compareBar">
- <div class="barTop">{{ realData?.zhengqi | 0 }}</div>
+ <div class="barTop">{{ realData?.zhengqi || 0 }}</div>
<div class="barBack">
<div
class="barDiv"
@@ -318,8 +318,8 @@
<div class="chartTittle">
<div> 鐢佃兘娑堣��(kWh/kg)</div>
<div class="rightLabel">
- <div class="label bad">>{{ standard.dian }} 宸�</div>
- <div class="label good"><{{ standard.dMin }} 浼�</div>
+ <div class="label bad">>{{ eqp.powerConsumption }} 宸�</div>
+ <div class="label good"><{{ eqp.powerConsumption * 0.9.toFixed(2) }} 浼�</div>
</div>
</div>
<div class="outDiv" style="padding-top: 20px">
@@ -335,7 +335,7 @@
</div>
<div class="rightChart center">
<div class="center compareBar">
- <div class="barTop">{{ standard.dian }}</div>
+ <div class="barTop">{{ eqp.powerConsumption }}</div>
<div class="barBack">
<div class="barDiv" :style="{ height: realData?.dnsHeight }"></div>
</div>
@@ -346,7 +346,7 @@
</div>
</div>
<div class="center compareBar">
- <div class="barTop">{{ realData?.dian | 0 }}</div>
+ <div class="barTop">{{ realData?.dian || 0 }}</div>
<div class="barBack">
<div
class="barDiv"
@@ -384,6 +384,7 @@
import { queryById, listAll } from '../api/DryEquipment.api'
import { dryEquipment } from '../dataDefine/DryEquipment.data'
import { useUserStore } from '/@/store/modules/user'
+ import { getTenantId, getToken } from '/@/utils/auth'
const domRef = ref<Nullable<HTMLElement>>(null)
const { enter, toggle, exit, isFullscreen } = useFullscreen()
@@ -634,8 +635,7 @@
smooth: true,
symbol: 'none',
data: [
- [1, 1],
- [2, 2],
+
],
lineStyle: {
width: 1,
@@ -663,8 +663,7 @@
smooth: true,
symbol: 'none',
data: [
- [1, 10],
- [2, 20],
+
],
lineStyle: {
width: 1,
@@ -715,7 +714,7 @@
amplitude: 3,
animationDuration: 5,
//animationDurationUpdate: 0,
- data: [0.56, 0.44, 0.32],
+ data: [0, 0, 0],
shape:
'path://M828.817,706.209C828.817,881.725,686.98,1024,512,1024c-174.98,0-316.817-142.275-316.817-317.791C195.183,530.74,512,0,512,0s316.817,530.74,316.817,706.209z',
outline: {
@@ -806,7 +805,7 @@
},
data: [
{
- value: 20,
+ value: 0,
},
],
},
@@ -844,7 +843,7 @@
},
data: [
{
- value: 20,
+ value: 0,
},
],
},
@@ -1158,7 +1157,7 @@
axisLabel: {
formatter: '{value} 掳C',
},
- // max: standard.value.xiaolv + 3,
+ // max: eqp.value.dryEfficiency + 3,
},
series: [
{
@@ -1169,10 +1168,7 @@
},
// [[15,10], [15,11], [10,6], [7.5,12], [5,12], [2.5,5], [2.5,9], [1,7]]
data: [
- [0, 1],
- [15, 10],
- [45, 11],
- [70, 6],
+
],
markPoint: {
data: [
@@ -1185,7 +1181,7 @@
data: [
{
name: '棰濆畾',
- yAxis: standard.value.xiaolv,
+ yAxis: eqp.value.dryEfficiency,
},
],
label: {
@@ -1230,7 +1226,7 @@
name: '2011',
type: 'bar',
barWidth: 10,
- data: [190, 89, 34, 70, 44, 30],
+ data: [0, 0, 0, 0, 0, 0],
label: {
show: true,
position: 'right',
@@ -1270,6 +1266,9 @@
queryById({ id: router.currentRoute.value.params.id }).then((res) => {
// console.log(`output->res`, res)
eqp.value = res
+ eqp.value.dryEfficiency = res.dryEfficiency
+ eqp.value.steamConsumption = res.steamConsumption
+ eqp.value.powerConsumption = res.powerConsumption
queryRealTime()
setTimeout(initCharts, 500)
})
@@ -1346,7 +1345,7 @@
if (eqp.value) {
eqp.value = eqps.value[eqpNum.value]
// console.log("888",eqp.value);
- let tenantId = 1003
+ let tenantId = getTenantId()
let eqpCode = eqp.value.code
let queryRealTimeUrl = '/dry/real/getRealTimeData'
defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
@@ -1379,7 +1378,7 @@
/**娓╁害鐜舰鍥� */
if (bellowsTempChart) {
bellowsTempChart.setOption({
- series: [{ data: [{ value: res.windTemp }] }, { data: [{ value: res.windTemp }] }],
+ series: [{ data: [{ value: res.trendVo.bellowsTemp }] }, { data: [{ value: res.trendVo.bellowsTemp }] }],
})
}
/**椋庢満棰戠巼鐜舰鍥� */
@@ -1454,7 +1453,7 @@
})
}
- // ganZaoXiaoLv.push([totalTime + res.remain,standard.value.xiaolv])
+ // ganZaoXiaoLv.push([totalTime + res.remain,eqp.value.dryEfficiency])
// console.log(`output->res.remain`, res.remain)
// console.log(`output->res.dryTime`, res.dryTime)
// console.log(`output->totalTime`, totalTime)
@@ -1511,7 +1510,7 @@
data: [
{
name: '棰濆畾',
- yAxis: standard.value.xiaolv,
+ yAxis: eqp.value.dryEfficiency,
},
],
label: {
@@ -1570,66 +1569,74 @@
})
}
+ let lastTrend = res.detailList[res.detailList.length-1]
/**鏁堢巼瀵规瘮鍥� */
- if (res.originWeight - res.yield <= 0) {
- res.xiaolv = standard.value.xiaolv + 6
+ if (res.originWeight - lastTrend.weight <= 0) {
+ res.xiaolv = 0
} else {
- res.xiaolv = (((res.originWeight - res.yield) / res.dryTime) * 60).toFixed(2)
+ res.xiaolv = (((res.originWeight - lastTrend.weight) / lastTrend.totalTime) * 60).toFixed(2)
}
-
- if (res.xiaolv > standard.value.xiaolv) {
+ res.xiaolv = Number(res.xiaolv)
+ eqp.value.dryEfficiency = Number(eqp.value.dryEfficiency)
+ if (res.xiaolv > eqp.value.dryEfficiency) {
+ console.log("xiaolv:",res , eqp);
res.xlgood = true
- res.xlsHeight = (standard.value.xiaolv / res.xiaolv) * 100 + '%'
+ res.xlsHeight = (eqp.value.dryEfficiency / res.xiaolv) * 100 + '%'
res.xlrHeight = '100%'
- } else if (res.xiaolv < standard.value.xlMin) {
+ } else if (res.xiaolv < eqp.value.dryEfficiency * 0.9) {
res.xlbad = true
res.xlsHeight = '100%'
- res.xlrHeight = (res.xiaolv / standard.value.xiaolv) * 100 + '%'
+ res.xlrHeight = (res.xiaolv / eqp.value.dryEfficiency) * 100 + '%'
} else {
res.xlsHeight = '100%'
- res.xlrHeight = (res.xiaolv / standard.value.xiaolv) * 100 + '%'
+ res.xlrHeight = (res.xiaolv / eqp.value.dryEfficiency) * 100 + '%'
}
/** 钂告苯娑堣�� */
- if (res.originWeight - res.yield <= 0) {
- res.zhengqi = standard.value.zhengqi - 3
+ if (res.originWeight - lastTrend.weight <= 0) {
+ res.zhengqi = 0
} else {
- res.zhengqi = (res.steam / (res.originWeight - res.yield)).toFixed(1)
+ res.zhengqi = (lastTrend.steam / (res.originWeight - lastTrend.weight)).toFixed(2)
}
- res.zhengqi = standard.value.zhengqi - 3
- console.log(res);
- console.log('zhengqi:', res.zhengqi);
- if (res.zhengqi > standard.value.zhengqi) {
+ res.zhengqi = Number(res.zhengqi)
+ eqp.value.steamConsumption = Number(eqp.value.steamConsumption)
+ // res.zhengqi = eqp.value.steamConsumption - 3
+ // console.log(res);
+ // console.log('zhengqi:', res.zhengqi);
+ if (res.zhengqi > eqp.value.steamConsumption) {
res.zqbad = true
- res.zqsHeight = (standard.value.zhengqi / res.zhengqi) * 100 + '%'
+ res.zqsHeight = (eqp.value.steamConsumption / res.zhengqi) * 100 + '%'
res.zqrHeight = '100%'
- } else if (res.zhengqi < standard.value.zqMin) {
+ } else if (res.zhengqi < eqp.value.steamConsumption * 0.9) {
res.zqgood = true
res.zqsHeight = '100%'
- res.zqrHeight = (res.zhengqi / standard.value.zhengqi) * 100 + '%'
+ res.zqrHeight = (res.zhengqi / eqp.value.steamConsumption) * 100 + '%'
} else {
res.zqsHeight = '100%'
- res.zqrHeight = (res.zhengqi / standard.value.zhengqi) * 100 + '%'
+ res.zqrHeight = (res.zhengqi / eqp.value.steamConsumption) * 100 + '%'
}
/** 鐢佃兘娑堣�� */
- if (res.originWeight - res.yield <= 0) {
- res.dian = standard.value.dian - 1.5
+ if (res.originWeight - lastTrend.weight <= 0) {
+ res.dian = 0
} else {
- res.dian = (res.watt / (res.originWeight - res.yield)).toFixed(1)
+ res.dian = (lastTrend.watt / (res.originWeight - lastTrend.weight)).toFixed(2)
}
- res.dian = standard.value.dian - 1.5
- if (res.dian > standard.value.dian) {
+ // res.dian = eqp.value.powerConsumption - 1.5
+ res.dian = Number(res.dian)
+ eqp.value.powerConsumption = Number(eqp.value.powerConsumption)
+ if (res.dian > eqp.value.powerConsumption) {
+ console.log("dian::", res.dian,eqp.value.powerConsumption )
res.dnbad = true
- res.dnsHeight = (standard.value.dian / res.dian) * 100 + '%'
+ res.dnsHeight = (eqp.value.powerConsumption / res.dian) * 100 + '%'
res.dnrHeight = '100%'
- } else if (res.dian < standard.value.dMin) {
+ } else if (res.dian < eqp.value.powerConsumption * 0.9) {
res.dngood = true
res.dnsHeight = '100%'
- res.dnrHeight = (res.dian / standard.value.dian) * 100 + '%'
+ res.dnrHeight = (res.dian / eqp.value.powerConsumption) * 100 + '%'
} else {
res.dnsHeight = '100%'
- res.dnrHeight = (res.dian / standard.value.dian) * 100 + '%'
+ res.dnrHeight = (res.dian / eqp.value.powerConsumption) * 100 + '%'
}
//console.log('state:::fan::', res.state_fan, 'roller::', res.state_roller, 'windbox::', res.state_windbox)
@@ -1732,7 +1739,7 @@
}
}
- //console.log(`output->res`, res)
+ // console.log(`output->res`, res.detailList[res.detailList.length-1])
realData.value = res
})
}
diff --git a/src/views/dry/bigScreen/BigWorkShop.vue b/src/views/dry/bigScreen/BigWorkShop.vue
index c7cde21..1ed239e 100644
--- a/src/views/dry/bigScreen/BigWorkShop.vue
+++ b/src/views/dry/bigScreen/BigWorkShop.vue
@@ -34,12 +34,12 @@
<div class="statistics putincolor">
<div class="stat_label font16"> 鎬绘姇鏂欓噺 </div>
<div class="stat_value">
- {{ originWeight.toFixed(2) }}
+ {{ originWeight?.toFixed(2) || 0 }}
<span class="font16"> Kg </span>
</div>
<div class="stat_avg">
<div> 棰勮浜ч噺 </div>
- <div> {{ totalYield.toFixed(2) }} kg </div>
+ <div> {{ totalYield?.toFixed(2) || 0 }} kg </div>
</div>
</div>
</dv-border-box7>
@@ -47,12 +47,12 @@
<div class="statistics putincolor">
<div class="stat_label font16"> 鐢甸噺娑堣�� </div>
<div class="stat_value">
- {{ watt.toFixed(2) }}
+ {{ watt?.toFixed(2) || 0 }}
<span class="font16"> Kwh </span>
</div>
<div class="stat_avg">
<div> 骞冲潎鐢佃�� </div>
- <div> {{wattAvg.toFixed(2)}} Kwh/kg </div>
+ <div> {{wattAvg?.toFixed(2) || 0}} Kwh/kg </div>
</div>
</div>
</dv-border-box7>
@@ -60,12 +60,12 @@
<div class="statistics putincolor">
<div class="stat_label font16"> 钂告苯娑堣�� </div>
<div class="stat_value">
- {{ steam.toFixed(2) }}
+ {{ steam?.toFixed(2) || 0 }}
<span class="font16"> m鲁 </span>
</div>
<div class="stat_avg">
<div> 骞冲潎姹借�� </div>
- <div> {{steamAvg.toFixed(2)}} m鲁/kg </div>
+ <div> {{steamAvg?.toFixed(2) || 0}} m鲁/kg </div>
</div>
</div>
</dv-border-box7>
@@ -155,11 +155,11 @@
<div class="eqp-timer">
<div
><Icon style="color: #1850b7" icon="ic:twotone-water-drop" :size="20" />
- {{ realTime.get(eqpCodes[num - 1])?.trendVo?.moisture.toFixed(1) || '0' }} %
+ {{ realTime.get(eqpCodes[num - 1])?.trendVo?.moisture?.toFixed(1) || '0' }} %
</div>
<div
><Icon style="color: #873853" icon="fluent:temperature-20-regular" :size="20" />
- {{ realTime.get(eqpCodes[num - 1])?.trendVo?.bellowsTemp.toFixed(0) || '0' }} 鈩�
+ {{ realTime.get(eqpCodes[num - 1])?.trendVo?.bellowsTemp?.toFixed(0) || '0' }} 鈩�
</div>
<div
><Icon style="color: rgb(134 207 106)" icon="gg:sand-clock" :size="20" />
@@ -247,11 +247,11 @@
<div class="eqp-timer">
<div
><Icon style="color: #1850b7" icon="ic:twotone-water-drop" :size="20" />
- {{ realTime.get(eqpCodes[num + 3])?.trendVo?.moisture.toFixed(1) || '0' }} %
+ {{ realTime.get(eqpCodes[num + 3])?.trendVo?.moisture?.toFixed(1) || '0' }} %
</div>
<div
><Icon style="color: #873853" icon="fluent:temperature-20-regular" :size="20" />
- {{ realTime.get(eqpCodes[num + 3])?.trendVo?.bellowsTemp.toFixed(0) || '0' }} 鈩�
+ {{ realTime.get(eqpCodes[num + 3])?.trendVo?.bellowsTemp?.toFixed(0) || '0' }} 鈩�
</div>
<!-- <div><Icon style="color: rgb(42 154 234)" icon="mdi:clock-outline" :size="20" />
{{realTime.get(eqpCodes[num + 3])?.dryTime || 0}} min
@@ -289,7 +289,7 @@
const eqpMap = ref(new Map())
const eqpCodes = ref(['GM001', 'GM002', 'GM003', 'GM004', 'GM005', 'GM006', 'GM007', 'GM008'])
const eqps = ref([] as dryEquipment[])
- const title = ref('鍏版郸鏅鸿兘骞茬嚗杞﹂棿')
+ const title = ref('鏅鸿兘骞茬嚗杞﹂棿')
const userStore = useUserStore()
const envHum = ref(0)
const envTemp = ref(0)
diff --git a/src/views/dry/bigScreen/BigWorkShop1.vue b/src/views/dry/bigScreen/BigWorkShop1.vue
index 1f6589e..773bc0a 100644
--- a/src/views/dry/bigScreen/BigWorkShop1.vue
+++ b/src/views/dry/bigScreen/BigWorkShop1.vue
@@ -309,7 +309,7 @@
const eqpMap = ref(new Map())
const eqpCodes = ref(['GM001', 'GM002', 'GM003', 'GM004', 'GM005', 'GM006', 'GM007', 'GM008'])
const eqps = ref([] as dryEquipment[])
- const title = ref("鍏版郸鏅鸿兘骞茬嚗杞﹂棿")
+ const title = ref("鏅鸿兘骞茬嚗杞﹂棿")
const userStore = useUserStore()
console.log(userStore.dictItems.title)
userStore.dictItems.title?.forEach(element => {
diff --git a/src/views/dry/bigScreen/BigWorkShop2.vue b/src/views/dry/bigScreen/BigWorkShop2.vue
index b002af8..4129178 100644
--- a/src/views/dry/bigScreen/BigWorkShop2.vue
+++ b/src/views/dry/bigScreen/BigWorkShop2.vue
@@ -309,11 +309,11 @@
const eqpMap = ref(new Map())
const eqpCodes = ref(['GM001', 'GM002', 'GM003', 'GM004', 'GM005', 'GM006', 'GM007', 'GM008'])
const eqps = ref([] as dryEquipment[])
- const title = ref("鍏版郸鏅鸿兘骞茬嚗杞﹂棿")
+ const title = ref("鏅鸿兘骞茬嚗杞﹂棿")
const userStore = useUserStore()
console.log(userStore.dictItems.title)
userStore.dictItems.title?.forEach(element => {
- if (element.value === "bigscreentitle") {
+ if (element.value === "bigscreentitle") {
title.value = element.text
}
diff --git a/src/views/dry/dataDefine/DryEqpType.data.ts b/src/views/dry/dataDefine/DryEqpType.data.ts
index bfdd10e..c7bbc49 100644
--- a/src/views/dry/dataDefine/DryEqpType.data.ts
+++ b/src/views/dry/dataDefine/DryEqpType.data.ts
@@ -12,6 +12,21 @@
align: 'center',
dataIndex: 'name',
},
+ {
+ title: '骞茬嚗鏁堢巼',
+ align: 'center',
+ dataIndex: 'dryEfficiency',
+ },
+ {
+ title: '钂告苯鍧囪��',
+ align: 'center',
+ dataIndex: 'steamConsumption',
+ },
+ {
+ title: '鐢佃兘鍧囪��',
+ align: 'center',
+ dataIndex: 'powerConsumption',
+ },
]
//鏌ヨ鏁版嵁
export const searchFormSchema: FormSchema[] = [
@@ -46,6 +61,45 @@
return [{ required: true, message: '璇疯緭鍏ュ悕绉�!' }, { ...rules.duplicateCheckRule('dry_eqp_type', 'name', model, schema)[0] }]
},
},
+ {
+ label: '骞茬嚗鏁堢巼',
+ field: 'dryEfficiency',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '璇疯緭鍏ユ暟瀛�!' }]
+ },
+ renderComponentContent: () => {
+ return {
+ suffix: () => 'kg/h',
+ }
+ },
+ },
+ {
+ label: '钂告苯鍧囪��',
+ field: 'steamConsumption',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '璇疯緭鍏ユ暟瀛�!' }]
+ },
+ renderComponentContent: () => {
+ return {
+ suffix: () => 'm鲁/kg',
+ }
+ },
+ },
+ {
+ label: '鐢佃兘鍧囪��',
+ field: 'powerConsumption',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: false }, { pattern: /^-?\d+\.?\d*$/, message: '璇疯緭鍏ユ暟瀛�!' }]
+ },
+ renderComponentContent: () => {
+ return {
+ suffix: () => 'KWh/kg',
+ }
+ },
+ },
// TODO 涓婚敭闅愯棌瀛楁锛岀洰鍓嶅啓姝讳负ID
{
label: '',
diff --git a/src/views/dry/dataDefine/DryEquipment.data.ts b/src/views/dry/dataDefine/DryEquipment.data.ts
index 759f100..215fbd8 100644
--- a/src/views/dry/dataDefine/DryEquipment.data.ts
+++ b/src/views/dry/dataDefine/DryEquipment.data.ts
@@ -31,7 +31,7 @@
dataIndex: 'ip',
},
{
- title: '杞﹂棿id',
+ title: '杞﹂棿',
align: 'center',
dataIndex: 'shopId_dictText',
},
diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index e11c75c..c9dad1d 100644
--- a/src/views/dry/dataDefine/DryOrder.data.ts
+++ b/src/views/dry/dataDefine/DryOrder.data.ts
@@ -27,11 +27,11 @@
align: 'center',
dataIndex: 'equId_dictText',
},
- {
- title: '杞﹂棿',
- align: 'center',
- dataIndex: 'shopId_dictText',
- },
+ // {
+ // title: '杞﹂棿',
+ // align: 'center',
+ // dataIndex: 'shopId_dictText',
+ // },
{
title: '鍒濆鍚按鐜�',
align: 'center',
@@ -73,6 +73,16 @@
dataIndex: 'windTemp',
},
{
+ title: '钂告苯閲�',
+ align: 'center',
+ dataIndex: 'steam',
+ },
+ {
+ title: '鑰楃數閲�',
+ align: 'center',
+ dataIndex: 'watt',
+ },
+ {
title: '鐜娓╁害',
align: 'center',
dataIndex: 'envTemp',
diff --git a/src/views/dry/monitor/Eqp.vue b/src/views/dry/monitor/Eqp.vue
index a9a8e74..7e15428 100644
--- a/src/views/dry/monitor/Eqp.vue
+++ b/src/views/dry/monitor/Eqp.vue
@@ -1268,7 +1268,7 @@
/**娓╁害鐜舰鍥� */
if (bellowsTempChart) {
bellowsTempChart.setOption({
- series: [{ data: [{ value: res.windTemp }] }, { data: [{ value: res.windTemp }] }],
+ series: [{ data: [{ value: res.trendVo.fanTemp }] }, { data: [{ value: res.trendVo.fanTemp }] }],
})
}
/**椋庢満棰戠巼鐜舰鍥� */
diff --git a/src/views/sys/login/TokenLoginPage.vue b/src/views/sys/login/TokenLoginPage.vue
index d386fb2..643f862 100644
--- a/src/views/sys/login/TokenLoginPage.vue
+++ b/src/views/sys/login/TokenLoginPage.vue
@@ -5,7 +5,7 @@
<div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div>
- <div class="app-loading-title">鏅鸿兘涓嵂骞茬嚗鏈烘暟瀛楀寲杞﹂棿</div>
+ <div class="app-loading-title">涓嵂杞﹂棿鏅鸿兘鐢熶骇绠＄悊绯荤粺</div>
</div>
</div>
</template>
diff --git a/src/views/system/loginmini/MiniLogin.vue b/src/views/system/loginmini/MiniLogin.vue
index 5d8bd7e..d68028d 100644
--- a/src/views/system/loginmini/MiniLogin.vue
+++ b/src/views/system/loginmini/MiniLogin.vue
@@ -18,7 +18,7 @@
<div class="aui-form">
<div class="aui-image">
<div>Lanpu</div>
- <div>鏅鸿兘涓嵂骞茬嚗鏈烘暟瀛楀寲杞﹂棿</div>
+ <div>涓嵂杞﹂棿鏅鸿兘鐢熶骇绠＄悊绯荤粺</div>
<!-- <div class="aui-image-text">-->
<!-- <img :src="adTextImg" />-->
<!-- </div>-->
--
Gitblit v1.9.3