bug修复

src/components/amapPow.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-10-19 09:32:46
  * @LastEditors: wangcc
- * @LastEditTime: 2022-12-13 11:31:52
+ * @LastEditTime: 2023-03-13 11:26:34
  * @FilePath: \castgroup_bigscreen\src\components\amapPow.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -1249,8 +1249,6 @@ export default {
       // image: '//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
       projectList(params).then((res) => {
         if (res.code == 200) {
-          console.log('查询项目列表');
-          console.log(res.rows);
           let infoIcon = new AMap.Icon({
             size: new AMap.Size(20, 25), // 图标尺寸
 

src/components/header.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-06-14 18:11:54
  * @LastEditors: wangcc
- * @LastEditTime: 2023-03-02 16:13:35
+ * @LastEditTime: 2023-03-13 10:22:25
  * @FilePath: \castgroup_bigscreen\src\components\header.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -41,7 +41,8 @@ export default {
             nowTime: '',
             isFull: false,
             // homeLink:process.env.NODE_ENV === 'development' ? '//castgrouptest.hw.hongweisoft.com' : '//admin.bigdata.anthelp.top',
-            homeLink:'http://castgrouptest.hw.hongweisoft.com/'
+            // homeLink:'http://castgrouptest.hw.hongweisoft.com/'
+            homeLink:'http://admin.bigdata.anthelp.top'
         };
     },
     created() {

src/components/pagination/index.vue

@@ -6,6 +6,7 @@
       :page-size.sync="pageSize"
       :layout="layout"
       :page-sizes="pageSizes"
+      :pager-count="5"
       :total="total"
       v-bind="$attrs"
       @size-change="handleSizeChange"
@@ -92,15 +93,18 @@ export default {
 <style scoped lang='scss'>
 .pagination-container {
   /* background: #fff; */
-  padding: 14px 16px;
+  padding: 14px 0;
 }
 .pagination-container.hidden {
   display: none;
 }
+/deep/ .el-pagination{
+      padding: 2px 0px;
+}
 /deep/ .el-pagination.is-background .btn-next,
 /deep/ .el-pagination.is-background .btn-prev,
 /deep/ .el-pagination.is-background .el-pager li {
-  margin: 0 5px;
+  margin: 0 4px;
   background-color: rgba(0, 250, 253, 0.22);
   color: #00fafd;
   min-width: 30px;

src/views/index.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-07-06 15:56:45
  * @LastEditors: wangcc
- * @LastEditTime: 2023-03-13 09:25:41
+ * @LastEditTime: 2023-03-13 11:26:48
  * @FilePath: \castgroup_bigscreen\src\views\index.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -185,6 +185,10 @@
               ref="tableFrom"
               highlight-current-row
               size="small"
+              v-loading="loading"
+              element-loading-text="拼命加载中"
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(1,33,35, 0.8)"
               :data="tableData"
               @mouseenter.native="stopScroll"
               @mouseleave.native="startScroll"
@@ -333,7 +337,9 @@ export default {
         }
       ],
       timer: null,
+      rowIdClick: null,
       tableData: [],
+      loading: false,
       rowList: [],
       cur: 0,
       total: 0,
@@ -515,7 +521,7 @@ export default {
       debounce(this.debounceGetData, 300, false);
     },
     debounceGetData() {
-      console.log('请求数据');
+      // console.log('请求数据');
       // console.log('page', this.$store.state.addr.page);
       // {text:'森林资源',en:'forest'},
       //   {text:'林木结构',en:'treeSpecies'},
@@ -625,20 +631,29 @@ export default {
         });
     },
     getRightScrollData() {
+      let queryParams =  {
+        pageNum: 1,
+        pageSize: 300
+      }
       let param = {
         smallNumber: this.xiaobaninput,
         cityId: this.$store.state.addr.selectCity.areaId,
         countyId: this.$store.state.addr.selectDistrict.areaId,
         townId: this.$store.state.addr.selectStreet.areaId,
         courseId: this.$store.state.addr.selectProject.ProjectID,
-        pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize
+        pageNum: queryParams.pageNum,
+        pageSize: queryParams.pageSize
       };
+      this.loading = true;
       rightScrollData(param)
         .then((res) => {
+          this.loading = false;
           this.tableData = res.rows;
           this.total = res.total;
-          this.getProjectSmallClassMap(this.tableData);
+          if (this.rowIdClick) {
+            this.getProjectSmallClassMap(this.tableData);
+          }
+          // this.getProjectSmallClassMap(this.tableData);
         })
         .catch((err) => {
           console.log('scrollBoard err', err);
@@ -1300,8 +1315,10 @@ export default {
       // proClass[e.rowIndex]&&proClass[e.rowIndex].classList.add('active');
 
       let rowId = e.row[4];
+      this.rowIdClick = rowId;
       this.changeSelectProject({ ProjectID: rowId, ProjectName: e.row[0] });
       document.getElementById(rowId).classList.add('active');
+      // this.getProjectSmallClassMap(this.tableData);
       // let param = {
       //   courseId: rowId
       //   // pageNum: 1,
@@ -1529,11 +1546,11 @@ export default {
 }
 
 /deep/ .el-table__body .el-table__row.hover-row td {
-  background-color: rgba(255, 170, 0, 0.20) !important;
+  background-color: rgba(255, 170, 0, 0.2) !important;
   cursor: pointer;
 }
 /deep/ .el-table tbody tr:hover > td {
-  background-color: rgba(255, 170, 0, 0.20) !important;
+  background-color: rgba(255, 170, 0, 0.2) !important;
   cursor: pointer;
 }
 .el-table {