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

@@ -364,8 +364,9 @@
               分摊土地面积： <br />
               <p class="label-detail">（FTTDMJ）</p>
             </span>
-            <el-input :disabled="$store.state.business.Edit" : 999999999999999, min: 0, precision: 3 }"
-              placeholder="分摊土地面积" type="number" v-model.number="ruleForm.fttdmj"></el-input>
+            <el-input :disabled="$store.state.business.Edit"
+              v-only-number="{ max: 999999999999999, min: 0, precision: 3 }" placeholder="分摊土地面积" type="number"
+              v-model.number="ruleForm.fttdmj"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

@@ -68,7 +68,7 @@ export default {
             },
             // 如果需要自定义 tooltip样式，需要使用formatter
             formatter: params => {
-              return `<div style="">${params.name}:${params.value+"个"}</div>`
+              return `<div style="">${params.name}:${params.value + "个"}</div>`
             }
           },
           visualMap: {
@@ -90,23 +90,23 @@ export default {
               color: '#737373'
             }
           },
-         geo: {
-             aspectScale: 1, //长宽比
-              zoom: 1.1,
-              mapType: '汉中市', // 自定义扩展图表类型
-              top: '15%',
-              left: '10%',
-                    map: '汉中市',
-                    itemStyle: {
-                        normal: {//阴影
-                            areaColor: '#02D9FD ',
-                            shadowColor: '#01271F',
-                            borderWidth: 0,
-                            shadowOffsetX: 2,
-                            shadowOffsetY: 25
-                        }
-                    }
-                    },
+          geo: {
+            aspectScale: 1, //长宽比
+            zoom: 1.1,
+            mapType: '汉中市', // 自定义扩展图表类型
+            top: '15%',
+            left: '10%',
+            map: '汉中市',
+            itemStyle: {
+              normal: {//阴影
+                areaColor: '#02D9FD ',
+                shadowColor: '#01271F',
+                borderWidth: 0,
+                shadowOffsetX: 2,
+                shadowOffsetY: 25
+              }
+            }
+          },
           series: [
             {
               type: 'map',
@@ -121,7 +121,7 @@ export default {
                   borderColor: 'rgba(0,242,252,.5)',
                   borderWidth: 2,
                   shadowBlur: 7,
-                  borderColor:'rgba(19,54,162,.1)',
+                  borderColor: 'rgba(19,54,162,.1)',
                   shadowColor: '#44f2fc',
                 },
                 emphasis: {
@@ -133,10 +133,9 @@ export default {
                 },
               },
               label: {
-
-                 formatter: params => {
-               return `${params.data.name}\n${params.data.value+"个"}`;
-            },
+                formatter: params => {
+                  return `${params.data?.name}\n${params.data?.value + "个"}`;
+                },
                 show: true,
                 position: 'insideRight',
                 textStyle: {

@@ -7,11 +7,11 @@ export default {
   components: {
     Echart,
   },
-   data() {
+  data () {
     return {
-      key:0
+      key: 0
     }
-    },
+  },
   props: {
     cdata: {
       type: Object,
@@ -21,11 +21,10 @@ export default {
   watch: {
     cdata: {
       handler (newData) {
-        console.log("newData",newData);
         this.options = {
-         grid: {
-            right:"1%",
-            bottom:"4%"
+          grid: {
+            right: "1%",
+            bottom: "4%"
           },
           color: [
             "#37a2da",
@@ -49,14 +48,14 @@ export default {
             {
               name: "业务量",
               type: "pie",
-              radius: [40,100],
+              radius: [40, 100],
               roseType: "area",
               data: newData.seriesData
             }
           ],
 
         }
-         this.key++
+        this.key++
       },
       immediate: true,
       deep: true

@@ -19,30 +19,29 @@ export default {
     Chart,
   },
   mounted () {
-       this.getdjywltotal();
+    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) => {
+    async getdjywltotal () {
+      try {
+        let p = {
+          DJLX: "",
+          QLLX: "",
+          XZQDM: "",
+        };
+        let res = await work.getdjywltotal(p);
+        // 遍历修改数组键，作为echars图表的参数
+        res.result.map((item) => {
           return (
             this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
           )
-       });
-        } catch (error) {
-          console.log(error);
-        }
+        });
+      } catch (error) {
+        console.log(error);
+      }
 
 
     },
@@ -51,4 +50,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 </style>

@@ -18,7 +18,7 @@
           </p>
           <p>
             <span>成功率</span>
-            <span class="cg">{{qxcgl}}</span>
+            <span class="cg">{{ qxcgl }}</span>
           </p>
         </div>
       </div>
@@ -41,7 +41,7 @@
           </p>
           <p>
             <span>成功率</span>
-            <span class="cg">{{stcgl}}</span>
+            <span class="cg">{{ stcgl }}</span>
           </p>
         </div>
       </div>
@@ -66,8 +66,8 @@ export default {
       stsuccess: "",
       qxjrl: "",
       stjrl: "",
-      qxcgl:"",
-      stcgl:""
+      qxcgl: "",
+      stcgl: ""
     };
   },
   mounted () {
@@ -76,10 +76,10 @@ export default {
   components: { columnar },
   computed: {
     qxjrlList: function () {
-      return this.qxjrl.toString().split("");
+      return this.qxjrl && this.qxjrl.toString().split("");
     },
     stjrlList: function () {
-      return this.stjrl.toString().split("");
+      return this.stjrl && this.stjrl.toString().split("");
     },
   },
   methods: {
@@ -92,19 +92,18 @@ export default {
             XZQDM: "",
           };
           let res = await work.getsthjqxjrtotal(p);
-          console.log("res",res);
-          this.stjrl=res.result.sum
-          this.qxjrl=res.result.sum
-          this.qxerrer=Number(res.result.qxjrerrer)
-          this.sterrer=Number(res.result.sthjerrer)
-          if(res.result.sum=="0"){
-             this.qxcgl="100%"
-             this.stcgl="100%"
-          }else{
-            let qxcglnum=Number(res.result.qxjrsuccess)/this.qxjrl*100
-            let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100
-          this.qxcgl=qxcglnum.toFixed(2)+"%";
-          this.stcgl=stcgl.toFixed(2)+"%";
+          this.stjrl = res.result.sum
+          this.qxjrl = res.result.sum
+          this.qxerrer = Number(res.result.qxjrerrer)
+          this.sterrer = Number(res.result.sthjerrer)
+          if (res.result.sum == "0") {
+            this.qxcgl = "100%"
+            this.stcgl = "100%"
+          } else {
+            let qxcglnum = Number(res.result.qxjrsuccess) / this.qxjrl * 100
+            let stcgl = Number(res.result.sthjsuccess) / this.qxjrl * 100
+            this.qxcgl = qxcglnum.toFixed(2) + "%";
+            this.stcgl = stcgl.toFixed(2) + "%";
           }
 
         } catch (error) {

@@ -29,9 +29,8 @@ class data extends filter {
             <div>
               <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
               <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
-              <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报失败</span>
-              <span v-show={scope.row.exchangeState == 3} class='adopt'>上报成功响应成功</span>
-              <span v-show={scope.row.exchangeState == 4} class='warehousing'>响应失败</span>
+              <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span>
+              <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span>
             </div>
           )
         }

@@ -30,8 +30,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
-              <el-select v-model="form.state" class="width100" clearable placeholder="响应结果">
-                <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value">
+              <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
+                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>