Browse Source

关系总览:手动编辑添加分页功能

shaun-sheep 4 years ago
parent
commit
cacf168b26

+ 6 - 6
config/prod.env.js

@@ -1,12 +1,12 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_URL: '"http://172.16.44.215"', //测试iframe地址
-    SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
+ //   BASE_URL: '"http://172.16.44.215"', //测试iframe地址
+    //SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
     // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
     // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
-    MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
-    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-    // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+    //MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
+    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+     MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 }

+ 1 - 1
src/components/point/dynamicdata/historyDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="本次对应记录" :visible.sync="dialogVisible" width="70%" @close="handleClose" id="historyAction" custom-class="act-history">
-    <span>提示:可使用Contorl+F 搜索关键字</span>
+    <span>提示:可使用Control+F 搜索关键字</span>
     <div>
       <el-table :data="tableData" style="width: 100%;" :show-header="showheader" height="400px" :cell-style="cellStyle">
         <el-table-column>

+ 14 - 11
src/views/relation/relationShip/index.vue

@@ -216,14 +216,16 @@
       </el-table>
     </section>
     <!-- 分页 -->
-    <!--    <el-pagination-->
-    <!--      @size-change="handleSizeChange"-->
-    <!--      @current-change="handleCurrentChange"-->
-    <!--      :current-page="currentPage"-->
-    <!--      :page-sizes="pageSizes"-->
-    <!--      :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"-->
-    <!--      style="float:right;margin-top:10px;padding:2px 5px;">-->
-    <!--    </el-pagination>-->
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-sizes="pageSizes"
+          :page-size="pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          style="float:right;margin-top:10px;padding:2px 5px;">
+        </el-pagination>
     <el-dialog
       title="提示"
       :visible.sync="visible"
@@ -392,13 +394,14 @@
           projectId: this.projectId,
           ObjectType: 1,
           RelType: localStorage.getItem('RelManualType'),
-          // PageSize: this.pageSize,
-          PageSize: 10000000,
+          PageSize: this.pageSize,
+          // PageSize: 10000000,
           PageNumber: this.currentPage
         };
         relQuery(data, res => {
           this.filterTable(res)
           this.length = res.Total || 0
+          this.total = res.Total
           this.loading = false
         })
       },
@@ -455,7 +458,7 @@
         }
         relQuery(param, res => {
           this.filterTable(res)
-          console.log(res, '==object==')
+          // console.log(res, '==object==')
         })
       },
       //分页更换size