Merge branch 'main' of http://192.168.1.22:3000/zcy/canneng-admin

src/components/echarts/rmsboxi.vue

@@ -9,7 +9,7 @@
             style="position: absolute; right: 10px; top: 0px; z-index: 20000"
             type="primary"
             link
-            icon="el-icon-download"
+            icon="el-icon-Download"
             title="生成图片"
             @click="download"
         >
@@ -92,9 +92,9 @@ export default {
   },
   created() {
     if (this.flag == 1) {
-            this.vh = mainHeight(175).height
+            this.vh = mainHeight(165).height
         }  else {
-            this.vh =  mainHeight(175,2).height
+            this.vh =  mainHeight(165,2).height
         }
         this.vw = '100%'
   },

src/components/echarts/shushiboxi.vue

@@ -9,7 +9,7 @@
             style="position: absolute; right: 10px; top: 0px; z-index: 20000"
             type="primary"
             link
-            icon="download"
+            icon="el-icon-Download"
             title="生成图片"
             @click="download"
         >
@@ -78,9 +78,9 @@ export default {
     created() {
 
         if (this.flag == 1) {
-            this.vh = mainHeight(175).height
+            this.vh = mainHeight(165).height
         }  else {
-            this.vh =  mainHeight(175,2).height
+            this.vh =  mainHeight(165,2).height
         }
         this.vw = '100%'
     },
@@ -1151,5 +1151,3 @@ export default {
     }
 }
 </script>
-
-

src/components/table/fieldRender/index.vue

@@ -67,10 +67,11 @@
                 :class="btn.class"
                 class="table-operate"
                 :type="btn.type"
+                :loading="props.row.loading || false"
                 :disabled="btn.disabled && btn.disabled(row, field)"
                 v-bind="btn.attr"
             >
-                <Icon :name="btn.icon" />
+                <Icon v-if="!props.row.loading" :name="btn.icon" />
                 <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
             </el-button>