+
@@ -18,17 +18,17 @@ const props = defineProps({
default: []
},
})
-watch(() => props.list, (now) => {
- let newArr=[]
- btnList.value.forEach((btnList) => {
- now.forEach((item) => {
- if (btnList.route==item) {
- newArr.push(btnList)
- }
- })
- })
- btnList.value=newArr
-}, {deep: true});
+// watch(() => props.list, (now) => {
+// let newArr=[]
+// btnList.value.forEach((btnList) => {
+// now.forEach((item) => {
+// if (btnList.route==item) {
+// newArr.push(btnList)
+// }
+// })
+// })
+// btnList.value=newArr
+// }, {deep: true});
const emit = defineEmits(["update:modelValue", "select"]);
const btnList = ref([
{
@@ -56,14 +56,15 @@ const btnList = ref([
// name: '模拟仿真'
// },
])
+const newList=ref([])
const selectButton = ref(props.modelValue);
const getImageUrl = (name) => {
return new URL(`../../assets/images/topAndDown/${name}`, import.meta.url).href
}
-const select = (index) => {
+const select = (item,index) => {
if (selectButton.value === index) return;
selectButton.value = index;
emit("update:modelValue", index);
- emit("select", index);
+ emit("select", item.name);
};
diff --git a/src/router/index.js b/src/router/index.js
index cb01cf5..83a28a1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -85,6 +85,7 @@ const router = createRouter({
});
router.beforeEach((to, form, next) => {
NProgress.start()
+ console.log('token-----',getToken())
if (!getToken()) {
if (to.path === '/login') {
next()
@@ -94,12 +95,12 @@ router.beforeEach((to, form, next) => {
}
} else {
console.log('有token')
- if (to.path === '/login') {
- next('/')
- NProgress.done()
- } else {
+ // if (to.path === '/login') {
+ // next('/')
+ // NProgress.done()
+ // } else {
next()
- }
+ // }
}
})
router.afterEach(() => {
diff --git a/src/utils/request.js b/src/utils/request.js
index 10627aa..5befe96 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,13 +68,13 @@ serveice.interceptors.response.use(response=>{
window.location = '/login'
})
return Promise.reject('会话已过期,请重新登录')
- case 402:
- break;
- case 403:
- ElMessage.warning('禁止访问')
- removeToken()
- window.location = '/forbidden'
- break;
+ // case 402:
+ // break;
+ // case 403:
+ // ElMessage.warning('禁止访问')
+ // removeToken()
+ // window.location = '/forbidden'
+ // break;
case 404:
ElMessage.warning('不存在的地址')
break;
diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue
index 2d02bf8..18b311c 100644
--- a/src/views/edit/edit.vue
+++ b/src/views/edit/edit.vue
@@ -93,8 +93,8 @@ const handleSave = async () => {
tunnelName: form.value.tunnelName,
serialNumber: form.value.serialNumber,
remarks: form.value.remarks,
- // constructionLength:form.value.constructionLength,
- constructionLength: 500,
+ constructionLength:form.value.constructionLength,
+ // constructionLength: 500,
tunnelLength: form.value.totalLength,
isDefault: form.value.isDefault,
modelEquipmentList: await store.getEquipmentList(),
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 56a2938..3c5eb24 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -45,9 +45,9 @@ import {User, Lock, Key} from "@element-plus/icons-vue";
const router = useRouter();
const authStore = useAuthStore();
const loginForm = reactive({
- username: "admin",
+ // username: "admin",
password: "123456",
- // username: "",
+ username: "admin",
// password: "",
code: "",
uuid: "",
diff --git a/src/views/site/index.vue b/src/views/site/index.vue
index 3f7b6b3..997db05 100644
--- a/src/views/site/index.vue
+++ b/src/views/site/index.vue
@@ -169,7 +169,11 @@ const getList = () => {
...pageInfo
}).then((res) => {
total.value = res.data.total;
- showAddIcon.value = total.value % 6!==0;
+ if(total.value==0){
+
+ }else {
+ showAddIcon.value = total.value % 6!==0;
+ }
showFirst.value = total.value / pageInfo.pageSize > 1;
res.data.rows.map(item => {
if (item.tunnelList === null || item.tunnelList.length === 0) {
diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue
index 3a0196d..5dc6556 100644
--- a/src/views/tunnel-manage/index.vue
+++ b/src/views/tunnel-manage/index.vue
@@ -5,9 +5,9 @@
返回
@@ -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 988fdef..d3a7f2f 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -1,12 +1,12 @@
-
+
- 隧道总长度: {{tunnelLength}}米
- 当前施工长度: {{constructionLength}}米
+ 隧道总长度: {{ tunnelLength }}米
+ 当前施工长度: {{ constructionLength }}米
-
-
+
+
+
@@ -80,7 +81,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";
@@ -91,6 +92,7 @@ const selectIndex = ref(-1);
const showFan = ref(false);
const drawerLeft = ref(true);
const drawerRight = ref(true);
+const showMenu = ref(false);
const currentSiteId = ref(0);
const currentSite = ref("");
const siteList = ref([])
@@ -104,6 +106,32 @@ const tunnelLength = ref(0);
const constructionLength = ref(0);
const routeList = ref([]);
let socket = reactive("");
+const btnList = ref([
+ {
+ route: '/site',
+ icon: 'sp_icon_zdgl.png',
+ name: '站点管理'
+ },
+ {
+ route: '/tunnel',
+ icon: 'sp_icon_sdgl.png',
+ name: '隧道管理'
+ },
+ {
+ route: '/user',
+ icon: 'sp_icon_yhgl.png',
+ name: '用户管理'
+ },
+ // {
+ // route: '/system',
+ // icon: 'sp_icon_xtgl.png',
+ // name: '系统管理'
+ // },
+ // {
+ // icon: 'sp_icon_mngl.png',
+ // name: '模拟仿真'
+ // },
+])
const serialNumber = ref("SC00DY00GH00ELBT");
let token = getToken();
let send = {
@@ -128,7 +156,7 @@ const getUser = () => {
currentUserId.value = res.data.user.userId
})
}
-const getDefaultSite=(siteId)=>{
+const getDefaultSite = (siteId) => {
// console.log('siteList.value',siteList.value)
// getSiteDetail(siteId).then((res) => {
// console.log('res',res)
@@ -137,32 +165,46 @@ const getDefaultSite=(siteId)=>{
const getOtherInfo = () => {
getLargeScreenInfo().then((res) => {
if (res?.code === 1000) {
- routeList.value = res.data.routeList
+ let routeArr = [];
+ console.log(res.data.routeList,"res.data.routeList")
+ res.data.routeList.forEach((item, index) => {
+ for (let btn of btnList.value) {
+ if (item === btn.route){
+ routeArr.push(btn)
+ }
+ }
+ })
+ routeList.value = routeArr
+ showMenu.value = true
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)
}
});
};
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
- })
+ 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
+ })
+ }
};
//根据站点id获取隧道信息
const getTunnel = (id) => {
getTunnelBySiteId(id).then((res) => {
if (res?.code === 1000) {
tunnelList.value = res.data
- getScreenInfo(res.data[0].value)
+ getScreenInfo(res.data[0]?.value)
}
});
}
@@ -174,24 +216,34 @@ const changeTunnel = (e) => {
}
})
getScreenInfo(newObj.value)
- // nextTick(() => {
- // showFan.value = true;
- // });
+ 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);
+ 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);
+ }
}
};
const handleChangeSite = (item) => {
currentSite.value = item.label
currentSiteId.value = item.value
getTunnel(item.value)
+ showFan.value = false
+ nextTick(() => {
+ showFan.value = true;
+ });
}
const closeLeft = () => {
drawerLeft.value = !drawerLeft.value;
@@ -259,6 +311,15 @@ const closeSocket = () => {
socket.close();
};
initWebSocket();
+
+
+watch(
+ () => tunnelId.value,
+ (now) => {
+ tunnelId.value = now
+ },
+ {deep: true}
+)