-
- 工单编码：{{ dataForm.code }}
-
-
- 工单名称:{{ dataForm.name }}
- 工单来源:{{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}
- 所属订单:
- {{ item.orderName }}
-
-
-
- 产品名称:{{ dataForm.productName }}
- 规 格:{{ dataForm.specifications }}
- 计划生产数量:{{ dataForm.planQuantity }}
-
-
- 预计用时(小时):{{ dataForm.remainingTime }}
- 计划投入数量:{{ dataForm.planAssignQuantity }}
- 优先级:{{ fitlerP(dataForm.priority) }}
-
-
- 负责人:{{ dataForm.workers }}
- 关联产线:
- {{ item }}
-
- 物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}
-
-
- 关联工艺:{{ dataForm.processFlowName }}
-
+
- 生产信息
-
-
+
+
+
-
+
+ 工单编码：{{ dataForm.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
工单名称
+ {{ dataForm.name }}
+ 工单来源
+ {{ dataForm.triggerOrigin === 1 ? 'MES' : dataForm.triggerOrigin === 2 ? 'ERP' : ''}}
+ 所属订单
+
+ {{ item.orderName }}
+
+ 产品名称
+ {{ dataForm.productName }}
+ 规 格
+ {{ dataForm.specifications }}
+ 计划生产数量
+ {{ dataForm.planQuantity }}
+ 预计用时(小时)
+ {{ dataForm.remainingTime }}
+ 计划投入数量
+ {{ dataForm.planAssignQuantity }}
+ 优先级
+ {{ fitlerP(dataForm.priority) }}
+ 负责人
+ {{ dataForm.workers }}
+ 关联产线
+
+ {{ item }}
+
+ 物料计算方式
+ {{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}
+ 关联工艺
+ {{ dataForm.processFlowName }}
+
-
- 工单创建时间:{{ parseTime(dataForm.createTime) }}
- 计划开始时间:{{ parseTime(dataForm.planStartTime) }}
- 计划完成时间:{{ parseTime(dataForm.planFinishTime) }}
-
-
- 预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}
- 实际开始时间:{{ parseTime(dataForm.startProduceTime) }}
- 实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}
-
-
- 工单状态:{{ fitlerS(dataForm.status) }}
- 实际投入数量:{{ dataForm.assignQuantity }}
- 实际生产数量:{{ dataForm.actualQuantity }}
-
-
- 废片数量:{{ dataForm.nokQuantity }}
- 检测瑕疵数:{{ }}
-
+
+
+
-
+
+ 生产信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
工单创建时间
+ {{ parseTime(dataForm.createTime) }}
+ 计划开始时间
+ {{ parseTime(dataForm.planStartTime) }}
+ 计划完成时间
+ {{ parseTime(dataForm.planFinishTime) }}
+ 预计结束时间
+ {{ parseTime(dataForm.computeFinishTime) }}
+ 实际开始时间
+ {{ parseTime(dataForm.startProduceTime) }}
+ 实际完成时间
+ {{ parseTime(dataForm.finishProduceTime) }}
+ 工单状态
+ {{ fitlerS(dataForm.status) }}
+ 实际投入数量
+ {{ dataForm.assignQuantity }}
+ 实际生产数量
+ {{ dataForm.actualQuantity }}
+ 废片数量
+ {{ dataForm.nokQuantity }}
+ 检测瑕疵数
+ {{ }}
+
-
- 订单相关信息
-
+
+
-
+
+ 订单相关信息
+
-
- 预计用料信息
-
+
-
@@ -48,24 +63,26 @@ export default {
props: {},
data() {
return {
- kilnInfo: [
- { name: '窑炉压力', value: '83Kpa' },
- { name: '循环水温度', value: '53℃' },
- { name: '循环水流量', value: '23m³/h' },
- { name: '循环水压力', value: '33Kpa' },
- { name: '助燃风压力', value: '12Kpa' },
- { name: '碹顶加权温度', value: '32℃' },
- { name: '压缩气压力', value: '83Kpa' },
- { name: '融化加权温度', value: '123℃' },
- ],
};
},
- computed: {},
+ computed: {
+ kilnInfoMsg() {
+ return this.$store.state.websocket.kilnInfo
+ }
+ },
methods: {},
};
diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue
index 14028e92..8ce225ff 100644
--- a/src/views/databoard/kiln/LeftFour.vue
+++ b/src/views/databoard/kiln/LeftFour.vue
@@ -12,7 +12,7 @@
display: grid;
gap: 16px;
grid-template-columns: 1fr 1fr;
- grid-template-rows: 1fr 1fr;
+ grid-template-rows: 462px 462px;
">
+ contentRef.clientWidth) {
+ this.showScroll = true
+ } else {
+ this.showScroll = false
+ }
+ console.log(contentRef.scrollWidth, contentRef.clientWidth)
this.init(this.workOrderButton[0].id, true)
})
- } else {
+ } else {
this.init(this.$route.query.id, true)
}
},
methods: {
+ scrolRight() {
+ // let contentRef = this.$refs.content
+ // console.log('你好啊啊', contentRef.scrollWidth, contentRef.clientWidth)
+ this.stopScroll()
+ this.timer = setTimeout(() => {
+ this.$refs.content.scrollLeft += 50
+ }, 100)
+ // if (contentRef.scrollWidth > contentRef.clientWi)
+ },
+ scrollLeft() {
+ this.stopScroll()
+ this.timer = setTimeout(() => {
+ this.$refs.content.scrollLeft -= 50
+ }, 100)
+ },
+ stopScroll() {
+ clearTimeout(this.timer)
+ },
getDict() {
// 工艺
getProcessFlowList().then(res => {
@@ -391,59 +494,26 @@ export default {
};
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index a4877d42..ac203453 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -84,7 +84,7 @@ export default {
label: '时间',
dateType: 'monthrange',
format: 'yyyy-MM',
- valueFormat: 'yyyy-MM-ddTHH:mm:ss',
+ valueFormat: 'timestamp',
rangeSeparator: '-',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
diff --git a/src/views/databoard/assets/check.png b/src/views/databoard/assets/check.png
new file mode 100644
index 00000000..8793b99a
Binary files /dev/null and b/src/views/databoard/assets/check.png differ
diff --git a/src/views/databoard/assets/energeCost.png b/src/views/databoard/assets/energeCost.png
new file mode 100644
index 00000000..ce6b5ac6
Binary files /dev/null and b/src/views/databoard/assets/energeCost.png differ
diff --git a/src/views/databoard/assets/msg.png b/src/views/databoard/assets/msg.png
new file mode 100644
index 00000000..2100324a
Binary files /dev/null and b/src/views/databoard/assets/msg.png differ
diff --git a/src/views/databoard/components/Container.vue b/src/views/databoard/components/Container.vue
index e7985f05..36a8742e 100644
--- a/src/views/databoard/components/Container.vue
+++ b/src/views/databoard/components/Container.vue
@@ -11,12 +11,12 @@
- ![]()
+ ![]()
-
+
+
+ 预计用料信息
+
+
窑炉生产运行驾驶舱
+ class="firm">
单位: 河南汇融科技服务有限公司
-
+
diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue
index f57f84de..2f8baf7c 100644
--- a/src/views/databoard/components/ISRAChart.vue
+++ b/src/views/databoard/components/ISRAChart.vue
@@ -11,9 +11,11 @@
diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue
index 7de6c616..c719f9a2 100644
--- a/src/views/databoard/kiln/GasHandle.vue
+++ b/src/views/databoard/kiln/GasHandle.vue
@@ -21,7 +21,7 @@
氧气含量
- 82%
+ 82%
一氧化氮
排放浓度
- 82%
+ 82%
二氧化硫
排放浓度
- 82%
+ 59mg/m³
二氧化氮
排放浓度
- 82%
+ 82%
一氧化氮
- 82%
+ 82%
排放浓度
二氧化硫
- 82%
+ 59mg/m³
排放浓度
二氧化氮
- 82%
+ 82%
排放浓度
-
+ style="margin-bottom: 10px; display: flex; align-items: center">
+
+ style="margin-bottom: 10px; display: flex; align-items: center">
+
烟气趋势图
-
+
@@ -118,7 +118,7 @@
import Container from '../components/Container.vue';
import ShadowRect from '../components/ShadowRect.vue';
import KilnLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
+import Switcher from '../components/Switcher';
import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
import GasChart from '../components/GasChart.vue';
diff --git a/src/views/databoard/kiln/IsraCheck.vue b/src/views/databoard/kiln/IsraCheck.vue
index 271c3fdd..a583f2f9 100644
--- a/src/views/databoard/kiln/IsraCheck.vue
+++ b/src/views/databoard/kiln/IsraCheck.vue
@@ -7,9 +7,10 @@
+
-
- {{ info.name }}
-
-
- {{ info.value }}
-
-
+
+ 窑炉压力:
+ {{ kilnInfoMsg?.kilnPressure }}
+
+
+ 循环水温度:
+ {{ kilnInfoMsg?.waterTemp }}
+
+
+ 循环水流量:
+ {{ kilnInfoMsg?.waterFlow }}
+
+
+ 循环水压力:
+ {{ kilnInfoMsg?.waterPressure }}
+
+
+ 助燃风压力:
+ {{ kilnInfoMsg?.combustionAirPressure }}
+
+
+ 碹顶加权温度:
+ {{ kilnInfoMsg?.topTemp }}
+
+
+ 压缩气压力:
+ {{ kilnInfoMsg?.compressedAirPressure }}
+
+
+ 熔化加权温度:
+ {{ kilnInfoMsg?.meltTemp }}
+ style="
+ display: grid;
+ gap: 16px;
+ grid-template-rows: 320px 605px;
+ ">
@@ -18,7 +22,7 @@
import Container from '../components/Container.vue';
import ShadowRect from '../components/ShadowRect.vue';
import KilnLine from '../components/line';
-import Switcher from '../components/Switcher.vue';
+import Switcher from '../components/Switcher';
import SelectorBtnGroup from '../components/SelectorBtnGroup.vue';
import KilnInfo from './KilnInfo.vue';
import GasHandle from './GasHandle.vue';
diff --git a/src/views/databoard/kiln/index.vue b/src/views/databoard/kiln/index.vue
index 6d005504..f59ef9c0 100644
--- a/src/views/databoard/kiln/index.vue
+++ b/src/views/databoard/kiln/index.vue
@@ -6,36 +6,46 @@
-->
-
-
-
+
-->
-
+
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index 217e61fe..c4559687 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -353,7 +353,7 @@ export default {
queryData.createTime = this.queryParams.createTime;
}
this.$router.push({
- path: '/equipment/base/maintain/record',
+ path: '/safety-environmental/special-equipment/equipment-maintain/maintain-record',
query: queryData,
});
// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 3d18b73e..bf33d9a0 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -556,6 +556,19 @@ export default {
this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
this.form.startTime = tempRow.nextMaintainTime;
this.form.maintainPlanId = tempRow.id;
+ // await (() => {
+ // return new Promise((acpt, rejt) => {
+ // this.form.relatePlan =
+ // this.$route.query.relatePlan ||
+ // (tempRow.nextMaintainTime ? 1 : 2);
+ // this.form.startTime = tempRow.nextMaintainTime;
+ // acpt();
+ // });
+ // })();
+ // this.$nextTick(() => {
+ // this.form.maintainPlanId = tempRow.id;
+ // this.form.equipmentId = tempRow.equipmentId;
+ // });
}
if (this.$route.query.isAdd) {
// 赋值
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index efb4df49..082db5a8 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -32,11 +32,11 @@
+
-
+
-
@@ -66,5 +171,6 @@ export default {
background: url(../assets/bg.png) no-repeat;
background-size: cover;
background-position: 0 0;
+ overflow: auto;
}
diff --git a/src/views/databoard/mixins/resize.js b/src/views/databoard/mixins/resize.js
new file mode 100644
index 00000000..234953b1
--- /dev/null
+++ b/src/views/databoard/mixins/resize.js
@@ -0,0 +1,55 @@
+import { debounce } from '@/utils'
+
+export default {
+ data() {
+ return {
+ $_sidebarElm: null,
+ $_resizeHandler: null
+ }
+ },
+ mounted() {
+ this.$_resizeHandler = debounce(() => {
+ if (this.chart) {
+ this.chart.resize()
+ }
+ }, 100)
+ this.$_initResizeEvent()
+ this.$_initSidebarResizeEvent()
+ },
+ beforeDestroy() {
+ this.$_destroyResizeEvent()
+ this.$_destroySidebarResizeEvent()
+ },
+ // to fixed bug when cached by keep-alive
+ // https://github.com/PanJiaChen/vue-element-admin/issues/2116
+ activated() {
+ this.$_initResizeEvent()
+ this.$_initSidebarResizeEvent()
+ },
+ deactivated() {
+ this.$_destroyResizeEvent()
+ this.$_destroySidebarResizeEvent()
+ },
+ methods: {
+ // use $_ for mixins properties
+ // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+ $_initResizeEvent() {
+ window.addEventListener('resize', this.$_resizeHandler)
+ },
+ $_destroyResizeEvent() {
+ window.removeEventListener('resize', this.$_resizeHandler)
+ },
+ $_sidebarResizeHandler(e) {
+ if (e.propertyName === 'width') {
+ this.$_resizeHandler()
+ }
+ },
+ $_initSidebarResizeEvent() {
+ this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+ this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+ },
+ $_destroySidebarResizeEvent() {
+ this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+ }
+ }
+}
diff --git a/src/views/databoard/utils/dcs.js b/src/views/databoard/utils/dcs.js
new file mode 100644
index 00000000..0edd8ff5
--- /dev/null
+++ b/src/views/databoard/utils/dcs.js
@@ -0,0 +1,34 @@
+import { connectWebsocket, closeWebsocket } from './../utils/websocket'
+import store from "@/store";
+
+// 创建dcs链接
+export const getDcsMsg = () => {
+ const userId = 'dcsmsg' + new Date().getTime()
+ connectWebsocket(
+ // 测试地址
+ 'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ console.log('成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ switch (msgData?.type) {
+ case "FanFrequencyInfo": {
+ store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+ break;
+ }
+ case "KilnInfo": {
+ store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+ break;
+ }
+ default:
+ console.log('++++++++')
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+ )
+}
\ No newline at end of file
diff --git a/src/views/databoard/utils/mes.js b/src/views/databoard/utils/mes.js
new file mode 100644
index 00000000..0edd8ff5
--- /dev/null
+++ b/src/views/databoard/utils/mes.js
@@ -0,0 +1,34 @@
+import { connectWebsocket, closeWebsocket } from './../utils/websocket'
+import store from "@/store";
+
+// 创建dcs链接
+export const getDcsMsg = () => {
+ const userId = 'dcsmsg' + new Date().getTime()
+ connectWebsocket(
+ // 测试地址
+ 'ws://10.70.180.10:8081/xc-screen/websocket/'+userId,
+ // 传递给后台的数据
+ '',
+ // 成功拿到后台返回的数据的回调函数
+ (data) => {
+ console.log('成功的回调函数, 接收到的data数据: ', data)
+ let msgData = JSON.parse(data)
+ switch (msgData?.type) {
+ case "FanFrequencyInfo": {
+ store.dispatch({type: "websocket/setFanFrequencyInfo", payload:msgData.data.FanFrequencyInfo})
+ break;
+ }
+ case "KilnInfo": {
+ store.dispatch({type: "websocket/setKilnInfo", payload: msgData.data.kilnInfo})
+ break;
+ }
+ default:
+ console.log('++++++++')
+ }
+ },
+ // websocket连接失败的回调函数
+ (err) => {
+ console.log('失败的回调函数', err)
+ }
+ )
+}
\ No newline at end of file
diff --git a/src/views/databoard/utils/websocket.js b/src/views/databoard/utils/websocket.js
new file mode 100644
index 00000000..52fbd44b
--- /dev/null
+++ b/src/views/databoard/utils/websocket.js
@@ -0,0 +1,204 @@
+// websocket实例
+let wsObj = null;
+// ws连接地址
+let wsUrl = null;
+// let userId = null;
+// 是否执行重连 true/不执行 ； false/执行
+let lockReconnect = false;
+// 重连定时器
+let wsCreateHandler = null;
+// 连接成功，执行回调函数
+let messageCallback = null;
+// 连接失败，执行回调函数
+let errorCallback = null;
+// 发送给后台的数据
+let sendDatas = {};
+
+
+/**
+ * 发起websocket请求函数
+ * @param {string} url ws连接地址
+ * @param {Object} agentData 传给后台的参数
+ * @param {function} successCallback 接收到ws数据，对数据进行处理的回调函数
+ * @param {function} errCallback ws连接错误的回调函数
+ */
+export const connectWebsocket = (url, agentData, successCallback, errCallback) => {
+ wsUrl = url;
+ createWebSoket();
+ messageCallback = successCallback;
+ errorCallback = errCallback;
+ sendDatas = agentData;
+}
+
+// 手动关闭websocket （这里手动关闭会执行onclose事件）
+export const closeWebsocket = () => {
+ if (wsObj) {
+ writeToScreen('手动关闭websocket');
+ wsObj.close() // 关闭websocket
+ // wsObj.onclose() // 关闭websocket(如果上面的关闭不生效就加上这一条)
+ // 关闭重连
+ lockReconnect = true;
+ wsCreateHandler && clearTimeout(wsCreateHandler);
+ // 关闭心跳检查
+ heartCheck.stop();
+ }
+}
+
+// 创建ws函数
+const createWebSoket = () => {
+ if (typeof (WebSocket) === 'undefined') {
+ writeToScreen("您的浏览器不支持WebSocket，无法获取数据");
+ return false
+ }
+ // const host = window.location.host;
+ // userId = GetQueryString("userId");
+ // wsUrl = "ws://" + host + "/websoket" + userId;
+
+ try {
+ wsObj = new WebSocket(wsUrl);
+ initWsEventHandle();
+ } catch (e) {
+ writeToScreen("连接异常，开始重连");
+ reconnect();
+ }
+}
+
+const initWsEventHandle = () => {
+ try {
+ // 连接成功
+ wsObj.onopen = (event) => {
+ onWsOpen(event);
+ heartCheck.start();
+ }
+
+ // 监听服务器端返回的信息
+ wsObj.onmessage = (event) => {
+ onWsMessage(event);
+ heartCheck.start();
+ }
+
+ wsObj.onclose = (event) => {
+ writeToScreen('onclose执行关闭事件');
+ onWsClose(event);
+ }
+
+ wsObj.onerror = (event) => {
+ writeToScreen('onerror执行error事件，开始重连');
+ onWsError(event);
+ reconnect();
+ }
+ } catch (err) {
+ writeToScreen('绑定事件没有成功，开始重连');
+ reconnect();
+ }
+}
+
+const onWsOpen = (event) => {
+ writeToScreen('CONNECT');
+ // // 客户端与服务器端通信
+ // wsObj.send('我发送消息给服务端');
+ // 添加状态判断，当为OPEN时，发送消息
+ if (wsObj.readyState === wsObj.OPEN) { // wsObj.OPEN = 1
+ // 发给后端的数据需要字符串化
+ wsObj.send(JSON.stringify(sendDatas));
+ }
+ if (wsObj.readyState === wsObj.CLOSED) { // wsObj.CLOSED = 3
+ writeToScreen('wsObj.readyState=3, ws连接异常，开始重连');
+ reconnect();
+ errorCallback(event);
+ }
+}
+const onWsMessage = (event) => {
+ const jsonStr = event.data;
+ writeToScreen('onWsMessage接收到服务器的数据: ', jsonStr);
+ messageCallback(jsonStr);
+}
+const onWsClose = (event) => {
+ writeToScreen('DISCONNECT');
+ // e.code === 1000 表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。
+ // e.code !== 1000 表示非正常关闭。
+ console.log('onclose event: ', event)
+ if (event && event.code !== 1000) {
+ writeToScreen('非正常关闭');
+ errorCallback(event);
+ // 如果不是手动关闭，这里的重连会执行；如果调用了手动关闭函数，这里重连不会执行
+ reconnect();
+ }
+}
+const onWsError = (event) => {
+ writeToScreen('onWsError: ', event.data);
+ errorCallback(event);
+}
+
+const writeToScreen = (massage) => {
+ console.log(massage);
+}
+
+// 重连函数
+const reconnect = () => {
+ if (lockReconnect) {
+ return;
+ }
+ writeToScreen('3秒后重连');
+ lockReconnect = true;
+ // 没连接上会一直重连，设置延迟避免请求过多
+ wsCreateHandler && clearTimeout(wsCreateHandler);
+ wsCreateHandler = setTimeout(() => {
+ writeToScreen('重连...' + wsUrl);
+ createWebSoket();
+ lockReconnect = false;
+ writeToScreen('重连完成');
+ }, 3000);
+}
+
+// 从浏览器地址中获取对应参数
+const GetQueryString = (name) => {
+ let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ // 获取url中 ? 符后的字符串并正则匹配
+ let r = window.location.search.substr(1).match(reg);
+ let context = "";
+ r && (context = r[2]);
+ reg = null;
+ r = null;
+ return context;
+}
+
+
+// 心跳检查（看看websocket是否还在正常连接中）
+let heartCheck = {
+ timeout: 15000,
+ timeoutObj: null,
+ serverTimeoutObj: null,
+ // 重启
+ reset() {
+ clearTimeout(this.timeoutObj);
+ clearTimeout(this.serverTimeoutObj);
+ this.start();
+ },
+ // 停止
+ stop() {
+ clearTimeout(this.timeoutObj);
+ clearTimeout(this.serverTimeoutObj);
+ },
+ // 开启定时器
+ start() {
+ this.timeoutObj && clearTimeout(this.timeoutObj);
+ this.serverTimeoutObj && clearTimeout(this.serverTimeoutObj);
+ // 15s之内如果没有收到后台的消息，则认为是连接断开了，需要重连
+ this.timeoutObj = setTimeout(() => {
+ writeToScreen("心跳检查，发送ping到后台");
+ try {
+ const datas = { ping: true };
+ wsObj.send(JSON.stringify(datas));
+ } catch (err) {
+ writeToScreen("发送ping异常");
+ }
+ console.log("内嵌定时器this.serverTimeoutObj: ", this.serverTimeoutObj)
+ // 内嵌定时器
+ this.serverTimeoutObj = setTimeout(() => {
+ writeToScreen("没有收到后台的数据，重新连接");
+ reconnect();
+ }, this.timeout)
+ }, this.timeout)
+ }
+}
\ No newline at end of file
diff --git a/src/views/monitoring/equipmentFullParams/index.vue b/src/views/monitoring/equipmentFullParams/index.vue
index 463c788c..0601cd16 100644
--- a/src/views/monitoring/equipmentFullParams/index.vue
+++ b/src/views/monitoring/equipmentFullParams/index.vue
@@ -44,6 +44,7 @@ import { Message } from 'element-ui';
import LocalDataManager from './utils/local-data-manager';
// import response from './response';
import moment from 'moment';
+import { parseTime } from '@/utils/ruoyi'
export default {
name: 'EquipmentFullParams',
@@ -51,9 +52,9 @@ export default {
props: {},
data() {
const now = new Date();
- const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
- const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
- const aWeekAgo = today - 3600 * 1000 * 24 * 7;
+ // const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
+ const today = new Date().getTime();
+ const tenminAgo = today - (10 * 60 * 1000);
return {
searchBarFormConfig: [
{
@@ -73,7 +74,7 @@ export default {
{
type: 'datePicker',
label: '时间段',
- dateType: 'daterange', // datetimerange
+ dateType: 'datetimerange', // datetimerange
format: 'yyyy-MM-dd HH:mm:ss',
// valueFormat: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'timestamp',
@@ -94,13 +95,19 @@ export default {
],
queryParams: {
id: null,
- time: [new Date(aWeekAgo), new Date(today)],
+ time: [tenminAgo, today],
},
tableList: [
// {
// key: 'base-table__key__1',
- // tableProps: [],
- // list: [],
+ // tableProps: [{
+ // prop: 'name',
+ // label: 'name'
+ // }],
+ // dataManager: {dataList: [{name: '1'}]},
+ // list: [{
+ // name: '11'
+ // }],
// pageNo: 1,
// pageSize: 3,
// total: 0,
@@ -122,6 +129,11 @@ export default {
'defaultSelect',
to.params.equipmentCode
);
+ vm.$set(
+ vm.searchBarFormConfig[2],
+ 'defaultSelect',
+ vm.queryParams.time
+ );
vm.handleQuery();
});
} else {
@@ -268,11 +280,17 @@ export default {
async handleSearchBarBtnClick({ btnName, timeVal }) {
if (timeVal && timeVal.length > 0) {
- this.queryParams.time = timeVal;
+ if (timeVal[1] - timeVal[0] <= 10 * 60 * 1000) {
+ this.queryParams.time = timeVal;
+ await this.handleQuery();
+ } else {
+ this.$message.warning('时间范围最大一小时限制！')
+ }
} else {
this.queryParams.time = [];
+ this.$message.warning('时间段必选！')
}
- await this.handleQuery();
+
},
handleEmitFun(table, val) {
@@ -295,9 +313,12 @@ export default {
}
.tables {
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 18px;
+ /* display: grid; */
+ /* grid-template-columns: 1fr 1fr; */
+ /* gap: 18px; */
+ display: flex;
+ flex-direction: column;
+ width: 100%;
}
.tables >>> .baseTable {
@@ -306,5 +327,6 @@ export default {
.custom-table {
overflow-x: hidden;
+ margin-bottom: 10px;
}
diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue
index 341d4883..9f925444 100644
--- a/src/views/specialEquipment/basic/FireFighthing.vue
+++ b/src/views/specialEquipment/basic/FireFighthing.vue
@@ -170,19 +170,19 @@ export default {
{ width: 256, prop: 'code', label: '设备编码' },
{ prop: 'location', label: '位置' },
{ prop: 'responsiblePeopleName', label: '负责人' },
- { prop: 'dueDate', label: '有效期至' },
+ { prop: 'dueTime', label: '有效期至' },
{ prop: 'remark', label: '备注' },
],
searchBarFormConfig: [
{
type: 'input',
- label: '名称',
+ label: '设备名称',
placeholder: '请输入设备名称',
param: 'name',
},
{
type: 'input',
- label: '编码',
+ label: '设备编码',
placeholder: '请输入设备编码',
param: 'code',
},
@@ -251,7 +251,7 @@ export default {
{
datetime: true,
label: '有效期至',
- prop: 'dueDate',
+ prop: 'dueTime',
bind: { clearable: true },
},
{},
diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue
index 25cd5a61..b91767fb 100644
--- a/src/views/specialEquipment/basic/Safety.vue
+++ b/src/views/specialEquipment/basic/Safety.vue
@@ -175,13 +175,13 @@ export default {
searchBarFormConfig: [
{
type: 'input',
- label: '名称',
+ label: '设备名称',
placeholder: '请输入设备名称',
param: 'name',
},
{
type: 'input',
- label: '编码',
+ label: '设备编码',
placeholder: '请输入设备编码',
param: 'code',
},
diff --git a/src/views/specialEquipment/check/Record-add.vue b/src/views/specialEquipment/check/Record-add.vue
index c5935113..3da17625 100644
--- a/src/views/specialEquipment/check/Record-add.vue
+++ b/src/views/specialEquipment/check/Record-add.vue
@@ -50,10 +50,16 @@
-
-
-
+
+
+
+