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

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

src/components/manageBtn/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="manage-btn">
-    <div v-for="(item,index) in btnList" :key="item.name" class="btn-box" @click="select(index)">
+    <div v-for="(item,index) in btnList" :key="item.name" class="btn-box" @click="select(item,index)">
       <div :style="{ backgroundImage:'url(' +getImageUrl(item.icon)+')' }"></div>
       <div :class="{'select-active':selectButton===index}">{{ item.name }}</div>
     </div>
@@ -60,10 +60,10 @@ 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);
 };
 </script>

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",
+  password: "12345",
-  // username: "",
+  username: "",
   // password: "",
   code: "",
   uuid: "",

src/views/tunnel/index.vue

@@ -180,12 +180,18 @@ const changeTunnel = (e) => {
 }
 const manageSelect = (index) => {
   console.log("首页点击-", index);
-  if (index === 0) {
+  if (index === '站点管理') {
-    router.push("/site"+'/'+currentUserId.value);
+    if(currentUserId.value){
-  } else if (index === 1) {
+      router.push("/site"+'/'+currentUserId.value);
-    router.push("/tunnel/" + currentSiteId.value+'/i'+'/'+currentUserId.value);
+    }
-  } else if (index === 2) {
+  } else if (index === '隧道管理') {
-    router.push("/user/" + currentSiteId.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);
+    }
   }
 };
 const handleChangeSite = (item) => {

src/views/user/index.vue

@@ -72,8 +72,8 @@
         <el-form-item label="当前站点">
           <div class="current-site">{{ currentSite }}<span>如果需要切换站点,请返回首屏切换</span></div>
         </el-form-item>
-        <el-form-item label="输入账户">
+        <el-form-item label="输入用户名">
-          <el-input v-model="form.userName" placeholder="请输入账户"/>
+          <el-input v-model="form.userName" placeholder="请输入用户名"/>
         </el-form-item>
         <el-form-item label="输入密码" v-if="title==='添加用户'">
           <el-input type="password" show-password v-model="form.password" placeholder="请输入密码"/>
@@ -98,7 +98,7 @@
             <el-radio v-for="item in radioList" :label="item.value" :key="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="选择隧道" v-if="checkList.length!==0&&form.roleId>3">
+        <el-form-item label="选择隧道" v-if="tunnelList.length!==0&&form.roleId>3">
           <el-select
               v-model="form.tunnelIds"
               multiple
@@ -108,7 +108,7 @@
               :fit-input-width="true"
           >
             <el-option
-                v-for="item in checkList"
+                v-for="item in tunnelList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -171,16 +171,16 @@ const form = ref({
   tunnelIds: []
 });
 const formRules = ref({
-  userName: [{required: true, message: '请输入用户名称', trigger: 'blur'}],
+  userName: [{required: true, message: '请输入用户名', trigger: 'blur'}],
   password: [{required: true, message: '请输入密码', trigger: 'blur'}]
 })
 const radioList = ref([])
-const checkList = ref([])
+const tunnelList = ref([])
 const multipleTable = ref()
 const getTunnel = () => {
   getTunnelOption(siteId).then(res => {
     if (res.code === 1000) {
-      checkList.value = res.data
+      tunnelList.value = res.data
     }
   })
 }
@@ -199,7 +199,6 @@ const handleEditUser = (row) => {
     if (res.code === 1000) {
       form.value = res.data.user
       form.value.roleId = res.data.roleIds[0]
-      console.log('form.value',form.value)
     }
   })
   title.value = '修改用户'
@@ -287,7 +286,6 @@ const handleSubmit = async (formInstance) => {
       roleIds: [form.value.roleId],
       tunnelIds: form.value.tunnelIds
     }
-    console.log('data',data)
     if (title.value === '添加用户') {
       await addUser(data).then(res => {
         if (res.code === 1000) {