fix(multitenant): 修复设备列表翻页组件问题

dgiot · Jul 1, 2022 · e9aabff · e9aabff
1 parent 9b29ed2
commit e9aabff
Show file tree

Hide file tree

Showing 9 changed files with 342 additions and 323 deletions.
diff --git a/src/dgiot/components/DgiotAmisEditor/index.vue b/src/dgiot/components/DgiotAmisEditor/index.vue
@@ -75,16 +75,16 @@
 <style lang="scss">
   .amis {
     width: 100%;
-    overflow: auto;
     height: calc(100vh - 60px * 2.7) !important;
+    overflow: auto;
     #editor {
       width: 100%;
-      overflow: auto;
       height: calc(100vh - 60px * 2.7) !important;
+      overflow: auto;
     }
   }
   .ae-Editor .ae-Editor-inner {
-    overflow: auto;
     height: calc(100vh - 60px * 2.7) !important;
+    overflow: auto;
   }
 </style>
diff --git a/src/views/CloudFunction/doc/index.vue b/src/views/CloudFunction/doc/index.vue
@@ -275,11 +275,11 @@
 </template>
 <style>
   .custom-tree-node {
-    flex: 1;
     display: flex;
+    flex: 1;
     align-items: center;
     justify-content: space-between;
-    font-size: 14px;
     padding-right: 8px;
+    font-size: 14px;
   }
 </style>
diff --git a/src/views/CloudFunction/engine/channel.vue b/src/views/CloudFunction/engine/channel.vue
@@ -246,7 +246,7 @@
       </el-table>
       <div class="elpagination">
         <el-pagination
-          :key="length + 'key' + total"
+          :key="paginationKey + 'key' + total"
           layout="total, sizes, prev, pager, next, jumper"
           :page-size="length"
           :page-sizes="[5, 10, 20, 30, 50]"
@@ -804,6 +804,7 @@
           ],
         },
         length: 10,
+        paginationKey: moment(new Date()).valueOf() + '',
         start: 0,
         total: 0,
         selectregion: {},
@@ -1198,6 +1199,7 @@
           keys: 'count(*)',
           where: {},
         }
+        this.paginationKey = moment(new Date()).valueOf() + ''
         this.channelformsearch.name
           ? (params.where.name = {
               $regex: this.channelformsearch.name,

diff --git a/src/views/CloudFunction/engine/components/DynamicForms.vue b/src/views/CloudFunction/engine/components/DynamicForms.vue
@@ -143,7 +143,7 @@
                     :value="item.objectId"
                   >
                     <span style="float: left">{{ item.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ item.objectId }}
                     </span>
                   </el-option>
@@ -176,7 +176,7 @@
                     :value="deviceName.objectId"
                   >
                     <span style="float: left">{{ deviceName.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ deviceName.objectId }}
                     </span>
                   </el-option>
@@ -255,7 +255,7 @@
                     :value="item.objectId"
                   >
                     <span style="float: left">{{ item.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ item.objectId }}
                     </span>
                   </el-option>
@@ -292,7 +292,7 @@
                     :value="deviceName.objectId"
                   >
                     <span style="float: left">{{ deviceName.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ deviceName.objectId }}
                     </span>
                   </el-option>
@@ -556,7 +556,7 @@
                     :value="item.objectId"
                   >
                     <span style="float: left">{{ item.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ item.objectId }}
                     </span>
                   </el-option>
@@ -594,7 +594,7 @@
                     :value="deviceName.objectId"
                   >
                     <span style="float: left">{{ deviceName.name }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">
+                    <span style="float: right; font-size: 13px; color: #8492a6">
                       {{ deviceName.objectId }}
                     </span>
                   </el-option>

diff --git a/src/views/CloudFunction/lowcode/components/ViewEdit.vue b/src/views/CloudFunction/lowcode/components/ViewEdit.vue
@@ -41,7 +41,7 @@
             :value="item.value"
           >
             <span style="float: left">{{ item.label }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">
+            <span style="float: right; font-size: 13px; color: #8492a6">
               {{ item.value }}
             </span>
           </el-option>

diff --git a/src/views/CloudFunction/lowcode/index.vue b/src/views/CloudFunction/lowcode/index.vue
@@ -48,7 +48,7 @@
                 :value="item.value"
               >
                 <span style="float: left">{{ item.label }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">
+                <span style="float: right; font-size: 13px; color: #8492a6">
                   {{ item.value }}
                 </span>
               </el-option>

diff --git a/src/views/CloudOT/maintenance/alert.vue b/src/views/CloudOT/maintenance/alert.vue
@@ -245,7 +245,7 @@
     <!--      @pagination="fetchData"-->
     <!--    />-->
     <dgiot-parser-pagination
-      :key="list.length + 'forensics'"
+      :key="paginationKey + 'forensics'"
       ref="forensics"
       :pagination="paginations"
       :query-payload="queryPayload"
@@ -266,11 +266,13 @@
   import { mapGetters } from 'vuex'
   import { Promise } from 'q'
   import { getView } from '@/api/View'
+
   export default {
     name: 'Index',
     components: {},
     data() {
       return {
+        paginationKey: moment(new Date()).valueOf() + '',
         editRow: {},
         amisData: {},
         paginations: { layout: 'total, sizes, prev, pager, next, jumper' },
@@ -529,6 +531,7 @@
         this.fetchData()
       },
       async fetchData(args = {}) {
+        this.paginationKey = moment(new Date()).valueOf() + ''
         if (!args.limit) {
           args = this.queryForm
         }
@@ -545,7 +548,7 @@
             // productid: this.queryForm.productName
             //   ? this.queryForm.productName
             //   : 'all',
-            isprocess: this.queryForm.isprocess,
+            // isprocess: this.queryForm.isprocess,
             include: '',
             where: {
               'content._productid': {
@@ -558,7 +561,7 @@
             limit: args.limit,
             order: args.order,
             skip: args.skip,
-            count: args.keys,
+            count: 'objectId',
             // productid: this.queryForm.productName
             //   ? this.queryForm.productName
             //   : 'all',
@@ -570,11 +573,11 @@
         //   ? (this.queryPayload.where.content['_productid'] = )
         //   : 'all'
 
-        this.queryForm.isprocess
-          ? (this.queryPayload.where['process'] = {
-              $regex: this.queryForm.isprocess,
-            })
-          : ''
+        // this.queryForm.isprocess
+        //   ? (this.queryPayload.where['process'] = {
+        //     $regex: this.queryForm.isprocess,
+        //   })
+        //   : ''
         if (this.queryForm.searchDate.length) {
           this.queryPayload.where['createdAt'] = {
             $gt: {

diff --git a/src/views/CloudOT/maintenance/index.vue b/src/views/CloudOT/maintenance/index.vue
@@ -407,7 +407,7 @@
           limit: args.limit,
           order: args.order,
           skip: args.skip,
-          keys: args.keys,
+          keys: 'objectId',
           where: {},
         }
         this.queryForm.number