@@ -259,13 +259,13 @@ const pageInfo = reactive({
});
const total = ref(10);
onMounted(() => {
- getSiteDetail(siteId).then((res) => {
- siteName.value = res.data.siteName
- });
+ // getSiteDetail(siteId).then((res) => {
+ // siteName.value = res.data.siteName
+ // });
})
const handleGoSiteOrIndex = () => {
if (type === 's') {
- router.push('/site/'+userId)
+ router.push('/site/' + userId)
} else if (type === 'i') {
router.push('/')
}
@@ -279,16 +279,18 @@ const getList = () => {
total.value = res.data.total
tunnelList.value = res.data.rows
showFirst.value = total.value / pageInfo.pageSize >= 1;
+ } else {
+ ElMessage.warning(res.msg)
}
})
}
getList()
-const firstPage=()=>{
+const firstPage = () => {
pageInfo.pageNum = 1
getList()
}
-const lastPage=()=>{
- pageInfo.pageNum = total.value/pageInfo.pageSize
+const lastPage = () => {
+ pageInfo.pageNum = total.value / pageInfo.pageSize
getList()
}
//点击页码进行分页功能
@@ -312,7 +314,7 @@ const handleSubmit = (instance) => {
ElMessage.success('新增成功')
getList()
isVisited.value = false
- }else {
+ } else {
ElMessage.warning(res.msg)
}
})
@@ -324,17 +326,17 @@ const handleSubmit = (instance) => {
const handleGoToEditTunnel = (tunnelId) => {
isEdit.value = true
if (type === 's') {
- router.push('/edit/' + tunnelId + '/s/'+userId)
+ router.push('/edit/' + tunnelId + '/s/' + userId)
} else if (type === 'i') {
- router.push('/edit/' + tunnelId + '/i/'+userId)
+ router.push('/edit/' + tunnelId + '/i/' + userId)
}
}
const handleChooseAll = () => {
tunnelList.value.map(item => {
item.checked = !item.checked
- if(item.checked&&!item.isDefault){
+ if (item.checked && !item.isDefault) {
tunnelIds.value.push(item.tunnelId)
- }else if(!item.checked&&!item.isDefault){
+ } else if (!item.checked && !item.isDefault) {
tunnelIds.value.map((newItem, index) => {
if (newItem === item.tunnelId) {
tunnelIds.value.splice(index, 1)
@@ -345,9 +347,9 @@ const handleChooseAll = () => {
}
const handleEditDevice = (tunnelId) => {
if (type === 's') {
- router.push('/device/' + tunnelId + '/s/'+userId)
+ router.push('/device/' + tunnelId + '/s/' + userId)
} else if (type === 'i') {
- router.push('/device/' + tunnelId + '/i/'+userId)
+ router.push('/device/' + tunnelId + '/i/' + userId)
}
}
const restFrom = () => {
@@ -388,23 +390,23 @@ const handleMoreDelete = () => {
if (tunnelIds.value.length === 0) {
ElMessage.warning('请先选择隧道进行删除')
} else {
- ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- customClass: 'delBox'
- }).then(() => {
- deleteTunnel(tunnelIds.value).then(res => {
- if (res.code === 1000) {
- ElMessage.success(res.msg)
- getList()
- tunnelIds.value = []
- tunnelNameList.value = []
- } else {
- ElMessage.error(res.msg)
- }
- })
+ ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ customClass: 'delBox'
+ }).then(() => {
+ deleteTunnel(tunnelIds.value).then(res => {
+ if (res.code === 1000) {
+ ElMessage.success(res.msg)
+ getList()
+ tunnelIds.value = []
+ tunnelNameList.value = []
+ } else {
+ ElMessage.error(res.msg)
+ }
})
+ })
}
}
@@ -628,10 +630,10 @@ const handleMoreDelete = () => {
> span:last-child {
- padding:1px 8px;
+ padding: 1px 8px;
font-size: 32px;
border: 2px solid #05FEFF;
- border-radius:10px;
+ border-radius: 10px;
position: relative;
}
}
diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue
index 3aa3850..ec9b912 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -7,6 +7,8 @@
隧道总长度: {{ tunnelLength }}米
当前施工长度: {{ constructionLength }}米
+ 隧道总长度: {{ tunnelLength }}米
+ 当前施工长度: {{ constructionLength }}米
@@ -80,7 +82,7 @@ import { dateFormat } from "@/utils/date.js";
import { getToken } from "@/utils/auth";
import { useAuthStore } from "@/store/userstore.js";
import { getLargeScreen, getLargeScreenInfo, getTunnelBySiteId } from "@/api/largeScreen";
-import { ElMessageBox } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
import { getUserInfo } from "@/api/login";
import { initSceneData } from "@/api/tunnelScene";
import { getSiteDetail } from "../../api/site";
@@ -130,145 +132,159 @@ const getUser = () => {
})
}
const getDefaultSite = (siteId) => {
- // console.log('siteList.value',siteList.value)
- // getSiteDetail(siteId).then((res) => {
- // console.log('res',res)
- // });
-}
-const getOtherInfo = () => {
- getLargeScreenInfo().then((res) => {
- if (res?.code === 1000) {
- routeList.value = res.data.routeList
- siteList.value = res.data.siteOption
- currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
- currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
- getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
- }
- });
-};
-const getScreenInfo = (id) => {
- tunnelId.value = id
- getLargeScreen(id).then((res) => {
- if (res?.code === 1000) {
- largeScreenData.value = res.data;
- }
- });
- initSceneData(id).then((res) => {
- tunnelLength.value = res.data.tunnelLength
- constructionLength.value = res.data.constructionLength
- })
-};
-//根据站点id获取隧道信息
-const getTunnel = (id) => {
- getTunnelBySiteId(id).then((res) => {
- if (res?.code === 1000) {
- tunnelList.value = res.data
- getScreenInfo(res.data[0].value)
- }
- });
-}
-const changeTunnel = (e) => {
- let newObj = {}
- tunnelList.value.forEach((item, index) => {
- if (index === e) {
- newObj = item
- }
- })
- getScreenInfo(newObj.value)
- // nextTick(() => {
- // showFan.value = true;
- // });
-}
-const manageSelect = (index) => {
- console.log("首页点击-", index);
- if (index === 0) {
- router.push("/site" + '/' + currentUserId.value);
- } else if (index === 1) {
- router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
- } else if (index === 2) {
- router.push("/user/" + currentSiteId.value);
+ const getDefaultSite = (siteId) => {
+ // console.log('siteList.value',siteList.value)
+ // getSiteDetail(siteId).then((res) => {
+ // console.log('res',res)
+ // });
}
-};
-const handleChangeSite = (item) => {
- currentSite.value = item.label
- currentSiteId.value = item.value
- getTunnel(item.value)
-}
-const closeLeft = () => {
- drawerLeft.value = !drawerLeft.value;
-};
-const closeRight = () => {
- drawerRight.value = !drawerRight.value;
-};
-const handleLogout = () => {
- ElMessageBox.confirm(`确认退出登录吗`, '系统提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- authStore.userLogout();
- router.push("/login");
- })
-};
-const previousBtn = () => {
- tunnelBtn.value.prev();
-};
-const nextBtn = () => {
- tunnelBtn.value.next();
-};
-
-const initWebSocket = () => {
- // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
- let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
- console.log(wsUrl);
- socket = new WebSocket(wsUrl);
- //连接发生错误的回调方法
- socket.onerror = function () {
- console.log("ws连接发生错误");
+ const getOtherInfo = () => {
+ getLargeScreenInfo().then((res) => {
+ if (res?.code === 1000) {
+ routeList.value = res.data.routeList
+ siteList.value = res.data.siteOption
+ currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
+ currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
+ getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
+ currentSiteId.value = res.data.siteOption[res.data.siteOption.length - 1].value
+ currentSite.value = res.data.siteOption[res.data.siteOption.length - 1].label
+ getTunnel(res.data.siteOption[res.data.siteOption.length - 1].value)
+ }
+ });
};
- //连接成功建立的回调方法
- socket.onopen = function () {
- console.log("ws连接成功");
- };
- //接收到消息的回调方法
- socket.onmessage = function (event) {
- console.log("服务器返回的信息: ", JSON.parse(event.data));
- const type = JSON.parse(event.data).type;
- const data = JSON.parse(event.data).data;
- if (type === "equipment") {
- data.forEach((item) => {
- if (item.typeKey === "frequency") {
- socketData.leftData = data;
- } else if (item.typeKey === "windPressure") {
- socketData.windPressure = data;
- } else if (item.typeKey === "sensor") {
- socketData.sensor = data;
+ const getScreenInfo = (id) => {
+ if (id) {
+ tunnelId.value = id
+ getLargeScreen(id).then((res) => {
+ if (res?.code === 1000) {
+ largeScreenData.value = res.data;
+ } else {
+ ElMessage.warning(res.msg)
}
});
+ initSceneData(id).then((res) => {
+ tunnelLength.value = res.data.tunnelLength
+ constructionLength.value = res.data.constructionLength
+ })
}
};
- //连接关闭的回调方法
- socket.onclose = function () {
- console.log("ws连接关闭");
- // initWebSocket()
+ //根据站点id获取隧道信息
+ const getTunnel = (id) => {
+ getTunnelBySiteId(id).then((res) => {
+ if (res?.code === 1000) {
+ tunnelList.value = res.data
+ getScreenInfo(res.data[0]?.value)
+ }
+ });
+ }
+ const changeTunnel = (e) => {
+ let newObj = {}
+ tunnelList.value.forEach((item, index) => {
+ if (index === e) {
+ newObj = item
+ }
+ })
+ getScreenInfo(newObj.value)
+ // nextTick(() => {
+ // showFan.value = true;
+ // });
+ }
+ const manageSelect = (index) => {
+ console.log("首页点击-", index);
+ if (index == '站点管理') {
+ if (currentUserId.value) {
+ router.push("/site" + '/' + currentUserId.value);
+ }
+ } else if (index == '隧道管理') {
+ if (currentSiteId.value && currentUserId.value) {
+ router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
+ }
+ } else if (index == '用户管理') {
+ if (currentSiteId.value) {
+ router.push("/user/" + currentSiteId.value);
+ }
+ }
};
- setInterval(() => {
- socket.send(JSON.stringify(send));
- }, 30000);
-};
-const closeSocket = () => {
- socket.close();
-};
-initWebSocket();
+ const handleChangeSite = (item) => {
+ currentSite.value = item.label
+ currentSiteId.value = item.value
+ getTunnel(item.value)
+ }
+ const closeLeft = () => {
+ drawerLeft.value = !drawerLeft.value;
+ };
+ const closeRight = () => {
+ drawerRight.value = !drawerRight.value;
+ };
+ const handleLogout = () => {
+ ElMessageBox.confirm(`确认退出登录吗`, '系统提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ authStore.userLogout();
+ router.push("/login");
+ })
+ };
+ const previousBtn = () => {
+ tunnelBtn.value.prev();
+ };
+ const nextBtn = () => {
+ tunnelBtn.value.next();
+ };
+
+ const initWebSocket = () => {
+ // let wsUrl = `ws://192.168.31.175:9000/websocket/equipment/${token}/${serialNumber.value}`
+ let wsUrl = `ws://web-tunnel.feashow.com/api/wstunnel/websocket/equipment/${token}/${serialNumber.value}`;
+ console.log(wsUrl);
+ socket = new WebSocket(wsUrl);
+ //连接发生错误的回调方法
+ socket.onerror = function () {
+ console.log("ws连接发生错误");
+ };
+ //连接成功建立的回调方法
+ socket.onopen = function () {
+ console.log("ws连接成功");
+ };
+ //接收到消息的回调方法
+ socket.onmessage = function (event) {
+ console.log("服务器返回的信息: ", JSON.parse(event.data));
+ const type = JSON.parse(event.data).type;
+ const data = JSON.parse(event.data).data;
+ if (type === "equipment") {
+ data.forEach((item) => {
+ if (item.typeKey === "frequency") {
+ socketData.leftData = data;
+ } else if (item.typeKey === "windPressure") {
+ socketData.windPressure = data;
+ } else if (item.typeKey === "sensor") {
+ socketData.sensor = data;
+ }
+ });
+ }
+ };
+ //连接关闭的回调方法
+ socket.onclose = function () {
+ console.log("ws连接关闭");
+ // initWebSocket()
+ };
+ setInterval(() => {
+ socket.send(JSON.stringify(send));
+ }, 30000);
+ };
+ const closeSocket = () => {
+ socket.close();
+ };
+ initWebSocket();
-watch(
- () => tunnelId.value,
- (now) => {
- tunnelId.value = now
- },
- { deep: true }
-)
+ watch(
+ () => tunnelId.value,
+ (now) => {
+ tunnelId.value = now
+ },
+ { deep: true }
+ )