mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'projects/mesxc-test' into projects/mesxc-lb

Browse Source
This commit is contained in:
lb 2024-03-13 18:16:15 +08:00
commit d2e38be1e1
9 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -1,7 +1,7 @@
### ###
# @Author: Do not edit # @Author: Do not edit
# @Date: 2023-08-29 09:40:39 # @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-03-05 09:48:49 # @LastEditTime: 2024-03-13 08:40:35
# @LastEditors: zhp # @LastEditors: zhp
# @Description: # @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.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082' # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# socket地址 # 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' VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 积木报表指向地址 # 积木报表指向地址

14
src/views/OperationalOverview/coldBoard.vue
View File

@ -1,17 +1,11 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 16:50:26 * @Date: 2024-01-29 16:50:26
* @LastEditTime: 2024-02-29 15:48:11 * @LastEditTime: 2024-03-13 09:07:37
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
<!--
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
* @LastEditTime: 2024-01-29 17:05:37
* @Description:
-->
<template> <template>
<div id="container" ref="container" class="visual-container" :style="styles"> <div id="container" ref="container" class="visual-container" :style="styles">
<el-row class="container-title" :style="{ <el-row class="container-title" :style="{
@ -19,7 +13,7 @@
lineHeight: 88 + 'px', lineHeight: 88 + 'px',
fontSize: 31 + '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="unit">单位：河南汇融数字科技有限公司</h3>
<h3 class="time">{{ times }}</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)">${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.productArea + '㎡' || ''}</span>`,
`<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</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>` <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 this.cutConfig.data = cutArr

4
src/views/OperationalOverview/components/ISRAChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-29 13:45:56 * @Date: 2024-01-29 13:45:56
* @LastEditTime: 2024-02-18 14:20:01 * @LastEditTime: 2024-03-13 08:58:01
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -87,7 +87,7 @@ export default {
legend: { legend: {
bottom: '10%', bottom: '10%',
left: 'center', left: 'center',
itemWidth: 20, itemWidth: 12,
itemHeight:12, itemHeight:12,
icon: 'rect', icon: 'rect',
textStyle: { textStyle: {

14
src/views/OperationalOverview/components/doubleYChart .vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-09-21 09:06:28 * @Date: 2023-09-21 09:06:28
* @LastEditTime: 2024-02-01 15:52:41 * @LastEditTime: 2024-03-13 08:51:12
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -172,7 +172,7 @@ export default {
axisLine: { axisLine: {
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f',
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
@ -186,7 +186,7 @@ export default {
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
}, },
data: nameList data: nameList
@ -215,7 +215,7 @@ export default {
show: true, show: true,
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f',
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
@ -228,7 +228,7 @@ export default {
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
} }
// type: 'value' // type: 'value'
@ -260,7 +260,7 @@ export default {
show: true, show: true,
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f', // 左边线的颜色
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
@ -275,7 +275,7 @@ export default {
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
} }
// type: 'value' // type: 'value'

10
src/views/OperationalOverview/components/linearBarChart.vue
View File

@ -145,7 +145,7 @@ export default {
axisLine: { axisLine: {
lineStyle: { lineStyle: {
type: 'solid', type: 'solid',
color: '#213259', // 左边线的颜色 color: '#25528f', // 左边线的颜色
width: '1' // 坐标线的宽度 width: '1' // 坐标线的宽度
} }
}, },
@ -156,7 +156,7 @@ export default {
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: '#213259' color: '#25528f'
} }
}, },
data: this.nameList data: this.nameList
@ -172,17 +172,17 @@ export default {
axisLabel: { axisLabel: {
color: "#fff", color: "#fff",
fontSize: 12, fontSize: 12,
formatter: '{value}/kwh' // formatter: '{value}/kwh'
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: "#213259", color: "#25528f",
}, },
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: "#213259a0", color: "#25528f",
}, },
} }
}, },

6
src/views/OperationalOverview/components/pileBarChart.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-27 13:54:52 * @Date: 2023-12-27 13:54:52
* @LastEditTime: 2024-02-21 14:38:54 * @LastEditTime: 2024-03-13 09:04:11
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -170,8 +170,8 @@ export default {
// } // }
this.chart.setOption({ this.chart.setOption({
legend: { legend: {
// top: '2.5%', itemWidth: 12,
// right: '20px', itemHeight: 12,
icon: 'rect', icon: 'rect',
textStyle: { textStyle: {
color: '#ffffff' color: '#ffffff'

68
src/views/equipment/base/repair/CustomDialogForm.vue
View File

@ -6,41 +6,58 @@
--> -->
<template> <template>
<el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer" <!-- <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
custom-class="mes-drawer" size="50%" @closed="$emit('destroy')"> custom-class="mes-drawer" size="50%" @closed="$emit('destroy')"> -->
<el-dialog
:visible.sync="visible"
width="50%"
:before-close="closed">
<small-title slot="title" :no-padding="true"> <small-title slot="title" :no-padding="true">
{{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }} 详情
<!-- {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }} -->
</small-title> </small-title>
<div class="drawer-body flex"> <div class="drawer-body flex">
<div class="drawer-body__content"> <div class="drawer-body__content">
<div> <div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="6">
<div class="blodTip">故障发生时间</div> <div class="blodTip">故障发生时间</div>
<div class="lightTip">{{ parseTime(dataForm.faultTime) }}</div> <div class="lightTip">{{ parseTime(dataForm.faultTime) }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<div class="blodTip">故障级别</div> <div class="blodTip">故障级别</div>
<div class="lightTip">{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</div> <div class="lightTip">{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<div class="blodTip">故障类型</div> <div class="blodTip">故障类型</div>
<div class="lightTip">{{ getDictDataLabel('fault-type', dataForm.faultType) }}</div> <div class="lightTip">{{ getDictDataLabel('fault-type', dataForm.faultType) }}</div>
</el-col> </el-col>
</el-row> <el-col :span="6">
<el-row :gutter="20">
<el-col :span="8">
<div class="blodTip">维修工</div> <div class="blodTip">维修工</div>
<div class="lightTip">{{ dataForm.repairman }}</div> <div class="lightTip">{{ dataForm.repairman }}</div>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row :gutter="20">
<el-col :span="6">
<div class="blodTip">联系方式</div> <div class="blodTip">联系方式</div>
<div class="lightTip">{{ dataForm.repairmanPhone }}</div> <div class="lightTip">{{ dataForm.repairmanPhone }}</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<div class="blodTip">维修方式</div> <div class="blodTip">维修方式</div>
<div class="lightTip">{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}</div> <div class="lightTip">{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}</div>
</el-col> </el-col>
<el-col :span="6">
<div class="blodTip">创建时间</div>
<div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
</el-col>
<el-col :span="6">
<div class="blodTip">创建人</div>
<div class="lightTip">{{ dataForm.creator }}</div>
</el-col>
</el-row>
<el-row>
<div class="blodTip">备注</div>
<div class="lightTip">{{ dataForm.remark }}</div>
</el-row> </el-row>
<el-row> <el-row>
<div class="blodTip">维修附件</div> <div class="blodTip">维修附件</div>
@ -55,20 +72,6 @@
</div> </div>
<p v-else>暂无附件</p> <p v-else>暂无附件</p>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="8">
<div class="blodTip">创建时间</div>
<div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
</el-col>
<el-col :span="8">
<div class="blodTip">创建人</div>
<div class="lightTip">{{ dataForm.creator }}</div>
</el-col>
</el-row>
<el-row>
<div class="blodTip">备注</div>
<div class="lightTip">{{ dataForm.remark }}</div>
</el-row>
</div> </div>
<!-- <el-divider style="margin-top: -10px" /> <!-- <el-divider style="margin-top: -10px" />
<small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true"> <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
@ -143,13 +146,17 @@
</el-row> </el-row>
</el-form> --> </el-form> -->
<div v-if="!disabled" class="drawer-body__footer"> <!-- <div v-if="!disabled" class="drawer-body__footer">
<el-button style="" @click="goback()">取消</el-button> <el-button style="" @click="goback()">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button> <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
</div> -->
</div> </div>
</div> </div>
</div> <span slot="footer" class="dialog-footer">
</el-drawer> <el-button @click="visible = false">取 消</el-button>
</span>
</el-dialog>
<!-- </el-drawer> -->
</template> </template>
<script> <script>
@ -254,6 +261,9 @@ export default {
}, },
mounted() { }, mounted() { },
methods: { methods: {
closed() {
this.$emit('destroy')
},
setFileName(val) { setFileName(val) {
this.fileName = val this.fileName = val
}, },
@ -373,7 +383,7 @@ export default {
.drawer-body__content { .drawer-body__content {
flex: 1; flex: 1;
/* background: #eee; */ /* background: #eee; */
padding: 20px 30px; padding: 5px 10px;
overflow-y: auto; overflow-y: auto;
} }

5
src/views/quality/base/qualityHotMaterial/add-or-updata.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-08 13:46:17 * @Date: 2023-12-08 13:46:17
* @LastEditTime: 2024-03-01 15:22:06 * @LastEditTime: 2024-03-12 14:54:05
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -58,7 +58,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检测时间" prop="checkTime" <el-form-item label="检测时间" prop="checkTime"
:rules="[{ required: true, message: '检测时间不能为空', trigger: 'change' }]"> :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-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/report/productionWeekReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-12 11:14:55 * @LastEditTime: 2024-03-13 10:44:26
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -10,7 +10,7 @@
<el-form :inline="true" :model="dataForm" class="demo-form-inline"> <el-form :inline="true" :model="dataForm" class="demo-form-inline">
<el-form-item> <el-form-item>
<el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime" <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="选择周"> style="width: 350px" placeholder="选择周">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>