Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/App.vue

@@ -404,7 +404,7 @@ body {
     height: calc(100vh - @headerHeight);
     top: @headerHeight;
     background-color: fade(#192a26, 75%);
-    z-index: 99;
+    z-index: 3000;
     opacity: 0;
     transition: opacity 0.2s;
     transition-timing-function: ease-in;

src/components/chart/radar/normal-radar-chart.vue

@@ -43,6 +43,10 @@ export default {
         ];
       },
     },
+    showLegend: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -120,6 +124,15 @@ export default {
             fontSize: util.vh(16),
           },
         },
+        legend: {
+          show: this.showLegend,
+          bottom: 16,
+          inactiveColor: partten.getColor("gray"),
+          textStyle: {
+            color: partten.getColor("grayl"),
+            fontSize: 12,
+          },
+        },
         radar: [
           // 最低层 80
           {

src/components/coms/table/table2.vue

@@ -17,6 +17,7 @@
       :width="col.width"
       :min-width="col.minWidth"
       :sortable="col.sortable"
+      :sort-orders="sortOrder"
       :show-overflow-tooltip="!col.slot"
       :fixed="col.fixed"
       :align="'center'"
@@ -40,7 +41,7 @@
     v-if="pageable"
     @current-change="handleCurrentChange"
     :current-page="currentPage"
-    :page-size="pageSize"
+    v-modal:page-size="selfPageSize"
     :total="data.total"
     v-bind="elPaggingProps"
   >
@@ -141,6 +142,12 @@ export default {
       if (this.pageable) return this.currentPage * this.pageSize;
       else return this.data.data.length;
     },
+    sortOrder:{
+      type:Array,
+      default:()  =>{
+        return ['descending', 'ascending', null]
+      }
+    }
   },
   // 函数
   methods: {
@@ -171,6 +178,8 @@ export default {
   },
   created() {
     // 创建后
+    this.selfPageSize = this.pageSize
+
   },
   beforeMount() {
     // 渲染前

src/views/Demo.vue

@@ -230,7 +230,9 @@
     </table-2>
 
     <h3>table</h3>
-    <Table :data="tableData" :height="'200px'" :canScroll="true" :pageSize="40" :showHover="false" @onPagging="tableonPagging" />
+    <Table :data="tableData" :height="'200px'" :canScroll="true" :pageSize="40" :showHover="false" @onPagging="tableonPagging"
+    
+     />
     <h3>table</h3>
     <check-table :data="tableData" :height="'200px'" :canScroll="true" :pageSize="40" :showHover="false" @onPagging="tableonPagging" @check="CheckTableonCheck" />