-
-
时间
-
- ![]()
+ ![]()
+
2022-20-10
+
+
+
- {{ item.title }}
+
+
{{ it }}
-
- 时间
-
-
- 2022-20-10
-
-
- 时间
-
-
- 2022-20-10
-
-
- 时间
-
-
- 2022-20-10
-
-
- 时间
-
-
- 2022-20-10
-
-
- 时间
-
-
- 2022-20-10
-
-
- 时间
-
-
- 2022-20-10
-
-
时间
-
-
- 2022-20-10
-返回
@@ -82,8 +55,12 @@
import { ref } from 'vue'
import Down from '@/assets/img/arrow/down.png'
import Top from '@/assets/img/arrow/top.png'
+import { useHistoryStore, useWebSocketStore } from '@/store'
+import { getDetailInfoById } from '@/mock/command'
const showDetailVisible = ref(false)
+const historyStore = useHistoryStore()
+const webSocketStore = useWebSocketStore()
const topContainer = () => {
const ele = document.getElementById('set_device_container')
@@ -95,7 +72,19 @@ const bottomContainer = () => {
ele.scrollTop = ele.scrollTop + 100
}
-const showDetailModal = () => {
+const topContainer2 = () => {
+ const ele = document.getElementById('tabledetail_device_container')
+ ele.scrollTop = ele.scrollTop - 100 < 0 ? 0 : ele.scrollTop - 100
+}
+
+const bottomContainer2 = () => {
+ const ele = document.getElementById('tabledetail_device_container')
+ ele.scrollTop = ele.scrollTop + 100
+}
+
+const showDetailModal = item => {
+ // 根据这个item获取详细信息
+ webSocketStore.sendCommandMsg(getDetailInfoById(item))
showDetailVisible.value = true
}
@@ -210,15 +199,36 @@ const showDetailModal = () => {
overflow: hidden;
background: url(../../../assets/img/history.png) no-repeat;
background-size: 100% 100%;
+ .top_arrow {
+ width: 40px;
+ height: 40px;
+ position: fixed;
+ right: 50px;
+ top: 145px;
+ z-index: 4;
+ }
+ .bottom_arrow {
+ width: 40px;
+ height: 40px;
+ position: fixed;
+ right: 50px;
+ bottom: 111px;
+ z-index: 4;
+ }
.table_wrap {
flex: 1;
+ width: 1220px;
display: flex;
justify-content: space-evenly;
align-items: center;
+ overflow: scroll;
.table_column {
height: 100%;
+ position: relative;
.title {
height: 80px;
+ position: sticky;
+ top: 0;
display: flex;
align-items: center;
justify-content: center;
@@ -228,6 +238,10 @@ const showDetailModal = () => {
line-height: normal;
letter-spacing: 0.07em;
color: #999999;
+ white-space: nowrap;
+ margin: 0 20px;
+ background: #f6f6f6;
+ z-index: 2;
}
.first_box {
position: relative;
@@ -257,7 +271,7 @@ const showDetailModal = () => {
display: flex;
align-items: center;
justify-content: flex-end;
- padding: 20px 30px;
+ padding: 20px 80px;
.return_btn {
width: 91px;
height: 40px;
diff --git a/src/mock/command.js b/src/mock/command.js
index d982c0d..de2b1ea 100644
--- a/src/mock/command.js
+++ b/src/mock/command.js
@@ -305,9 +305,15 @@ export const updateAllFormulaJSON = data => {
// 获取本机历史数据
export const getAllLocalHistoryData = {
- command: 'getAllLocalHistoryData',
- messageId: 'getAllLocalHistoryData',
+ command: 'disinfectionLogsGetList',
+ messageId: 'disinfectionLogsGetList',
}
// 根据消毒id获取本次消毒所有详细信息
-export const getDetailInfoById = id => {}
+export const getDetailInfoById = id => {
+ return {
+ command: 'disinfectionLogsGetRecord',
+ messageId: 'disinfectionLogsGetRecord',
+ disinfectionLogName: id,
+ }
+}
diff --git a/src/store/index.js b/src/store/index.js
index 14e2bce..c4a7553 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,6 +10,7 @@ import { usePreStore } from './modules/preinstall'
import { useAuditStore } from './modules/audit'
import { useFormulaStore } from './modules/formula'
import { useRunningStore } from './modules/running'
+import { useHistoryStore } from './modules/history'
const store = createPinia()
export default store
@@ -20,6 +21,7 @@ export {
useRunningStore,
useSettingStore,
useOperatorStore,
+ useHistoryStore,
useWebSocketStore,
useDeviceStore,
useEchartsStore,
diff --git a/src/store/modules/history.js b/src/store/modules/history.js
index 1c6150b..97a08db 100644
--- a/src/store/modules/history.js
+++ b/src/store/modules/history.js
@@ -17,4 +17,25 @@ export const useHistoryStore = defineStore({
this.detailData = detailData
},
},
+ getters: {
+ tableData(state) {
+ const result = []
+ const headerArr = state.detailData[0].split(',')
+ const len = headerArr.length
+ for (let i = 0; i < len; i++) {
+ const obj = {}
+ obj.title = headerArr[i]
+ let realData = []
+ state.detailData.map((item, index) => {
+ if (index != 0) {
+ const arr = item.split(',')
+ realData.push(arr[i])
+ }
+ })
+ obj.data = realData
+ result.push(obj)
+ }
+ return result
+ },
+ },
})
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 03980a9..03f063e 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -8,6 +8,7 @@ import { useDeviceStore } from './device'
import { useTestStore } from './test'
import { useAuditStore } from './audit'
import { useFormulaStore } from './formula'
+import { useHistoryStore } from './history'
import { useEchartsStore } from './echarts'
import { useRunningStore } from './running'
import { showSuccessToast, showFailToast } from 'vant'
@@ -38,6 +39,7 @@ export const useWebSocketStore = defineStore({
const auditStore = useAuditStore()
const formulaStore = useFormulaStore()
const runningStore = useRunningStore()
+ const historyStore = useHistoryStore()
init.connect()
init.ws.onmessage = function (ev) {
const { messageId, timeStamp } = JSON.parse(ev.data)
@@ -179,6 +181,20 @@ export const useWebSocketStore = defineStore({
}
case 'startDisinfection':
break
+ case 'disinfectionLogsGetList':
+ const { ackcode: disinfectionLogsCode, disinfectionLogList } =
+ JSON.parse(ev.data) || {}
+ if (disinfectionLogsCode == 0) {
+ historyStore.updateHistoryDataList(disinfectionLogList)
+ }
+ break
+ case 'disinfectionLogsGetRecord':
+ const { ackcode: logDetailCode, record } = JSON.parse(ev.data) || {}
+ const { content } = record || {}
+ if (logDetailCode == 0) {
+ historyStore.updateDetailData(content)
+ }
+ break
case 'stopDisinfection':
break
case 'exportUserBehaviorRecord':