From 97fdc4473e426084722cf922f5fe84d66366b760 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 一月 2025 20:07:42 +0800
Subject: [PATCH] update
---
.env.development | 9 ++
src/views/mdc/base/EquipmentList.vue | 23 +++++
src/views/mdc/base/modules/EquipmentList/UserModal.vue | 13 ++
src/views/mdc/base/DeviceBaseInfo.vue | 74 +++++++++--------
src/views/user/Login.vue | 16 +++-
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue | 24 +++++
.env | 3
.env.production | 9 ++
src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue | 49 ++++++------
9 files changed, 146 insertions(+), 74 deletions(-)
diff --git a/.env b/.env
index f1dd889..a6a2915 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
-NODE_ENV=production
+#NODE_ENV=production
+NODE_ENV=development
VUE_APP_PLATFORM_NAME=JeecgBoot 浼佷笟绾т綆浠ｇ爜骞冲彴
# 寮�鍚崟鐐圭櫥褰�
VUE_APP_SSO=false
diff --git a/.env.development b/.env.development
index 4923cd3..adb6fa4 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,12 @@
NODE_ENV=development
-VUE_APP_API_BASE_URL=http://127.0.0.1:8089
+#宸ユ帶缃�
+#VUE_APP_API_BASE_URL=http://10.118.10.62:6099
+#娑夊瘑缃�
+#VUE_APP_API_BASE_URL=http://20.10.3.42:6099
+#鏈湴
+VUE_APP_API_BASE_URL=http://127.0.0.1:9999
+#鏈湴铏氭嫙鏈�
+#VUE_APP_API_BASE_URL=http://192.168.1.18:9999
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/.env.production b/.env.production
index 530cebc..6ed9576 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,11 @@
NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot
+#宸ユ帶缃�
+#VUE_APP_API_BASE_URL=http://10.118.10.62:6099
+#娑夊瘑缃�
+#VUE_APP_API_BASE_URL=http://20.10.3.42:6099
+#鏈湴
+VUE_APP_API_BASE_URL=http://127.0.0.1:9999
+#鏈湴铏氭嫙鏈�
+#VUE_APP_API_BASE_URL=http://192.168.1.18:9999
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/src/views/mdc/base/DeviceBaseInfo.vue b/src/views/mdc/base/DeviceBaseInfo.vue
index 0394307..50e897e 100644
--- a/src/views/mdc/base/DeviceBaseInfo.vue
+++ b/src/views/mdc/base/DeviceBaseInfo.vue
@@ -7,7 +7,7 @@
<a-col :md="24-5" :sm="24">
<div class="device-status-info">
<a-space v-for="item in deviceStatusList" :key="item.value" class="single-status-info">
- <template v-if="item.value!=99">
+ <template v-if="item.value!=99 && item.value!=88">
<div>{{ item.label }}</div>
<div class="status-square" :style="{ backgroundColor: item.color }"></div>
<div>{{getDeviceNumberByStatus(item.value) }}</div>
@@ -90,15 +90,19 @@
value: 22,
color: '#FF0000'
},
- {
- label: '寮傚父',
- value: 33,
- color: '#FFA200'
- },
+ // {
+ // label: '寮傚父',
+ // value: 33,
+ // color: '#FFA200'
+ // },
{
label: '鎬绘暟',
value: 99,
color: '#fff'
+ },
+ {
+ label: '澶т慨銆侀」淇暟',
+ value: 88
}
]// 璁惧鐘舵�佹寚绀虹伅鍒楄〃锛�
}
@@ -197,35 +201,35 @@
}
},
- /**
- * 鍗曞嚮鐘舵�佸弽棣堝悗瑙﹀彂
- * @param record
- */
- editEquipmentStatus(record) {
- const _this = this
- this.$notification.info({
- key: 'equipmentStatus',
- message: '娑堟伅',
- description: '鍙嶉涓�...'
- })
- getAction(this.url.updateEquipmentStatus, { id: record.id })
- .then(res => {
- if (res.success) {
- _this.equipmentStatistics(this.param, { key: true, message: res.message })
- } else {
- this.$notification.warning({
- message: '娑堟伅',
- description: res.message
- })
- }
- })
- .catch(err => {
- this.$notification.error({
- message: '娑堟伅',
- description: err.message
- })
- })
- },
+ // /**
+ // * 鍗曞嚮鐘舵�佸弽棣堝悗瑙﹀彂
+ // * @param record
+ // */
+ // editEquipmentStatus(record) {
+ // const _this = this
+ // this.$notification.info({
+ // key: 'equipmentStatus',
+ // message: '娑堟伅',
+ // description: '鍙嶉涓�...'
+ // })
+ // getAction(this.url.updateEquipmentStatus, { id: record.id })
+ // .then(res => {
+ // if (res.success) {
+ // _this.equipmentStatistics(this.param, { key: true, message: res.message })
+ // } else {
+ // this.$notification.warning({
+ // message: '娑堟伅',
+ // description: res.message
+ // })
+ // }
+ // })
+ // .catch(err => {
+ // this.$notification.error({
+ // message: '娑堟伅',
+ // description: err.message
+ // })
+ // })
+ // },
/**
* 鏍规嵁璁惧鐘舵�佸�艰幏鍙栧搴旇澶囨暟閲�
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 365e630..8af88e6 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -20,9 +20,14 @@
<a-col :md="4" :sm="4">
<a-form-item label="杞﹂棿鍚嶇О">
- <!--<a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>-->
<a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="璇烽�夋嫨杞﹂棿"
:treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
+ </a-form-item>
+ </a-col>
+
+ <a-col :md="4" :sm="4">
+ <a-form-item label="璁惧鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧鐘舵��" :triggerChange="true" dictCode="mdc_equipment_status" v-model="queryParam.equipmentStatus" allow-clear/>
</a-form-item>
</a-col>
@@ -269,15 +274,21 @@
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
- width: 225,
+ width: 150,
dataIndex: 'equipmentIp'
},
{
title: '鏈哄簥绔彛',
align: 'center',
- width: 225,
+ width: 200,
dataIndex: 'dataPort'
},
{
@@ -336,6 +347,12 @@
// sorter: true
},
{
+ title:'璁惧鐘舵��',
+ align:'center',
+ width: 100,
+ dataIndex:'equipmentStatus_dictText'
+ },
+ {
title: '鏈哄簥IP',
align: 'center',
width: 200,
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
index 82d3605..fd48ee3 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue
@@ -1,7 +1,7 @@
<template>
<div ref="wrap">
<a-modal
- width="70%"
+ width="90%"
:visible="visible"
:getContainer="() => this.$refs.wrap"
@cancel="handleCancel"
@@ -121,6 +121,23 @@
</a-descriptions>
+ <a-descriptions
+ title="鍧愭爣淇℃伅"
+ v-if="xyzList != null"
+ :column="5"
+ >
+ <a-descriptions-item label="鏈哄簥鍧愭爣X">{{xyzList.xmachine}}</a-descriptions-item>
+ <a-descriptions-item label="Y">{{xyzList.ymachine}}</a-descriptions-item>
+ <a-descriptions-item label="Z">{{xyzList.zmachine}}</a-descriptions-item>
+ <a-descriptions-item label="A">{{xyzList.amachine}}</a-descriptions-item>
+ <a-descriptions-item label="B">{{xyzList.bmachine}}</a-descriptions-item>
+ <a-descriptions-item label="缁濆鍧愭爣X">{{xyzList.xabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="Y">{{xyzList.yabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="Z">{{xyzList.zabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="A">{{xyzList.aabsolute}}</a-descriptions-item>
+ <a-descriptions-item label="B">{{xyzList.babsolute}}</a-descriptions-item>
+ </a-descriptions>
+
</td>
</tr>
</table>
@@ -165,7 +182,8 @@
url: {
mdcEquipmentDetailedInfo: '/mdc/mdcEquipment/mdcEquipmentDetailedInfo'
},
- modalTimer: null
+ modalTimer: null,
+ xyzList: null
}
},
beforeDestroy() {
@@ -1229,6 +1247,8 @@
_this.spindleload = res.result.spindleload
_this.rapidfeed = res.result.rapidfeed
_this.runData = res.result.runData
+ _this.xyzList = res.result.xyzList
+
// _this.xyzAliasesList = res.result.xyzAliasesList
this.$nextTick(() => {
_this.drawLine()
diff --git a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
index 07795c1..2724a0b 100644
--- a/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/DeviceBaseInfo/EquipmentList.vue
@@ -66,17 +66,17 @@
<template slot="oporationDict" slot-scope="text, record">
<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
</template>
- <template slot="equipmentStatus" slot-scope="text">
- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
- </template>
+<!-- <template slot="equipmentStatus" slot-scope="text">-->
+<!-- <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>-->
+<!-- </template>-->
<template slot="collecttime" slot-scope="text, record">
<div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
</template>
- <template slot="action" slot-scope="text, record">
- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
- <a>鐘舵�佸弽棣�</a>
- </a-popconfirm>
- </template>
+<!-- <template slot="action" slot-scope="text, record">-->
+<!-- <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">-->
+<!-- <a>鐘舵�佸弽棣�</a>-->
+<!-- </a-popconfirm>-->
+<!-- </template>-->
</a-table>
</div>
@@ -101,7 +101,7 @@
align: "center",
dataIndex: 'equipmentId',
scopedSlots: {customRender: 'equipmentId'},
- width:210
+ width:300
},
{
title: '璁惧鍚嶇О',
@@ -117,13 +117,13 @@
scopedSlots: {customRender: 'oporationDict'},
width:200
},
- {
- title: '璁惧寮傚父',
- align: "center",
- dataIndex: 'equipmentStatus',
- scopedSlots: {customRender: 'equipmentStatus'},
- width:200
- },
+ // {
+ // title: '璁惧寮傚父',
+ // align: "center",
+ // dataIndex: 'equipmentStatus',
+ // scopedSlots: {customRender: 'equipmentStatus'},
+ // width:200
+ // },
{
title: '閲囬泦鏃堕棿',
align: "center",
@@ -131,16 +131,15 @@
defaultSortOrder:'descend',
sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
scopedSlots: {customRender: 'collecttime'},
- width:350
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- scopedSlots: {customRender: 'action'},
- align: "center",
- width: 150,
- fixed:'right'
}
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // scopedSlots: {customRender: 'action'},
+ // align: "center",
+ // width: 150,
+ // fixed:'right'
+ // }
],
scrollY:465,
}
diff --git a/src/views/mdc/base/modules/EquipmentList/UserModal.vue b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
index 66b3ab1..bc14e33 100644
--- a/src/views/mdc/base/modules/EquipmentList/UserModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -113,6 +113,14 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
+ <a-form-model-item label="璁惧鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧鐘舵��" :triggerChange="true" dictCode="mdc_equipment_status" v-model="model.equipmentStatus" allow-clear/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12">
<a-form-model-item label="鎺掑簭" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="璇疯緭鍏ユ帓搴�"
v-model="model.sortNo" style="width: 100%"/>
@@ -213,8 +221,9 @@
dataPort: "",
driveType: "",
systemType: "",
+ equipmentStatus: '0',
deviceLevel: "",
- deviceCategory: ""
+ deviceCategory: "",
},
labelCol: {
xs: { span: 24 },
@@ -314,7 +323,7 @@
},
add () {
this.refresh();
- this.edit({activitiSync:'1',userIdentity:1,equipmentId:"",equipmentName:"",equipmentModel:"",equipmentIp:'',dataPort:"",driveType:"",controlSystem:"",saveTableName:""});
+ this.edit({activitiSync:'1',userIdentity:1,equipmentId:"",equipmentName:"",equipmentModel:"",equipmentIp:'',dataPort:"",driveType:"",controlSystem:"",saveTableName:"",equipmentStatus:'0'});
},
edit (record) {
let that = this;
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 76e68d9..c82d6d6 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -7,6 +7,7 @@
<a href="/">
<img src="~@/assets/logo.png" class="logo" alt="logo">
<span class="title">涓浗鑸彂鎴愬彂</span>
+ <div class="subtitle">璁惧绠＄悊绯荤粺锛圡DC锛�</div>
</a>
</div>
</div>
@@ -306,11 +307,13 @@
.top {
text-align: center;
position: absolute;
- top: 10%;
+ top: 0;
.header {
height: 44px;
line-height: 44px;
+ font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ font-weight: 600;
.badge {
position: absolute;
@@ -331,11 +334,16 @@
.title {
font-size: 2vw;
- color: #000;
- font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- font-weight: 600;
position: relative;
top: 2px;
+ color: #000;
+ }
+
+ .subtitle{
+ font-size: 1.2vw;
+ position: relative;
+ top: 2px;
+ color: #000;
}
}
.desc {
--
Gitblit v1.9.3