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

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

src/views/tunnel-manage/index.vue

@@ -5,9 +5,9 @@
         <div class="back-icon"></div>
         <span>返回</span>
       </div>
-      <div class="site-name">
+<!--      <div class="site-name">-->
-        {{ siteName }}
+<!--        {{ siteName }}-->
-      </div>
+<!--      </div>-->
       <div class="tunnel-title"></div>
       <div class="all-del-btn">
         <div class="all-btn" style=" margin-right: 40px;" v-if="!showAddIcon" @click="handleAdd">
@@ -259,9 +259,9 @@ const pageInfo = reactive({
 });
 const total = ref(10);
 onMounted(() => {
-  getSiteDetail(siteId).then((res) => {
+  // getSiteDetail(siteId).then((res) => {
-    siteName.value = res.data.siteName
+  //   siteName.value = res.data.siteName
-  });
+  // });
 })
 const handleGoSiteOrIndex = () => {
   if (type === 's') {
@@ -279,6 +279,8 @@ const getList = () => {
       total.value = res.data.total
       tunnelList.value = res.data.rows
       showFirst.value = total.value / pageInfo.pageSize >= 1;
+    } else {
+      ElMessage.warning(res.msg)
     }
   })
 }

src/views/tunnel/index.vue

@@ -189,10 +189,9 @@ const manageSelect = (index) => {
       router.push("/site" + '/' + currentUserId.value);
     }
   } else if (index == '隧道管理') {
-    console.log('无查看权限??',currentSiteId.value,currentUserId.value)
+    if (currentSiteId.value && currentUserId.value) {
-    // if(currentSiteId.value&&currentUserId.value){
       router.push("/tunnel/" + currentSiteId.value + '/i' + '/' + currentUserId.value);
-    // }
+    }
   } else if (index == '用户管理') {
     if (currentSiteId.value) {
       router.push("/user/" + currentSiteId.value);

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 => {