diff --git a/src/components/content/tunnelScene/request/index.js b/src/components/content/tunnelScene/request/index.js index 601b910..9d95938 100644 --- a/src/components/content/tunnelScene/request/index.js +++ b/src/components/content/tunnelScene/request/index.js @@ -36,7 +36,6 @@ export const saveEquipment = (equipmentInfo, pointGap) => { } = originData; let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆 tempModelEquipmentList.push(toRaw(equipmentInfo)); - return new Promise((resolve, reject) => { apiSaveEquipment({ constructionLength: autoComputeConstructionLength( @@ -70,6 +69,13 @@ export const deleteEquipment = (equipmentId, pointGap) => { tempModelEquipmentList = tempModelEquipmentList.filter( (item) => item.equipmentId != equipmentId ); + console.log( + "del", + modelEquipmentList, + tempModelEquipmentList, + "id", + equipmentId + ); const { constructionLength, isDefault, @@ -123,6 +129,5 @@ function autoComputeConstructionLength(modelEquipmentList, pointGap) { maxLength = length; } }); - console.log("max", maxLength); return maxLength; } diff --git a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js index 766567a..372fc45 100644 --- a/src/components/content/tunnelScene/sceneClass/editEquipment/index.js +++ b/src/components/content/tunnelScene/sceneClass/editEquipment/index.js @@ -67,40 +67,40 @@ function handleOtherEqu(targetPoint, equipmentInfo) { targetPoint.scale.set(0.03, 0.06, 0.05); this.scene.add(equMesh); targetPoint.visible = false; - targetPoint.hasWall = true; - //处理风压阀的代码片段 - let lineIndex = targetPoint.name.slice(7, 9); - for (let line = Number(lineIndex); line <= 20; line++) { - if (line < 10) { - let wall = "wall_" + "0" + line; - this.scene.getObjectByName(wall).visible = true; - let point = "point_" + "00" + line + "_tc"; - this.scene.getObjectByName(point).visible = false; - this.scene.getObjectByName(point).layers.set(-2); - if (this.scene.getObjectByName(point).hasDevice == true) { - let EquID = this.scene.getObjectByName(point).info.id; - this.scene.getObjectById(EquID).visible = false; - } - } else if (line >= 10) { - let wall = "wall_" + line; - this.scene.getObjectByName(wall).visible = true; - let point = "point_" + "0" + line + "_tc"; - this.scene.getObjectByName(point).visible = false; - this.scene.getObjectByName(point).layers.set(-2); - if (this.scene.getObjectByName(point).hasDevice == true) { - let EquID = this.scene.getObjectByName(point).info.id; - this.scene.getObjectById(EquID).visible = false; - } - } - //处理21行的设备和附着点 - let point = "point_" + "0" + 21 + "_tc"; - this.scene.getObjectByName(point).visible = false; - this.scene.getObjectByName(point).layers.set(-2); - if (this.scene.getObjectByName(point).hasDevice == true) { - let EquID = this.scene.getObjectByName(point).info.id; - this.scene.getObjectById(EquID).visible = false; - } - } + // targetPoint.hasWall = true; + // //处理风压阀的代码片段 + // let lineIndex = targetPoint.name.slice(7, 9); + // for (let line = Number(lineIndex); line <= 20; line++) { + // if (line < 10) { + // let wall = "wall_" + "0" + line; + // this.scene.getObjectByName(wall).visible = true; + // let point = "point_" + "00" + line + "_tc"; + // this.scene.getObjectByName(point).visible = false; + // this.scene.getObjectByName(point).layers.set(-2); + // if (this.scene.getObjectByName(point).hasDevice == true) { + // let EquID = this.scene.getObjectByName(point).info.id; + // this.scene.getObjectById(EquID).visible = false; + // } + // } else if (line >= 10) { + // let wall = "wall_" + line; + // this.scene.getObjectByName(wall).visible = true; + // let point = "point_" + "0" + line + "_tc"; + // this.scene.getObjectByName(point).visible = false; + // this.scene.getObjectByName(point).layers.set(-2); + // if (this.scene.getObjectByName(point).hasDevice == true) { + // let EquID = this.scene.getObjectByName(point).info.id; + // this.scene.getObjectById(EquID).visible = false; + // } + // } + // //处理21行的设备和附着点 + // let point = "point_" + "0" + 21 + "_tc"; + // this.scene.getObjectByName(point).visible = false; + // this.scene.getObjectByName(point).layers.set(-2); + // if (this.scene.getObjectByName(point).hasDevice == true) { + // let EquID = this.scene.getObjectByName(point).info.id; + // this.scene.getObjectById(EquID).visible = false; + // } + // } // this.scene.getObjectByName('wall_01').visible = true // console.log(this.scene); // 保存该设备模型id，后期直接从附附着点进行删除 diff --git a/src/components/content/tunnelScene/sceneClass/editTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/editTunnelInit/index.js index c916e58..ca82c02 100644 --- a/src/components/content/tunnelScene/sceneClass/editTunnelInit/index.js +++ b/src/components/content/tunnelScene/sceneClass/editTunnelInit/index.js @@ -1,21 +1,6 @@ export function editTunnelInit(equipmentList) { //初始化将墙壁隐藏起来 - // for (let line = 1; line <= 20; line++) { - // if (line < 10) { - // let wall = 'wall_' + '0' + line - // this.scene.getObjectByName(wall).visible = false - // } else if (line >= 10) { - // let wall = 'wall_' + line - // this.scene.getObjectByName(wall).visible = false - // } - // } - equipmentList.forEach((item) => { - const formInfo = { - equipmentType: item.equipmentType, //设备类型 - chooseEquipment: item.chooseEquipment, //设备选择(设备名称) - threshold: item.threshold, - }; - this.addEquipment(this.scene.getObjectByName(item.position), formInfo); + this.addEquipment(this.scene.getObjectByName(item.position), item); }); } diff --git a/src/views/device-manage/index.vue b/src/views/device-manage/index.vue index bb2e07e..b06bcb9 100644 --- a/src/views/device-manage/index.vue +++ b/src/views/device-manage/index.vue @@ -484,6 +484,8 @@ const handleEditFan = () => { if (res.code === 1000) { ElMessage.success('修改成功') router.push('/tunnel/' + siteId.value + '/' + type + '/' + userId) + }else { + ElMessage.error(res.msg) } }) } diff --git a/src/views/edit/edit.vue b/src/views/edit/edit.vue index 7d3d92f..e5438f2 100644 --- a/src/views/edit/edit.vue +++ b/src/views/edit/edit.vue @@ -97,12 +97,14 @@ const handleSave = async () => { constructionLength: 500, tunnelLength: form.value.totalLength, isDefault: form.value.isDefault, - tunnelThreeConfig: JSON.stringify(await store.getEquipmentList()), + modelEquipmentList: await store.getEquipmentList(), }; editTunnel(data).then((res) => { if (res?.code === 1000) { ElMessage.success(res.msg); router.push("/tunnel/" + form.value.siteId + "/" + type + "/" + userId); + } else { + ElMessage.error(res.msg); } }); }; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index b8ac2d9..56a2938 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -47,6 +47,8 @@ const authStore = useAuthStore(); const loginForm = reactive({ username: "admin", password: "123456", + // username: "", + // password: "", code: "", uuid: "", }); diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 5e31090..3f7b6b3 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -93,11 +93,11 @@ @@ -146,6 +146,7 @@ const info = ref({ }) const title = ref('新增站点') const isVisited = ref(false); +const showFirst = ref(true) const total = ref(10); const showAddIcon = ref(true) const pageInfo = reactive({ @@ -169,6 +170,7 @@ const getList = () => { }).then((res) => { total.value = res.data.total; 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) { item.info = info.value @@ -186,7 +188,6 @@ const handleClickSite = (type) => { if (type.checked) { siteIds.value.push(type.siteId) siteNameList.value.push(type.siteName) - } else { siteIds.value.map((item, index) => { if (item === type.siteId) { @@ -234,15 +235,23 @@ const handleSubmit = (instance) => { if (!valid) return if (title.value === '编辑站点') { editSite(form.value).then((res) => { - isVisited.value = false - getList() - ElMessage.success(res.msg) + if(res.code===1000){ + isVisited.value = false + getList() + ElMessage.success(res.msg) + }else { + ElMessage.warning(res.msg) + } }); } else { addSite(form.value).then((res) => { - isVisited.value = false - getList() - ElMessage.success(res.msg) + if(res.code===1000){ + isVisited.value = false + getList() + ElMessage.success(res.msg) + }else { + ElMessage.warning(res.msg) + } }); } }) @@ -250,6 +259,15 @@ const handleSubmit = (instance) => { const handleChooseAll=()=>{ siteList.value.map(item=>{ item.checked=!item.checked + if(item.checked&&!item.isDefault){ + siteIds.value.push(item.siteId) + }else if(!item.checked&&!item.isDefault){ + siteIds.value.map((newItem, index) => { + if (newItem === item.siteId) { + siteIds.value.splice(index, 1) + } + }) + } }) } const handleMoreDelete = () => { @@ -290,7 +308,14 @@ const handleMoreDelete = () => { } } } - +const firstPage=()=>{ + pageInfo.pageNum = 1 + getList() +} +const lastPage=()=>{ + pageInfo.pageNum = total.value/pageInfo.pageSize + getList() +} //点击页码进行分页功能 const handleCurrentChange = (val) => { pageInfo.pageNum = val diff --git a/src/views/tunnel-manage/index.vue b/src/views/tunnel-manage/index.vue index b3750d8..3a0196d 100644 --- a/src/views/tunnel-manage/index.vue +++ b/src/views/tunnel-manage/index.vue @@ -96,11 +96,11 @@ @@ -120,6 +120,7 @@ const formRules = ref({ tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}], serialNumber: [{required: true, message: '请输入序列号', trigger: 'blur'}] }) +const showFirst = ref(true) const formInstance = ref() const tunnelList = ref([ { @@ -268,7 +269,6 @@ const handleGoSiteOrIndex = () => { } else if (type === 'i') { router.push('/') } - } const getList = () => { getTunnelList({ @@ -278,10 +278,19 @@ const getList = () => { if (res.code === 1000) { total.value = res.data.total tunnelList.value = res.data.rows + showFirst.value = total.value / pageInfo.pageSize >= 1; } }) } getList() +const firstPage=()=>{ + pageInfo.pageNum = 1 + getList() +} +const lastPage=()=>{ + pageInfo.pageNum = total.value/pageInfo.pageSize + getList() +} //点击页码进行分页功能 const handleCurrentChange = (val) => { pageInfo.pageNum = val @@ -303,6 +312,8 @@ const handleSubmit = (instance) => { ElMessage.success('新增成功') getList() isVisited.value = false + }else { + ElMessage.warning(res.msg) } }) } else { @@ -321,6 +332,15 @@ const handleGoToEditTunnel = (tunnelId) => { const handleChooseAll = () => { tunnelList.value.map(item => { item.checked = !item.checked + if(item.checked&&!item.isDefault){ + tunnelIds.value.push(item.tunnelId) + }else if(!item.checked&&!item.isDefault){ + tunnelIds.value.map((newItem, index) => { + if (newItem === item.tunnelId) { + tunnelIds.value.splice(index, 1) + } + }) + } }) } const handleEditDevice = (tunnelId) => { diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 057f1b9..64df85d 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -10,9 +10,9 @@ -
- 删除 -
+ + +
@@ -24,12 +24,18 @@ v-model="username" clearable placeholder="输入搜索内容" + @clear="getInfo" />
搜索
用户管理
-
添加用户
+
+
添加用户
+
+ 删除 +
+
{{ currentSite }}如果需要切换站点,请返回首屏切换
- - + + - - + + + + + - - - + - 首页 + 首页 - 尾页 + @current-change="handleCurrentChange" :hide-on-single-page="true"/> + 尾页
@@ -135,12 +142,13 @@ const siteId = reactive(router.currentRoute.value.params.siteId) const tunnelIndex = ref() const username = ref() const userIds = ref() -const currentSite = ref() +const showFirst = ref(true) +const currentSite = ref('') const formInstance = ref() const userData = ref([]) const pageInfo = reactive({ pageNum: 1, - pageSize: 6 + pageSize: 10 }); const total = ref(10); const isVisited = ref(false); @@ -190,18 +198,23 @@ const handleAll = () => { multipleTable.value.toggleAllSelection() } const handleDelete = () => { - ElMessageBox.confirm(`是否确认删除该用户吗?`, '系统提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - deleteUser(userIds.value).then(res => { - if (res.code === 1000) { - ElMessage.success(res.msg) - getInfo() - } + console.log('userIds.value',userIds.value) + if (userIds.value ===undefined) { + ElMessage.warning('请先选择用户进行删除') + } else { + ElMessageBox.confirm(`是否确认删除该用户吗?`, '系统提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + deleteUser(userIds.value).then(res => { + if (res.code === 1000) { + ElMessage.success(res.msg) + getInfo() + } + }) }) - }) + } } const reset = () => { form.value = { @@ -224,16 +237,30 @@ getRoleOptionInfo() const getInfo = () => { getUser({ siteId: siteId, - userName: username.value + userName: username.value, + ...pageInfo }).then(res => { if (res.code === 1000) { - console.log('res', res) userData.value = res.data.rows total.value = res.data.total + showFirst.value = total.value / pageInfo.pageSize >= 1; } }) } getInfo() +const firstPage = () => { + pageInfo.pageNum = 1 + getInfo() +} +const lastPage = () => { + pageInfo.pageNum = total.value / pageInfo.pageSize + getInfo() +} +//点击页码进行分页功能 +const handleCurrentChange = (val) => { + pageInfo.pageNum = val + getInfo() +} const handleSubmit = async (formInstance) => { if (!formInstance) return; formInstance.validate(async (valid) => { @@ -248,6 +275,7 @@ const handleSubmit = async (formInstance) => { if (res.code === 1000) { getInfo() isVisited.value = false + ElMessage.success(res.msg) } else { ElMessage.warning(res.msg) } @@ -257,6 +285,7 @@ const handleSubmit = async (formInstance) => { if (res.code === 1000) { getInfo() isVisited.value = false + ElMessage.success(res.msg) } else { ElMessage.warning(res.msg) } @@ -279,15 +308,26 @@ const handleSelect = async (selection, row) => {