-
-
+
+
+
+ :close-on-click-modal="false" :close-on-press-escape="false">
-
+ :transducer-data="largeScreenData" :loading="showFanLoading" :tunnel-id="tunnelId"/>
+
+ :close-on-click-modal="false" :close-on-press-escape="false">
+ :loading="showWindLoading"/>
+ :air-data="largeScreenData"/>
+ :loading="showBadLoading"/>
@@ -64,7 +68,7 @@
+ @change="changeTunnel">
{{ item.label }}
@@ -91,12 +95,12 @@
+ v-if="roleKey !== 'administrator'">
-
-
+ :teleported="false" clearable filterable>
+
+
@@ -106,14 +110,14 @@
-
-
-
+ style="background-color: #011c29;--el-table-border-color: none;"
+ :header-cell-style="{ backgroundColor: '#064B66', color: '#fff', fontSize: '40px', borderBottom: 'none' }"
+ :data="alarmList">
+
+
+
+ v-if="roleKey !== 'administrator'">
{{ scope.row.lookupStatus ? '已读' : '未读' }}
@@ -125,15 +129,15 @@
详情
删除
+ link>删除
+ :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
+ @current-change="handleCurrentChange" :hide-on-single-page="true"/>
@@ -151,9 +155,9 @@ import AirInfo from "@/components/content/airInfo/AirInfo.vue";
import BadGasInfo from "@/components/content/badGasInfo/BadGasInfo.vue";
import ManageBtn from "@/components/manageBtn/index.vue";
import TunnelTitle from "@/components/tunnelTitle/index.vue";
-import { dateFormat } from "@/utils/date.js";
-import { getToken } from "@/utils/auth";
-import { useAuthStore } from "@/store/userstore.js";
+import {dateFormat} from "@/utils/date.js";
+import {getToken} from "@/utils/auth";
+import {useAuthStore} from "@/store/userstore.js";
import {
getLargeScreen,
getLargeScreenInfo,
@@ -164,10 +168,10 @@ import {
updateAlarmState
} from "@/api/largeScreen";
import {ElLoading, ElMessage, ElMessageBox} from "element-plus";
-import { getUserInfo } from "@/api/login";
-import { initSceneData } from "@/api/tunnelScene";
-import { getTunnelList } from "@/api/tunnelManage";
-import { debounce } from 'lodash'
+import {getUserInfo} from "@/api/login";
+import {initSceneData} from "@/api/tunnelScene";
+import {getTunnelList} from "@/api/tunnelManage";
+import {debounce} from 'lodash'
const authStore = useAuthStore();
@@ -189,6 +193,7 @@ const showFanLoading = ref(0)
const showUsedLoading = ref(0)
const showWindLoading = ref(0)
const showBadLoading = ref(0)
+const isStartSimulate = ref(true);
const drawerRight = ref(true);
const showMenu = ref(false);
const currentSiteId = ref(0);
@@ -269,8 +274,8 @@ onMounted(() => {
showFan.value = true;
});
});
-const startSimulate=()=>{
-
+const startSimulate = () => {
+ isStartSimulate.value = false
}
const changeName = (id) => {
for (let item of equipmentOption.value) {
@@ -419,13 +424,13 @@ const getScreenInfo = (id) => {
// })
res.data.sensorList.forEach((item) => {
if (
- item.equipmentType === "dust" ||
- item.equipmentType === "carbonDioxide" ||
- item.equipmentType === "carbonMonoxide" ||
- item.equipmentType === "hydrogenSulfide" ||
- item.equipmentType === "sulfurDioxide" ||
- item.equipmentType === "sulfurMonoxide" ||
- item.equipmentType === "nitrogenDioxide"
+ item.equipmentType === "dust" ||
+ item.equipmentType === "carbonDioxide" ||
+ item.equipmentType === "carbonMonoxide" ||
+ item.equipmentType === "hydrogenSulfide" ||
+ item.equipmentType === "sulfurDioxide" ||
+ item.equipmentType === "sulfurMonoxide" ||
+ item.equipmentType === "nitrogenDioxide"
) {
showBadLoading.value = 0
} else {
@@ -493,7 +498,9 @@ const getTunnel = (id) => {
});
}
const changeTunnel = (e) => {
- socket.close()
+ if(socket){
+ socket.close()
+ }
let newObj = {}
tunnelList.value.forEach((item, index) => {
if (index === e) {
@@ -527,10 +534,14 @@ const manageSelect = (index) => {
router.push("/user/" + localStorage.getItem('currentSiteId'));
}
}
- socket.close()
+ if(socket){
+ socket.close()
+ }
};
const handleChangeSite = debounce((item) => {
- socket.close()
+ if(socket){
+ socket.close()
+ }
currentSite.value = item.label
currentSiteId.value = item.value
getTunnel(item.value)
@@ -685,10 +696,12 @@ const initWebSocket = () => {
text-align: center;
margin-left: 40px;
font-size: 38px;
- &:hover{
+
+ &:hover {
color: #f7b500;
}
}
+
#main {
height: 100%;
width: 100%;
@@ -796,7 +809,7 @@ const initWebSocket = () => {
height: 70px !important;
line-height: 70px !important;
- >span {
+ > span {
color: #FFFFFF;
}
}
@@ -870,7 +883,7 @@ const initWebSocket = () => {
line-height: 40px;
font-size: 36px;
- &>div {
+ & > div {
flex: 1;
text-align: center;
cursor: pointer;
@@ -959,11 +972,11 @@ const initWebSocket = () => {
}
}
- >span:first-child {
+ > span:first-child {
margin-right: 60px;
}
- >span:last-child {
+ > span:last-child {
margin-left: 71px;
}
diff --git a/src/views/tunnel-simulate/tunnel-list.vue b/src/views/tunnel-simulate/tunnel-list.vue
index 8b50ca5..b2a614d 100644
--- a/src/views/tunnel-simulate/tunnel-list.vue
+++ b/src/views/tunnel-simulate/tunnel-list.vue
@@ -8,16 +8,6 @@
-
隧道总长度: {{ tunnelLength }}米
- 开始模拟
-
+ 开始模拟
+
+ 模拟爆破
+ 结束模拟
+
+
@@ -16,15 +20,15 @@
{{
- item.label
- }}
+ item.label
+ }}
-
+ @click="isVisited = true; getAlarmList()">
+
@@ -36,27 +40,27 @@
-
{{ siteName }}
-
-
-
-
-
-
-
-
-
-
@@ -31,7 +21,7 @@
+
-
{{ item.tunnelName }}
@@ -48,17 +38,9 @@
-
-
-
-
去模拟
-
-
-
-
-
@@ -68,26 +50,11 @@
添加隧道
-
- 暂无图纸~ 请前往站点管理上传图纸~
-
-
-
-
-
-
-
-
{{ title }}
@@ -99,94 +66,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
是
@@ -248,48 +139,13 @@ const type = reactive(params.type)
const formRules = ref({
tunnelName: [{required: true, message: '请输入隧道名称', trigger: ['blur', 'change']}],
tunnelAlias: [{required: true, message: '请输入隧道简称', trigger: ['blur', 'change']}],
- serialNumberPrefix: [
- {required: true, message: '请输入序列号前缀', trigger: ['blur', 'change']},
- {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号前缀', trigger: ['blur', 'change']},
- {min: 14, max: 14, message: '隧道序列号前缀长度为14位', trigger: ['blur', 'change']},
- ],
- serialNumber: [
- {required: true, message: '请输入PLC序列号', trigger: ['blur', 'change']},
- {validator: validateNumber, message: '请输入英文、数字、英文数字组合的PLC序列号', trigger: ['blur', 'change']},
- {min: 16, max: 16, message: '隧道PLC序列号长度为16位', trigger: ['blur', 'change']},
- {validator: validateSerialNumberPrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
- ],
- serialNumberOne: [
- // {required: true, message: '请输入序列号2', trigger: ['blur', 'change']},
- // {validator: validateNumber, message: '请输入英文、数字、英文数字组合的序列号2', trigger: ['blur', 'change']},
- // { min:16,max:16,message: '隧道序列号2长度为16位',trigger: ['blur', 'change']},
- // {validator: validateSerialNumberOnePrefix, message: '同一隧道的序列号前缀需相同', trigger: ['blur', 'change']}
- ],
totalLength: [{required: true, message: '请输入隧道长度', trigger: ['blur', 'change']}],
constructionLength: [{required: true, message: '请输入施工长度', trigger: ['blur', 'change']}],
- referenceFrequency: [{required: true, message: '请输入基准频率', trigger: ['blur', 'change']}],
- upTime: [{required: true, message: '请选择升频时间', trigger: ['blur', 'change']}],
- upFrequency: [{required: true, message: '请输入升频率', trigger: ['blur', 'change']}],
- dropTime: [{required: true, message: '请选择降频时间', trigger: ['blur', 'change']}],
- dropFrequency: [{required: true, message: '请输入降频率', trigger: ['blur', 'change']}]
})
-let clickModel = ref(1)
const showFirst = ref(false)
const showOperation = ref(true)
const formInstance = ref()
const tunnelList = ref([])
-const coordsList = ref([
- {
- tunnelId: 1,
- coords: '767,1117,793,1182,2379,682,2437,454,2349,505,2298,666,2221,531,2153,578,2212,692,765,1126',
- }, {
- tunnelId: 1,
- coords: '863,1475,1135,1494,2321,1078,3023,801,3214,703,3288,752,2300,1154,1560,1438,1170,1554,844,1529',
- }, {
- tunnelId: 94,
- coords: '1181,1364,2105,622,2005,589,1116,1324'
- }
-])
const iconsList = ref([
{
icon: 'sd_icon_fj.png',
@@ -370,7 +226,7 @@ const total = ref(0);
onMounted(() => {
showOperation.value = localStorage.getItem('roleKey') !== 'tunnel_admin';
})
-const handleGoToSimulateTunnel=(tunnelId)=>{
+const handleGoToSimulateTunnel = (tunnelId) => {
router.push('/simulate/' + tunnelId)
}
const addSerialNumber = () => {
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 067aaa3..7dd632e 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -61,7 +61,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加序列号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hz
-
-
-
-
-
-
-
-
-
-
-
- Hz
-
-
-
-
-
+ {{initialIndex}}
@@ -113,7 +113,6 @@
-
{{ scope.row.lookupStatus ? '已读' : '未读' }}
@@ -485,7 +484,10 @@ const getTunnel = (id) => {
});
}
const changeTunnel = (e) => {
- socket.close()
+ console.info("🚀 ~method:'socket' -----", socket)
+ if(socket){
+ socket.close()
+ }
let newObj = {}
tunnelList.value.forEach((item, index) => {
if (index === e) {
@@ -519,10 +521,14 @@ const manageSelect = (index) => {
router.push("/user/" + localStorage.getItem('currentSiteId'));
}
}
- socket.close()
+ if(socket){
+ socket.close()
+ }
};
const handleChangeSite = debounce((item) => {
- socket.close()
+ if(socket){
+ socket.close()
+ }
currentSite.value = item.label
currentSiteId.value = item.value
getTunnel(item.value)