Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/ConstructionApplication3D/Demolition/DemolitionList.vue

@@ -69,7 +69,7 @@
          style="height:10rem;border: 0px;color:#ffffff "></el-card> -->
         <!-- element-loading-background="rgba(0, 0, 0, 0.8) -->
       </el-tab-pane>
-      <el-tab-pane label="分析记录" name="second">
+      <el-tab-pane label="分析记录" name="second" v-loading="data_loading" element-loading-background="rgba(0, 0, 0, 0.8)">
         <el-row>
           <el-col :span="10">
             <el-input size="mini" clearable placeholder="请输入项目名称" @change="queryProjectBystart" v-model="searchName">
@@ -589,6 +589,7 @@ export default {
   name: "DemolitionList",
   data() {
     return {
+      data_loading:false,
       searchName: "",
       FileList: [],
       localLoading: null,
@@ -1339,13 +1340,15 @@ export default {
             "endDateTime": endDate,
           }
         }
-
+        that.data_loading=true;
         debugger
         getZdProjectList(queryParams).then((res) => {
+          that.data_loading=false;
           that.projectList = res.rows;
           that.rowsCount = res.total;
         }).catch((err) => {
-          console.log(err)
+          console.log(err);
+          that.data_loading=false;
         })
       }
       else {
@@ -4337,7 +4340,7 @@ export default {
    * 清楚临时图元
    */
   beforeDestroy() {
-     
+    if (this.sublayerid) this.$layer.close(this.sublayerid);
     this.removePolygonEntity();
     if (handlerPolygon) {
       handlerPolygon.deactivate();
@@ -4367,7 +4370,7 @@ export default {
 <style lang="scss">
 @import "@/../../zt.scss";
 .el-icon-openeyes {
-  background: url("./眼睛.png") center no-repeat;
+  background: url("./yanjing.png") center no-repeat;
   font-size: 0.7rem;
   background-size: cover;
   line-height:1rem;
@@ -4379,7 +4382,7 @@ export default {
   line-height:1rem;
 }
 .el-icon-closeeyes {
-  background: url("./闭眼睛.png") center no-repeat;
+  background: url("./biyan.png") center no-repeat;
   font-size: 0.7rem;
   background-size: cover;
   line-height:1rem;