@@ -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 ad25dd5..c33ee88 100644
--- a/src/views/tunnel/index.vue
+++ b/src/views/tunnel/index.vue
@@ -5,8 +5,8 @@
- 隧道总长度: {{tunnelLength}}米
- 当前施工长度: {{constructionLength}}米
+ 隧道总长度: {{ tunnelLength }}米
+ 当前施工长度: {{ constructionLength }}米
@@ -80,7 +80,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 {ElMessage,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";
@@ -128,7 +128,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)
@@ -139,25 +139,25 @@ const getOtherInfo = () => {
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)
}
});
};
const getScreenInfo = (id) => {
- if(id){
- tunnelId.value=id
+ if (id) {
+ tunnelId.value = id
getLargeScreen(id).then((res) => {
if (res?.code === 1000) {
largeScreenData.value = res.data;
- }else {
+ } else {
ElMessage.warning(res.msg)
}
});
initSceneData(id).then((res) => {
- tunnelLength.value=res.data.tunnelLength
- constructionLength.value=res.data.constructionLength
+ tunnelLength.value = res.data.tunnelLength
+ constructionLength.value = res.data.constructionLength
})
}
};
@@ -185,16 +185,15 @@ const changeTunnel = (e) => {
const manageSelect = (index) => {
console.log("首页点击-", index);
if (index == '站点管理') {
- if(currentUserId.value){
- router.push("/site"+'/'+currentUserId.value);
+ if (currentUserId.value) {
+ router.push("/site" + '/' + currentUserId.value);
}
} else if (index == '隧道管理') {
- console.log('无查看权限??',currentSiteId.value,currentUserId.value)
- // if(currentSiteId.value&¤tUserId.value){
- router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
- // }
+ if (currentSiteId.value && currentUserId.value) {
+ router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
+ }
} else if (index == '用户管理') {
- if(currentSiteId.value){
+ if (currentSiteId.value) {
router.push("/user/" + currentSiteId.value);
}
}
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index c9fe9f7..1b2849c 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -284,7 +284,7 @@ const handleSubmit = async (formInstance) => {
state:form.value.state,
userName: form.value.userName,
roleIds: [form.value.roleId],
- tunnelIds: form.value.tunnelIds
+ tunnelList: form.value.tunnelIds
}
if (title.value === '添加用户') {
await addUser(data).then(res => {