Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintAdmin_zt/src/views/Site/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container" style="padding: 0px">
 
     <div class="tab-box">
-      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index,handleClick1" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
+      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
     </div>
 
     <el-row style="padding: 20px">
@@ -21,7 +21,7 @@
             <el-tree
               :data="Thetree"
               show-checkbox
-              indent="15"
+              :indent=15
               :props="defaultProps"
               @change="handleChange"
               node-key="id"
@@ -1127,7 +1127,7 @@ export default {
       this.getList();
       this.selectChildByDeptIdApi();
 
-      console.log("activeName",this.$route.query.activeName)
+      console.log("参数",this.$route)
       if (this.$route.query.activeName){
         this.activeName = this.$route.query.activeName
         if (this.activeName == 'list'){
@@ -1582,12 +1582,21 @@ export default {
           this.getDutyList()
         }
       },
-      handleClick1() {
-        console.log("1",this.activeName)
-        if (this.activeindex== 0){
-          this.onlyGetUser()
+      handleClick1(index) {
+
+        console.log("index参数",index);
+        if (index || index==0){
+          this.activeindex=index;
         }
-        if (this.activeindex== 3){
+        console.log("选项",this.activeindex);
+
+        if (this.activeindex== 0){
+
+        }
+        if (this.activeindex== 1){
+          this.getList()
+        }
+        if (this.activeindex== 2){
           this.getDutyList()
         }
       },
@@ -1825,7 +1834,7 @@ export default {
             this.appedit(this.deptId)
             console.log("fdfdnfdfdfddf",this.Thetree)
             this.form.deptType = this.Thetree[0].deptType
-            this.queryParams1.storeId = this.Thetree[0].id
+            this.queryParams1.deptId = this.Thetree[0].id
             console.log("this.Thetree",this.Thetree[0])
           }