Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -7,7 +7,7 @@
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
             <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
             <b>{{ title }}</b>
             <b>{{ title }}</b>
           </div>
           </div>
-          <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
+          <svg-icon icon-class='cancel' class="closeStyle" @click="onCancel" />
         </div>
         </div>
         <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
         <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
           <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
           <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />

@@ -71,7 +71,6 @@ this.yAxisData3 = newData.echartData.map(v => v.value3);
         formatter: function(params) {
         formatter: function(params) {
             let html = '';
             let html = '';
             params.forEach(v => {
             params.forEach(v => {
-                console.log(v)
                 html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000">
                 html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000">
                 <span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${newData.color[v.componentIndex]};"></span>
                 <span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${newData.color[v.componentIndex]};"></span>
                 ${v.seriesName}.${v.name}
                 ${v.seriesName}.${v.name}

@@ -33,8 +33,8 @@ export default {
            grid: {
            grid: {
         // 让图表占满容器
         // 让图表占满容器
         top: "0%",
         top: "0%",
-        left: "1%",
-        right: "30%",
+        left: "10%",
+        right: "40%",
         bottom: "0%",
         bottom: "0%",
       },
       },
           color: [
           color: [
@@ -60,7 +60,7 @@ export default {
             {
             {
               name: "业务量",
               name: "业务量",
               type: "pie",
               type: "pie",
-              radius: [30, 80],
+              radius: [0, 80],
               roseType: "area",
               roseType: "area",
               data: newData.seriesData
               data: newData.seriesData
             }
             }

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1673343240640" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2681" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M872.802928 755.99406 872.864326 755.99406 872.864326 755.624646Z" fill="#ffffff" p-id="2682"></path><path d="M927.846568 511.997953c0-229.315756-186.567139-415.839917-415.838893-415.839917-229.329059 0-415.85322 186.524161-415.85322 415.839917 0 229.300406 186.524161 415.84094 415.85322 415.84094C741.278405 927.838893 927.846568 741.29836 927.846568 511.997953M512.007675 868.171955c-196.375529 0-356.172979-159.827125-356.172979-356.174002 0-196.374506 159.797449-356.157629 356.172979-356.157629 196.34483 0 356.144326 159.783123 356.144326 356.157629C868.152001 708.34483 708.352505 868.171955 512.007675 868.171955" fill="#ffffff" p-id="2683"></path><path d="M682.378947 642.227993 553.797453 513.264806 682.261267 386.229528c11.661597-11.514241 11.749602-30.332842 0.234337-41.995463-11.514241-11.676947-30.362518-11.765975-42.026162-0.222057L511.888971 471.195665 385.223107 344.130711c-11.602246-11.603269-30.393217-11.661597-42.025139-0.059352-11.603269 11.618619-11.603269 30.407544-0.059352 42.011836l126.518508 126.887922L342.137823 639.104863c-11.662621 11.543917-11.780301 30.305213-0.23536 41.96988 5.830799 5.89015 13.429871 8.833179 21.086248 8.833179 7.53972 0 15.136745-2.8847 20.910239-8.569166l127.695311-126.311801L640.293433 684.195827c5.802146 5.8001 13.428847 8.717546 21.056572 8.717546 7.599072 0 15.165398-2.917446 20.968567-8.659217C693.922864 672.681586 693.950494 653.889591 682.378947 642.227993" fill="#ffffff" p-id="2684"></path></svg>
\ No newline at end of file

@@ -40,6 +40,7 @@ export default {
   mixins: [drawMixin],
   mixins: [drawMixin],
   data() {
   data() {
     return {
     return {
+      loading: true,
       decorationColor: ["#568aea", "#568aea"],
       decorationColor: ["#568aea", "#568aea"],
     };
     };
   },
   },

@@ -74,13 +74,16 @@ export default {
       width: 33%;
       width: 33%;
       height: 100%;
       height: 100%;
       p {
       p {
-        height: 70px;
-        line-height: 70px;
+        margin: 15px;
+        height: 50px;
+        line-height: 50px;
         font-size: 40px;
         font-size: 40px;
         text-align: center;
         text-align: center;
         color:rgb(246, 246, 229);
         color:rgb(246, 246, 229);
+        background: linear-gradient(143deg, #29C6F2 0%, #4370EF 100%);
       }
       }
       p:nth-child(2) {
       p:nth-child(2) {
+         background:none;
         color: rgb(223, 213, 81);
         color: rgb(223, 213, 81);
       }
       }
     }
     }

@@ -79,7 +79,7 @@ export default {
   },
   },
   components: { columnarsmat,Rose },
   components: { columnarsmat,Rose },
   mounted() {
   mounted() {
-    scroll(tableref.value.$refs.bodyWrapper);//设置滚动
+
   },
   },
   beforeDestroy() {},
   beforeDestroy() {},
   methods: {
   methods: {