Przeglądaj źródła

fix:修改协作的问题

xzh 4 lat temu
rodzic
commit
aaa283aa1c

+ 7 - 1
pc/src/components/Paging/index.vue

@@ -9,7 +9,7 @@
       class="page-item"
       :class="{active: index === page}"
       >{{page}}</a><a class="more page-item" @click="clickHandle(pages[pages.length-1] + 2)" v-if="pages[pages.length-1]+2<=maxPage" >...</a><a @click="clickHandle(maxPage)" class="page-item" v-if="maxPage!==1" :class="{active: index === maxPage}" >{{maxPage}}</a>
-      <a v-if="index !== maxPage" class="next-page next-page-item" @click="clickHandle(index + 1)"></a>
+      <a v-show="index !== maxPage" class="next-page next-page-item" @click="clickHandle(index + 1)"></a>
   </div>
 </template>
 
@@ -110,6 +110,12 @@ export default {
     },
     current (newVal) {
       this.index = newVal
+    },
+    total (newVal) {
+      if (this.index > this.maxPage) {
+        this.index = this.maxPage
+        this.clickHandle(this.maxPage)
+      }
     }
   }
 }

+ 1 - 1
pc/src/components/toast/cooperation.vue

@@ -124,6 +124,7 @@ export default {
     },
     selectItem (item, i) {
       if (this.cooName) {
+        // this.userName = this.cooName
         return
       }
       item.hasAuth = !item.hasAuth
@@ -165,7 +166,6 @@ export default {
 
       setTimeout(() => {
         let arr = data.map(sub => sub.id)
-        console.log(arr)
         let tmp = this.auth.map(item => {
           item.hasAuth = true
           if (arr.length > 0) {

+ 1 - 0
pc/src/page/manage/temp/device.vue

@@ -677,6 +677,7 @@ $font-color: #2d2d2d;
   .table-list{
     width: calc(100% - 80px);
     margin: 30px auto;
+    font-size: 14px;
   }
   .scene-nothing{
     padding: 42px 0 150px 0;

+ 6 - 5
pc/src/page/manage/temp/scene.vue

@@ -485,11 +485,11 @@ export default {
       }
       this.pageSize = this.myscene.pageSize
       this.total = this.myscene.total || 0
-
-      if (!this.lock && !this.allTotal) {
-        this.lock = true
-        this.allTotal = this.total
-      }
+      this.allTotal = this.total
+      // if (!this.lock && !this.allTotal) {
+      //   this.lock = true
+      //   this.allTotal = this.total
+      // }
     },
     copyTextToClipboard (text) {
       var textArea = document.createElement('textarea')
@@ -782,6 +782,7 @@ $font-color: #2d2d2d;
   .table-list{
     width: calc(100% - 80px);
     margin: 30px auto;
+    font-size: 14px;
     .card-img {
         width: 100%;
         height: 100%;