@@ -1,7 +1,7 @@ | |||
### | |||
# @Author: Do not edit | |||
# @Date: 2023-08-29 09:40:39 | |||
# @LastEditTime: 2024-03-05 09:48:49 | |||
# @LastEditTime: 2024-03-13 08:40:35 | |||
# @LastEditors: zhp | |||
# @Description: | |||
### | |||
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082' | |||
# VUE_APP_BASE_API = 'http://192.168.1.78:48082' | |||
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' | |||
# socket地址 | |||
VUE_APP_Socket_API = 'ws://192.168.0.30:8888' | |||
VUE_APP_Socket_API = 'ws://192.168.0.33:48082' | |||
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081' | |||
# 积木报表指向地址 | |||
@@ -1,17 +1,11 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-01-29 16:50:26 | |||
* @LastEditTime: 2024-02-29 15:48:11 | |||
* @LastEditTime: 2024-03-13 09:07:37 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<!-- | |||
* @Author: zwq | |||
* @Date: 2021-07-19 15:18:30 | |||
* @LastEditors: zhp | |||
* @LastEditTime: 2024-01-29 17:05:37 | |||
* @Description: | |||
--> | |||
<template> | |||
<div id="container" ref="container" class="visual-container" :style="styles"> | |||
<el-row class="container-title" :style="{ | |||
@@ -19,7 +13,7 @@ | |||
lineHeight: 88 + 'px', | |||
fontSize: 31 + 'px' | |||
}"> | |||
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt=""> | |||
<img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt=""> | |||
许昌安彩冷端看板 | |||
<h3 class="unit">单位:河南汇融数字科技有限公司</h3> | |||
<h3 class="time">{{ times }}</h3> | |||
@@ -715,7 +709,7 @@ export default { | |||
`<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`, | |||
`<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`, | |||
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.7)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div> | |||
`<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div> | |||
<div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>` | |||
]) | |||
this.cutConfig.data = cutArr | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-01-29 13:45:56 | |||
* @LastEditTime: 2024-02-18 14:20:01 | |||
* @LastEditTime: 2024-03-13 08:58:01 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -87,7 +87,7 @@ export default { | |||
legend: { | |||
bottom: '10%', | |||
left: 'center', | |||
itemWidth: 20, | |||
itemWidth: 12, | |||
itemHeight:12, | |||
icon: 'rect', | |||
textStyle: { | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-09-21 09:06:28 | |||
* @LastEditTime: 2024-02-01 15:52:41 | |||
* @LastEditTime: 2024-03-13 08:51:12 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -172,7 +172,7 @@ export default { | |||
axisLine: { | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
color: '#25528f', | |||
width: '1' // 坐标线的宽度 | |||
} | |||
}, | |||
@@ -186,7 +186,7 @@ export default { | |||
}, | |||
splitLine: { | |||
lineStyle: { | |||
color: '#213259' | |||
color: '#25528f' | |||
} | |||
}, | |||
data: nameList | |||
@@ -215,7 +215,7 @@ export default { | |||
show: true, | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
color: '#25528f', | |||
width: '1' // 坐标线的宽度 | |||
} | |||
}, | |||
@@ -228,7 +228,7 @@ export default { | |||
}, | |||
splitLine: { | |||
lineStyle: { | |||
color: '#213259' | |||
color: '#25528f' | |||
} | |||
} | |||
// type: 'value' | |||
@@ -260,7 +260,7 @@ export default { | |||
show: true, | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
color: '#25528f', // 左边线的颜色 | |||
width: '1' // 坐标线的宽度 | |||
} | |||
}, | |||
@@ -275,7 +275,7 @@ export default { | |||
}, | |||
splitLine: { | |||
lineStyle: { | |||
color: '#213259' | |||
color: '#25528f' | |||
} | |||
} | |||
// type: 'value' | |||
@@ -145,7 +145,7 @@ export default { | |||
axisLine: { | |||
lineStyle: { | |||
type: 'solid', | |||
color: '#213259', // 左边线的颜色 | |||
color: '#25528f', // 左边线的颜色 | |||
width: '1' // 坐标线的宽度 | |||
} | |||
}, | |||
@@ -156,7 +156,7 @@ export default { | |||
}, | |||
splitLine: { | |||
lineStyle: { | |||
color: '#213259' | |||
color: '#25528f' | |||
} | |||
}, | |||
data: this.nameList | |||
@@ -172,17 +172,17 @@ export default { | |||
axisLabel: { | |||
color: "#fff", | |||
fontSize: 12, | |||
formatter: '{value}/kwh' | |||
// formatter: '{value}/kwh' | |||
}, | |||
axisLine: { | |||
show: true, | |||
lineStyle: { | |||
color: "#213259", | |||
color: "#25528f", | |||
}, | |||
}, | |||
splitLine: { | |||
lineStyle: { | |||
color: "#213259a0", | |||
color: "#25528f", | |||
}, | |||
} | |||
}, | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-27 13:54:52 | |||
* @LastEditTime: 2024-02-21 14:38:54 | |||
* @LastEditTime: 2024-03-13 09:04:11 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -170,8 +170,8 @@ export default { | |||
// } | |||
this.chart.setOption({ | |||
legend: { | |||
// top: '2.5%', | |||
// right: '20px', | |||
itemWidth: 12, | |||
itemHeight: 12, | |||
icon: 'rect', | |||
textStyle: { | |||
color: '#ffffff' | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-08 13:46:17 | |||
* @LastEditTime: 2024-03-01 15:22:06 | |||
* @LastEditTime: 2024-03-12 14:54:05 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -58,7 +58,8 @@ | |||
<el-col :span="8"> | |||
<el-form-item label="检测时间" prop="checkTime" | |||
:rules="[{ required: true, message: '检测时间不能为空', trigger: 'change' }]"> | |||
<el-date-picker v-model="dataForm.checkTime" type="datetime" placeholder="选择检测时间"> | |||
<el-date-picker value-format="timestamp" v-model="dataForm.checkTime" type="datetime" | |||
placeholder="选择检测时间"> | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
@@ -80,7 +81,7 @@ | |||
<el-col :span="8"> | |||
<el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量" | |||
:rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]"> | |||
<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail" | |||
<el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail" | |||
style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue' | |||
v-model.number="dataForm.checkValueList[index].checkValue" | |||
@change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input> | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-12 11:14:55 | |||
* @LastEditTime: 2024-03-13 10:44:26 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -10,7 +10,7 @@ | |||
<el-form :inline="true" :model="dataForm" class="demo-form-inline"> | |||
<el-form-item> | |||
<el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime" | |||
:picker-options="{firstDayOfWeek: 5}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp" | |||
:picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp" | |||
style="width: 350px" placeholder="选择周"> | |||
</el-date-picker> | |||
</el-form-item> | |||