--no commit message

@@ -135,7 +135,7 @@ export default {
               label: {
               label: {
 
 
                  formatter: params => {
                  formatter: params => {
-               return `${params.data.name}\n${params.data.value+"个"}`;
+               return `${params.name}\n${params.value+"个"}`;
             },
             },
                 show: true,
                 show: true,
                 position: 'insideRight',
                 position: 'insideRight',

+<template>
+  <Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart>
+</template>
+<script>
+import Echart from '@/common/echart'
+export default {
+  components: {
+    Echart,
+  },
+   data() {
+    return {
+      key:0
+    }
+    },
+  props: {
+    cdata: {
+      type: Object,
+      default: () => ({})
+    },
+  },
+  watch: {
+    cdata: {
+      handler (newData) {
+        console.log("newData",newData);
+        this.options = {
+         grid: {
+            right:"1%",
+            bottom:"4%"
+          },
+          color: [
+            "#37a2da",
+            "#32c5e9",
+            "#9fe6b8",
+            "#ffdb5c",
+            "#ff9f7f",
+            "#fb7293",
+            "#e7bcf3",
+            "#8378ea"
+          ],
+          tooltip: {
+            trigger: "item",
+            formatter: "{a} <br/>{b} : {c} ({d}%)"
+          },
+          toolbox: {
+            show: true
+          },
+          calculable: true,
+          series: [
+            {
+              name: "业务量",
+              type: "pie",
+              radius: [40,100],
+              roseType: "area",
+              data: newData.seriesData
+            }
+          ],
+
+        }
+         this.key++
+      },
+      immediate: true,
+      deep: true
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+#centreLeft1Chart {
+  margin-bottom: 10px;
+  margin-left: 60px;
+}
+</style>

+<template>
+  <div>
+    <Chart :cdata="cdata" />
+  </div>
+</template>
+
+<script>
+import Chart from "./Chart";
+import work from "@/api/work";
+export default {
+  data () {
+    return {
+      cdata: {
+        seriesData: [],
+      },
+    };
+  },
+  components: {
+    Chart,
+  },
+  mounted () {
+       this.getdjywltotal();
+
+
+  },
+  methods: {
+    // 获取登记业务量玫瑰图数据
+   async getdjywltotal () {
+        try {
+          let p = {
+            DJLX: "",
+            QLLX: "",
+            XZQDM: "",
+          };
+          let res = await work.getdjywltotal(p);
+          console.log("res",res);
+          // 遍历修改数组键，作为echars图表的参数
+          res.result.map((item) => {
+          return (
+            this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
+          )
+       });
+        } catch (error) {
+          console.log(error);
+        }
+
+
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

@@ -49,7 +49,7 @@ export default {
             {
             {
               name: "业务量",
               name: "业务量",
               type: "pie",
               type: "pie",
-              radius: [40,100],
+              radius: [0,100],
               roseType: "area",
               roseType: "area",
               data: newData.seriesData
               data: newData.seriesData
             }
             }

@@ -33,11 +33,11 @@ export default {
             XZQDM: "",
             XZQDM: "",
           };
           };
           let res = await work.getdjywltotal(p);
           let res = await work.getdjywltotal(p);
-          console.log("res",res);
           // 遍历修改数组键，作为echars图表的参数
           // 遍历修改数组键，作为echars图表的参数
           res.result.map((item) => {
           res.result.map((item) => {
           return (
           return (
             this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
             this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
+
           )
           )
        });
        });
         } catch (error) {
         } catch (error) {

@@ -283,6 +283,19 @@ table td {
 
 
 // 时间选择框样式
 // 时间选择框样式
 .el-date-picker {
 .el-date-picker {
+  background: url("~@/image/slbg.png") no-repeat;
+  background-size: 100% 100%;
+  padding-top: 13px;
+  padding-bottom: 13px;
+  table{
+    background: url("~@/image/rqjx.png") no-repeat;
+    background-size: 100% 100%;
+    padding: 8px;
+  }
+  table td {
+    box-sizing: border-box;
+    border-bottom: 0px solid #074487!important;
+  }
   .el-input__inner {
   .el-input__inner {
     background-color: #031a46;
     background-color: #031a46;
   }
   }
@@ -298,18 +311,24 @@ table td {
   .el-date-table td.disabled div {
   .el-date-table td.disabled div {
     background-color: #074487;
     background-color: #074487;
   }
   }
-
-  background-color: #031a46;
-
+  .el-date-picker__header{
+    margin-bottom: 0px;
+  }
   .el-date-picker__header-label {
   .el-date-picker__header-label {
     color: #A6CFD6;
     color: #A6CFD6;
   }
   }
 
 
   .el-picker-panel__content {
   .el-picker-panel__content {
-    background-color: #074487;
-
+    padding-top: 0px;
+    margin-top: 0px;
     .disabled {
     .disabled {
       background-color: #074487;
       background-color: #074487;
+      div{
+        span{
+          color:rgba(172, 239, 250,.5)
+
+        }
+      }
 
 
     }
     }
   }
   }
@@ -324,7 +343,7 @@ table td {
   }
   }
 
 
   .el-date-table td span {
   .el-date-table td span {
-    color: #A6CFD6;
+    color: #DBFAFF
   }
   }
 
 
   .el-date-table td.current:not(.disabled) span {
   .el-date-table td.current:not(.disabled) span {
@@ -460,4 +479,4 @@ table td {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
 .el-select-dropdown__item:hover {
   background-color: transparent !important;
   background-color: transparent !important;
-}
\ No newline at end of file
+}

@@ -93,8 +93,8 @@ export default {
           };
           };
           let res = await work.getsthjqxjrtotal(p);
           let res = await work.getsthjqxjrtotal(p);
           console.log("res",res);
           console.log("res",res);
-          this.stjrl=res.result.sum
-          this.qxjrl=res.result.sum
+          this.stjrl=res.result.stsum
+          this.qxjrl=res.result.qxsum
           this.qxerrer=Number(res.result.qxjrerrer)
           this.qxerrer=Number(res.result.qxjrerrer)
           this.sterrer=Number(res.result.sthjerrer)
           this.sterrer=Number(res.result.sthjerrer)
           if(res.result.sum=="0"){
           if(res.result.sum=="0"){