Merge pull request '邓洁: 修复bug' (#197) from dengjie into dev

Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/197

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)
     }
   })
 }

src/views/edit/edit.vue

@@ -90,12 +90,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)
     }
   });
 }

src/views/site/index.vue

@@ -93,11 +93,11 @@
       </template>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange"  :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -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({
@@ -164,11 +165,12 @@ const formRules = ref({
 const formInstance = ref()
 const getList = () => {
   getSiteList({
-    userId:userId,
+    // userId:userId,
     ...pageInfo
   }).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
@@ -234,15 +236,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)
+        }
       });
     }
   })
@@ -290,7 +300,14 @@ const handleMoreDelete = () => {
     }
   }
 }
-
+const firstPage=()=>{
+  pageInfo.pageNum = 1
+  getList()
+}
+const lastPage=()=>{
+  pageInfo.pageNum = total.value/pageInfo.pageSize
+  getList()
+}
 //点击页码进行分页功能
 const handleCurrentChange = (val) => {
   pageInfo.pageNum = val

src/views/tunnel-manage/index.vue

@@ -96,11 +96,11 @@
       </div>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange" :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -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([
   {
@@ -278,10 +279,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 +313,8 @@ const handleSubmit = (instance) => {
         ElMessage.success('新增成功')
         getList()
         isVisited.value = false
+      }else {
+        ElMessage.warning(res.msg)
       }
     })
   } else {

src/views/user/index.vue

@@ -112,11 +112,11 @@
       </template>
     </el-dialog>
     <div class="pagination">
-      <span>首页</span>
+      <span @click="firstPage" v-if="showFirst">首页</span>
       <el-pagination background v-model:current-page="pageInfo.pageNum" v-model:page-size="pageInfo.pageSize"
                      :total="total" prev-text="上一页" next-text="下一页" layout="prev, pager, next"
-                     @current-change="handleCurrentChange"/>
-      <span>尾页</span>
+                     @current-change="handleCurrentChange" :hide-on-single-page="true"/>
+      <span @click="lastPage" v-if="showFirst">尾页</span>
     </div>
   </div>
 </template>
@@ -135,12 +135,13 @@ const siteId = reactive(router.currentRoute.value.params.siteId)
 const tunnelIndex = ref()
 const username = ref()
 const userIds = 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);
@@ -224,16 +225,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) => {