Merge branch 'dev_xzeq_xz' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq_xz

src/views/index/echarts/zztCharts.js

@@ -69,7 +69,7 @@ export function zztCharts(row) {
                 axisTick: { show: false, },
                 axisLabel: {//x轴文字的配置
                     show: true,
-                    rotate: 0,
+                    rotate: 30,
                     textStyle: {
                         color: "#242424",
 
@@ -141,10 +141,7 @@ export function zztCharts(row) {
 
         ],
         grid: {
-            x: 80,
-            y: 70,
-            x2: 5,
-            y2: 25,
+            bottom: 80,
             borderWidth: 1,
         },
     };

src/views/index/ypbg.vue

@@ -62,9 +62,9 @@
               {{ JqzsFa.fatb }}，造成经济损失{{ JqzsFa.ssje }}元同比上期 ({{
                 JqzsFa.sstbs
               }}元)<span :class="JqzsFa.tbJeclass == 'up' ? 'upclass' : 'downclass'">{{ JqzsFa.tbJeclass == "up" ? "⬆" : "⬇" }}</span>{{ JqzsFa.sszb }}，环比上期 ({{ JqzsFa.sshbs }}元)<span :class="JqzsFa.hbJeclass == 'up' ? 'upclass' : 'downclass'">{{ JqzsFa.hbJeclass == "up" ? "⬆" : "⬇" }}</span>
-              {{ JqzsFa.sshb }}。本期共破获刑事案件{{ JqzsPa.fas }}起，环比上期
+              {{ JqzsFa.sshb }}。本期共破获刑事案件{{ JqzsPa.fas }}元，环比上期
               ({{ JqzsPa.fahbs }}起)
-              <span :class="JqzsFa.hbAjclass == 'up' ? 'upclass' : 'downclass'">{{ JqzsFa.hbAjclass == "up" ? "⬆" : "⬇" }}</span>{{ JqzsPa.fahb }}，同比期上期 ({{ JqzsPa.fatbs }}起)
+              <span :class="JqzsFa.hbAjclass == 'up' ? 'upclass' : 'downclass'">{{ JqzsFa.hbAjclass == "up" ? "⬆" : "⬇" }}</span>{{ JqzsPa.fahb }}，同比期上期 ({{ JqzsPa.fatbs }}元)
               <span :class="JqzsFa.tbAjclass == 'up' ? 'upclass' : 'downclass'">{{ JqzsFa.tbAjclass == "up" ? "⬆" : "⬇" }}</span>{{ JqzsPa.fatb }}
             </p>
           </div>
@@ -132,14 +132,14 @@
                       }}{{ scope.row["fatb"] }}</span>
                   </div>
                   <div v-else-if="columnTitle.label == '损失环比'">
-                    <span>环比上期:{{ scope.row["sshbs"] }}起</span>
+                    <span>环比上期:{{ scope.row["sshbs"] }}元</span>
                     <span :class="
                         scope.row.hbJeclass == 'up' ? 'upclass' : 'downclass'
                       ">{{ scope.row["hbJeclass"] == "up" ? "⬆" : "⬇"
                       }}{{ scope.row["sshb"] }}</span>
                   </div>
                   <div v-else-if="columnTitle.label == '损失同比'">
-                    <span>同比去年:{{ scope.row["sstbs"] }}起</span>
+                    <span>同比去年:{{ scope.row["sstbs"] }}元</span>
                     <span :class="
                         scope.row.tbJeclass == 'up' ? 'upclass' : 'downclass'
                       ">{{ scope.row["tbJeclass"] == "up" ? "⬆" : "⬇"
@@ -335,8 +335,8 @@
               }}起。
             </p>
           </div>
-          <div id="zdajfa"
-               ref="zdajfa"
+          <div id="zdajPa"
+               ref="zdajPa"
                style="height: 400px; width: 100%; padding-top: 6px"></div>
           <div class="table">
             <el-table id="ajzbQuery"
@@ -525,7 +525,7 @@ export default {
         },
         {
           label: "损失占比",
-          prop: "fahb",
+          prop: "sszb",
         },
         {
           label: "损失环比",
@@ -1365,7 +1365,7 @@ export default {
           let namefa = [],
             valuefa = [];
           fa.list.forEach((item, index) => {
-            if (index == self.tableDataPa.length - 1) {
+            if (index == self.zdajFa.list.length - 1) {
               return;
             }
             namefa.push(item.dwmc);
@@ -1382,14 +1382,14 @@ export default {
           let namepa = [],
             valuepa = [];
           pa.list.forEach((item, index) => {
-            if (index == self.tableDataPa.length - 1) {
+            if (index == self.zdajPa.list.length - 1) {
               return;
             }
             namepa.push(item.dwmc);
             valuepa.push(item.ajs);
           });
-          let objpa = { x: namepa, y: valuepa, title: "辖区各地破案情况" };
-          let gxqpaEcharts = this.$echarts.init(this.$refs.gxqpa);
+          let objpa = { x: namepa, y: valuepa, title: "重大案件破案情况" };
+          let gxqpaEcharts = this.$echarts.init(this.$refs.zdajPa);
           window.onresize = () => {
             gxqpaEcharts.resize();
           };