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

@@ -7,13 +7,14 @@ class business {
     startDate:开始日期
     endDate:结束日期 
   */
-  async getSuucessRate(startDate,endDate) {
+  async getSuucessRate(startDate,endDate,qxdm) {
     return request({
       url: SERVER.SERVERAPI + '/rest/statistics/Business/sf',
       method: 'get',
       params: {
         startDate:startDate,
-        endDate:endDate
+        endDate:endDate,
+        qxdm:qxdm
       }
     })
   }

@@ -7,13 +7,14 @@ class efficient {
     startDate:开始日期
     endDate:结束日期 
   */
-  async getProcessCounts(startDate, endDate) {
+  async getProcessCounts(startDate, endDate,qxdm) {
     return request({
       url: SERVER.SERVERAPI + "/rest/statistics/Efficient/getProcessCounts",
       method: "post",
       params: {
         startDate: startDate,
         endDate: endDate,
+        qxdm:qxdm
       },
     });
   }

@@ -30,9 +30,9 @@
     border-right: none;
     text-align: center;
     padding: 0;
+    color: #05bbdb;
     line-height: 16px;
     font-size: 12px;
-    color: #CEF8FF;
     margin-top: 8px !important;
   }
 

@@ -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,8 +133,7 @@ export default {
                 },
               },
               label: {
-
-                 formatter: params => {
+                formatter: params => {
                return `${params.name}\n${params.value+"个"}`;
             },
                 show: true,

@@ -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",
@@ -56,7 +55,7 @@ export default {
           ],
 
         }
-         this.key++
+        this.key++
       },
       immediate: true,
       deep: true

@@ -19,7 +19,7 @@ export default {
     Chart,
   },
   mounted () {
-       this.getdjywltotal();
+    this.getdjywltotal();
 
 
   },
@@ -35,14 +35,15 @@ export default {
           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 +52,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 </style>

@@ -279,6 +279,7 @@ export default {
     border: 1px solid #224C7C !important;
     margin: 0 0 10px 0 !important;
     width: 100% !important;
+    color: #dadde3 !important;
     background: transparent !important;
   }
 
@@ -286,6 +287,7 @@ export default {
     border: 1px solid #224C7C !important;
     margin: 0 !important;
     width: 100% !important;
+    color: #dadde3 !important;
     background: transparent !important;
   }
 }
@@ -367,6 +369,7 @@ export default {
 
 .tab-pane-item {
   line-height: 20px;
+  color: #02D9FD;
 
   p {
     text-align: center;

@@ -66,13 +66,24 @@ export default {
 .sidebarLeft {
   position: relative;
   top: 13px;
-  left: 10px;
+  width: 30%;
+}
+
+/deep/.el-menu {
+  display: flex;
+  justify-content: space-between;
+}
+
+/deep/.el-menu-item {
+  flex: 1;
+  width: 100%;
 }
 
 .sidebarRight {
   position: relative;
-  left: 10px;
   top: 13px;
+  width: 30%;
+  padding-left: 20px;
 }
 
 // 导航选中背景色

 <template>
-  <el-menu router :default-active="activeMenu" mode="horizontal" menu-trigger="click">
+  <el-menu router :default-active="activeMenu" mode="horizontal">
     <!-- 权限菜单 -->
     <sidebar-item v-for="route in permission_routes.slice(1, 4)" :key="route.path" :item="route"
       :base-path="route.path" />

@@ -463,7 +463,7 @@ table td {
 }
 
 .el-select-dropdown {
-  top: 175px !important;
+  margin-top: 5px !important;
 }
 
 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,

@@ -2,6 +2,9 @@
   <div class="Cfdj from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="130px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">

@@ -2,6 +2,9 @@
   <div class="dyaq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">

@@ -2,6 +2,9 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="150px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">

@@ -2,6 +2,9 @@
   <div class="fdcqdz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">
@@ -63,7 +66,7 @@
         :data="tableData.data">
       </lb-table>
     </div>
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqDz'"/>
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqDz'" />
   </div>
 </template>
 

@@ -2,6 +2,9 @@
   <div class="fdcqqfsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="5">
             <el-form-item label="业务号">

@@ -2,6 +2,9 @@
   <div class="fdcqyz from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">
@@ -63,7 +66,7 @@
         :data="tableData.data">
       </lb-table>
     </div>
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqYz'"/>
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qltFwFdcqYz'" />
   </div>
 </template>
 

@@ -2,6 +2,9 @@
   <div class="gzwsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -2,6 +2,9 @@
   <div class="hysyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "行政区",
-        width: 80,        
+        width: 80,
         render: (h, scope) => {
           return (
             <div>
@@ -18,7 +18,7 @@ class data extends filter {
       },
       {
         label: "权属状态",
-        width: 80,  
+        width: 80,
         render: (h, scope) => {
           return (
             <div>
@@ -26,10 +26,10 @@ class data extends filter {
             </div>
           )
         },
-      },     
+      },
       {
         label: "权利类型",
-        width: 80,  
+        width: 80,
         render: (h, scope) => {
           return (
             <div>
@@ -40,7 +40,7 @@ class data extends filter {
       },
       {
         label: "登记类型",
-        width: 80,  
+        width: 80,
         render: (h, scope) => {
           return (
             <div>
@@ -57,11 +57,12 @@ class data extends filter {
       {
         label: "不动产单元号",
         prop: "BDCDYH",
-        width: 150,  
+        width: 150,
       },
       {
         label: "不动产权证号",
-        prop: "BDCQZH"
+        prop: "BDCQZH",
+        width: 150,
       },
       {
         label: "权利人",
@@ -74,13 +75,13 @@ class data extends filter {
       {
         label: "使用权面积",
         prop: "SYQMJ",
-        width: 90,  
+        width: 90,
       },
       {
         label: "坐落",
         prop: "zl"
       },
-      
+
       {
         label: "登记时间",
         width: 140,

@@ -2,6 +2,9 @@
   <div class="jsydzjdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">
@@ -13,7 +16,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="权属状态">
-              <el-select  class="width100" v-model="form.QSZT" placeholder="权属状态">
+              <el-select class="width100" v-model="form.QSZT" placeholder="权属状态">
                 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
@@ -58,7 +61,7 @@
         :data="tableData.data">
       </lb-table>
     </div>
-    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlJsydsyq'"/>
+    <dataDetails ref="editLog" :title="title" :tabsActiveName="'qlfQlJsydsyq'" />
   </div>
 </template>
 

@@ -2,6 +2,9 @@
   <div class="lq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -36,11 +36,13 @@ class data extends filter {
       },
       {
         label: "不动产单元号",
-        prop: "BDCDYH"
+        prop: "BDCDYH",
+        width: 150,
       },
       {
         label: "不动产权证号",
-        prop: "BDCQZH"
+        prop: "BDCQZH",
+        width: 150,
       },
       {
         label: "地籍号",

@@ -2,6 +2,9 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -2,6 +2,9 @@
   <div class="tdsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -2,6 +2,9 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="110px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区" label-width="106px">

@@ -2,6 +2,9 @@
   <div class="from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="5">
             <el-form-item label="行政区" label-width="80px">

@@ -2,6 +2,9 @@
   <div class="cancellationReg from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="105px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="行政区">

@@ -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,7 +92,6 @@ export default {
             XZQDM: "",
           };
           let res = await work.getsthjqxjrtotal(p);
-          console.log("res",res);
           this.stjrl=res.result.stsum
           this.qxjrl=res.result.qxsum
           this.qxerrer=Number(res.result.qxjrerrer)
@@ -105,8 +104,8 @@ export default {
             let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100
           this.qxcgl=qxcglnum.toFixed(2)+"%";
           this.stcgl=stcgl.toFixed(2)+"%";
-          }
 
+          }
         } catch (error) {
           this.$refs.msg.messageShow();
         }

@@ -2,34 +2,44 @@
   <!-- 监控日志 -->
   <div class="jktjDetail form-clues">
     <!-- 头部搜索 -->
-    <el-form
-      ref="form"
-      :model="form"
-      :inline="true"
-      class="from-clues-header"
-      label-width="100px"
-    >
-      <el-row class="rows">
-        <el-col :span="8">
-          <el-form-item label="开始日期">
-            <el-date-picker
-              v-model="valueTime"
-              value-format="yyyy/MM/dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <!-- 操作按钮 -->
-        <el-col :span="3" class="btnColRight">
-          <btn nativeType="cz" @click="resetForm">重置</btn>
-          <btn nativeType="cx" @click="getProcessCounts">查询</btn>
-        </el-col>
-      </el-row>
-    </el-form>
+    <div class="from-clues-header">
+      <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="开始日期" prop="startTime">
+              <el-date-picker
+                type="datetime"
+                placeholder="开始日期"
+                :picker-options="pickerOptionsStart"
+                clearable
+                v-model="form.startTime"
+                value-format="yyyy/MM/dd HH:mm:ss"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="结束日期" prop="endTime">
+              <el-date-picker
+                type="datetime"
+                placeholder="结束日期"
+                :picker-options="pickerOptionsEnd"
+                clearable
+                v-model="form.endTime"
+                value-format="yyyy/MM/dd HH:mm:ss"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <!-- 操作按钮 -->
+          <el-col :span="3" class="btnColRight">
+            <btn nativeType="cz" @click="resetForm">重置</btn>
+            <btn nativeType="cx" @click="getProcessCounts">查询</btn>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
     <!-- 表格 -->
     <div class="form-clues-content echarts-box" v-if="pieChartsData.length">
       <div id="myChart" class="chart"></div>
@@ -44,7 +54,7 @@ import efficient from "@/api/efficient";
 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 export default {
   name: "jktj",
-  data() {
+  data () {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -62,26 +72,28 @@ export default {
           }
         },
       },
+      form: {
+        startTime: getFirstDayOfSeason(),
+        endTime: timeFormat(new Date(), true),
+      },
       // 搜索表单
-      valueTime: [getFirstDayOfSeason(), timeFormat(new Date(),true)],
-      // valueTime: ["2022/01/01 00:00:00", timeFormat(new Date())],
       pieChartsData: [],
     };
   },
-  created() {
+  created () {},
+  mounted() {
     this.getProcessCounts();
   },
-  mounted() {},
   computed: {
     ...mapGetters(["dicData"]),
   },
   methods: {
     //查询各区县办件数量
-    async getProcessCounts() {
+    async getProcessCounts () {
       this.pieChartsData = [];
       let { result: res } = await efficient.getProcessCounts(
-        this.valueTime[0],
-        this.valueTime[1]
+        this.form.startTime,
+        this.form.endTime
       );
       //获取图表配置项需要的数据
       res.length > 0 &&
@@ -95,24 +107,29 @@ export default {
             groupId: item.recType,
           });
         });
-      // 初始化图表
-      this.echartInit();
-      this.barChartInit(res[0].recType);
+        res.length && this.$nextTick(() => {
+        // 初始化图表
+        this.echartInit();
+        this.barChartInit(res[0].recType);
+      });
     },
     // 重置
-    resetForm() {
-      this.valueTime = [getFirstDayOfSeason(), timeFormat(new Date(),true)];
+    resetForm () {
+      this.form = {
+        startTime: getFirstDayOfSeason(),
+        endTime: timeFormat(new Date(),  true),
+      };
       this.getProcessCounts();
     },
     //玫瑰图初始化
-    echartInit() {
+    echartInit () {
       let _this = this;
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       // 绘制图表
       myChart.setOption({
         legend: {
-          bottom: "6%",
+          bottom: "2%",
           left: "center",
           textStyle: {
             color: "#fff",
@@ -127,14 +144,11 @@ export default {
             name: "各业务类型办理数量",
             type: "pie",
             radius: [0, 250],
-            center: ["50%", "30%"],
+            center: ["50%", "45%"],
             roseType: "area",
             itemStyle: {
               borderRadius: 8,
             },
-            label: {
-              show: false,
-            },
             data: this.pieChartsData,
           },
         ],
@@ -169,23 +183,32 @@ export default {
       });
     },
     //柱图初始化
-    async barChartInit(recType) {
+    async barChartInit (recType) {
       //请求recType对应业务的各区县数据
       let { result: res } = await efficient.getProcessDays(
         recType,
-        this.valueTime[0],
-        this.valueTime[1]
+        this.form.startTime,
+        this.form.endTime
       );
+      //行政区数组
       let xzqArr = [];
-      //行政区代码过滤
-      res.length > 0 &&
-        res.forEach((item) => {
-          xzqArr.push(
-            this.dicData["A20"].filter((i) => {
-              return i.DCODE == item.qxdm;
-            })[0].DNAME
-          );
+      this.dicData["A20"].forEach((item) => {
+        xzqArr.push(item.DNAME);
+        let tempArr = res.filter((i) => {
+          return i.qxdm == item.DCODE;
         });
+        if (tempArr.length) {
+          item.avgDay = tempArr[0].avgDay;
+          item.maxDay = tempArr[0].maxDay;
+          item.minDay = tempArr[0].minDay;
+        } else {
+          item.avgDay = 0;
+          item.maxDay = 0;
+          item.minDay = 0;
+        }
+      });
+      //补全无数据行政区后的结果数组
+      let dealArr = [...this.dicData["A20"]];
       let myChartBar = this.$echarts.init(
         document.getElementById("myChart-bar")
       );
@@ -220,7 +243,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "20",
+                fontSize: "16",
               },
             },
           },
@@ -245,18 +268,21 @@ export default {
         series: [
           {
             type: "bar",
+            barMaxWidth: '60',
             name: "最短用时",
-            data: res.map((item) => item.minDay),
+            data: dealArr.map((item) => item.minDay),
           },
           {
             type: "bar",
+            barMaxWidth: '60',
             name: "平均用时",
-            data: res.map((item) => item.avgDay),
+            data: dealArr.map((item) => item.avgDay),
           },
           {
             type: "bar",
+            barMaxWidth: '60',
             name: "最长用时",
-            data: res.map((item) => item.maxDay),
+            data: dealArr.map((item) => item.maxDay),
           },
         ],
       });
@@ -271,21 +297,26 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .rows {
     margin-left: 100px;
   }
+
   .center {
     line-height: 50vh;
     text-align: center;
   }
+
   .echarts-box {
     display: flex;
     justify-content: center;
+
     .chart {
       width: 40%;
       height: 100%;
       float: left;
     }
+
     .chart-bar {
       width: 60%;
     }

@@ -4,11 +4,14 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="行政区">
               <el-select
-                v-model="form.XZQDM"
+                v-model="form.qxdm"
                 class="width100"
                 clearable
                 placeholder="行政区"
@@ -23,17 +26,28 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="开始日期">
+          <el-col :span="4">
+            <el-form-item label="开始日期" prop="startTime">
               <el-date-picker
-                v-model="valueTime"
+                type="datetime"
+                placeholder="开始日期"
+                :picker-options="pickerOptionsStart"
+                clearable
+                v-model="form.startTime"
                 value-format="yyyy/MM/dd HH:mm:ss"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="结束日期" prop="endTime">
+              <el-date-picker
+                type="datetime"
+                placeholder="结束日期"
+                :picker-options="pickerOptionsEnd"
+                clearable
+                v-model="form.endTime"
+                value-format="yyyy/MM/dd HH:mm:ss"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
@@ -58,7 +72,7 @@ import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 import business from "@/api/business";
 export default {
   name: "jktj",
-  data() {
+  data () {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -76,18 +90,17 @@ export default {
           }
         },
       },
-      // 搜索表单
-      valueTime: [getFirstDayOfSeason(), timeFormat(new Date(),true)],
       recTypeArr: [],
       chartData: [],
+      // 搜索表单
       form: {
-        startTime: "",
-        endTime: "",
+        startTime: getFirstDayOfSeason(),
+        endTime: timeFormat(new Date(),true),
         qxdm: "",
       },
     };
   },
-  mounted() {
+  mounted () {
     // 查询成功率
     this.getSuucessRate();
   },
@@ -95,12 +108,13 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
-    async getSuucessRate() {
+    async getSuucessRate () {
       this.recTypeArr = [];
       this.chartData = [];
       let { result: res } = await business.getSuucessRate(
-        this.valueTime[0],
-        this.valueTime[1]
+        this.form.startTime,
+        this.form.endTime,
+        this.form.qxdm
       );
       this.chartData = res;
       //行政区代码过滤
@@ -108,18 +122,20 @@ export default {
         res.forEach((item) => {
           this.recTypeArr.push(item.recTypeName);
         });
-      this.echartInit();
+      this.$nextTick(() => {
+        // 初始化图表 
+        this.chartData.length && this.echartInit();
+      });
     },
     // 重置
-    resetForm() {
+    resetForm () {
       this.form = {
-        startTime: "",
-        endTime: "",
+        startTime: getFirstDayOfSeason(),
+        endTime: timeFormat(new Date(),true),
       };
-      this.valueTime = [getFirstDayOfSeason(), timeFormat(new Date(),true)];
       this.getSuucessRate();
     },
-    echartInit() {
+    echartInit () {
       let _this = this;
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
@@ -128,6 +144,7 @@ export default {
         color: ["#fff", "#ff6e6e", "#3f99ff", "#ffaf48"],
         tooltip: {
           trigger: "axis",
+          formatter: '{b}<br/>{a0}：{c0}个<br/>{a1}：{c1}个<br/>{a2}：{c2}%',
           axisPointer: {
             type: "cross",
             crossStyle: {
@@ -137,6 +154,7 @@ export default {
         },
         legend: {
           data: ["成功", "失败", "成功率"],
+          top: '16',
           textStyle: {
             show: true,
             color: "#fff",
@@ -201,12 +219,12 @@ export default {
           },
           {
             type: "value",
-            name: "成功率/%",
+            name: "成功率",
             nameTextStyle: {
               color: "#fff",
               fontSize: "16",
             },
-            interval: 5,
+            splitNumber:2,
             axisLabel: {
               formatter: "{value} %",
               textStyle: {
@@ -221,11 +239,7 @@ export default {
           {
             name: "成功",
             type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
+            barMaxWidth: '60',
             data: this.chartData.map((item) => {
               return item.success;
             }),
@@ -233,11 +247,7 @@ export default {
           {
             name: "失败",
             type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
+            barMaxWidth: '60',
             data: this.chartData.map((item) => {
               return item.failure;
             }),
@@ -245,12 +255,8 @@ export default {
           {
             name: "成功率",
             type: "line",
+            barMaxWidth: '60',
             yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + "%";
-              },
-            },
             data: this.chartData.map((item) => {
               return item.rate;
             }),
@@ -263,27 +269,33 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
+
 .jktjDetail {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .rows {
     margin-left: 100px;
   }
+
   .center {
     line-height: 50vh;
     text-align: center;
-    color:#b6b5b5
+    color: #b6b5b5
   }
+
   .echarts-box {
     display: flex;
     justify-content: center;
     height: 500px;
+
     .chart {
       width: 100%;
       height: 100%;
     }
   }
+
   .form-clues-content {
     flex: 1;
     height: 100%;

@@ -4,11 +4,14 @@
     <!-- 头部搜索 -->
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="100px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="行政区">
               <el-select
-                v-model="form.XZQDM"
+                v-model="form.qxdm"
                 class="width100"
                 clearable
                 placeholder="行政区"
@@ -23,38 +26,53 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="开始日期">
+          <el-col :span="4">
+            <el-form-item label="开始日期" prop="startTime">
               <el-date-picker
-                v-model="valueTime"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
+                type="datetime"
+                placeholder="开始日期"
+                :picker-options="pickerOptionsStart"
+                clearable
+                v-model="form.startTime"
+                value-format="yyyy/MM/dd HH:mm:ss"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="结束日期" prop="endTime">
+              <el-date-picker
+                type="datetime"
+                placeholder="结束日期"
+                :picker-options="pickerOptionsEnd"
+                clearable
+                v-model="form.endTime"
+                value-format="yyyy/MM/dd HH:mm:ss"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
           <el-col :span="3" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx">查询</btn>
+            <btn nativeType="cx" @click="getProcessCounts">查询</btn>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <!-- 图表 -->
-    <div class="form-clues-content echarts-box">
+    <div class="form-clues-content echarts-box" v-if="chartData.length">
       <div id="myChart" class="chart"></div>
     </div>
+    <div class="form-clues-content echarts-box center" v-else>暂无数据</div>
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
+import efficient from "@/api/efficient";
+import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 export default {
   name: "jktj",
-  data() {
+  data () {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -74,29 +92,46 @@ export default {
       },
       // 搜索表单
       valueTime: "",
+      // 搜索表单
       form: {
-        startTime: "",
-        endTime: "",
-        XZQDM: "",
+        startTime: getFirstDayOfSeason(),
+        endTime: timeFormat(new Date(),true),
+        qxdm: "",
       },
+      chartData:[]
     };
   },
   mounted() {
-    // 初始化图表
-    this.echartInit();
+    // 查询业务量
+    this.getProcessCounts();
   },
   computed: {
     ...mapGetters(["dicData"]),
   },
   methods: {
+    async getProcessCounts(){
+      this.chartData = [];
+      let { result: res } = await efficient.getProcessCounts(
+        this.form.startTime,
+        this.form.endTime,
+        this.form.qxdm
+      );
+      //获取图表配置项需要的数据
+      this.chartData = res;
+      this.$nextTick(() => {
+        // 初始化图表
+        this.chartData.length && this.echartInit(this.chartData)
+      });
+    },
     // 重置
-    resetForm() {
+    resetForm () {
       this.form = {
         startTime: "",
         endTime: "",
       };
     },
-    echartInit() {
+    //图表渲染
+    echartInit(chartArr) {
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       // 绘制图表
@@ -108,7 +143,6 @@ export default {
           textStyle: {
             fontSize: 16, // 字体大小
           },
-          extraCssText: "width:220px;height:160px;", // 背景色
         },
         grid: {
           top: 120,
@@ -116,14 +150,7 @@ export default {
         xAxis: [
           {
             type: "category",
-            data: [
-              "土地所有权",
-              "建设用地、宅基地使用权",
-              "构（建）筑物所有权",
-              "林权",
-              "注销登记",
-              "抵押权登记",
-            ],
+            data: chartArr.map(item=>item.recTypeName),
             axisLabel: {
               interval: 0,
               formatter: function (val) {
@@ -151,7 +178,7 @@ export default {
               textStyle: {
                 show: true,
                 color: "#fff",
-                fontSize: "20",
+                fontSize: "16",
               },
             },
           },
@@ -175,8 +202,9 @@ export default {
         ],
         series: [
           {
-            data: [200, 120, 150, 80, 70, 30],
+            data: chartArr.map(item=>item.counts),
             type: "bar",
+            barMaxWidth: '60',
           },
         ],
       });
@@ -186,22 +214,31 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";
+
 .jktjDetail {
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .rows {
     margin-left: 100px;
   }
+  .center {
+    line-height: 50vh;
+    text-align: center;
+    color:#b6b5b5
+  }
   .echarts-box {
     display: flex;
     justify-content: center;
     height: 500px;
+
     .chart {
       width: 100%;
       height: 100%;
     }
   }
+
   .form-clues-content {
     flex: 1;
     height: 100%;

@@ -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>

@@ -3,6 +3,9 @@
     <!-- 表单部分 -->
     <div class="from-clues-header">
       <el-form @submit.native.prevent :model="ruleForm" label-width="120px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="字典类型编码">
@@ -18,7 +21,7 @@
           <el-col :span="12" class="btnColRight">
 
             <btn nativeType="cx" @click="queryClick">查询</btn>
-            <btn nativeType="sb" @click="handleRefresh">刷新缓存</btn>
+            <btn nativeType="cx" @click="handleRefresh">刷新缓存</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -2,6 +2,9 @@
   <div class="timedTask from-clues">
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row class="mb-5">
           <el-col :span="2" class="btnColRight">
             <btn nativeType="cx" @click="handleAdd">增加角色</btn>
@@ -10,15 +13,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :page-size="pageData.size"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-      >
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
     </div>
     <EditDialog ref="addEditDialog" />
@@ -39,7 +36,7 @@ export default {
     EditDialog,
     Roleslistdiglog,
   },
-  data() {
+  data () {
     return {
       taskData: null,
       form: {
@@ -95,7 +92,7 @@ export default {
               render: (h, scope) => {
                 return (
                   <div>
-                     <el-button
+                    <el-button
                       type="text"
                       size="mini"
                       icon="el-icon-video-pause"
@@ -172,12 +169,12 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     this.featchData();
   },
   methods: {
     // 新增角色
-    handleAdd() {
+    handleAdd () {
       // this.$refs.addEditDialog.roleId = value.id
       // this.roleSort = value.sort ? value.sort : 0
 
@@ -185,7 +182,7 @@ export default {
       this.$refs.addEditDialog.dialogTitle = "新增";
     },
     //  修改角色
-    handleEdit(row) {
+    handleEdit (row) {
       this.$refs.addEditDialog.roleId = row.id;
       this.roleSort = row.sort ? row.sort : 0;
       if (row.id) {
@@ -196,7 +193,7 @@ export default {
       this.$refs.addEditDialog.showAddEditDialog = true;
       this.$refs.addEditDialog.dialogTitle = "修改";
     },
-    featchData() {
+    featchData () {
       this.tableData.data = [
         {
           id: "2176e915-fdb4-414a-b8d6-6cf63171cffc",
@@ -214,11 +211,11 @@ export default {
       ];
     },
 
-    personnel() {
+    personnel () {
       this.$refs.rolesForm.adds();
       this.$refs.rolesForm.title = "人员配置";
     },
-    handleDel(row) {
+    handleDel (row) {
       this.$confirm("此操将进行删除操作, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

@@ -2,6 +2,9 @@
   <div class="timedTask from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="搜索标题">
@@ -9,8 +12,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="18" class="btnColRight">
-              <btn nativeType="cx" @click="handleSubmit">搜索</btn>
-              <btn nativeType="sb"  @click="handleAdd">新增</btn>
+            <btn nativeType="cx" @click="handleSubmit">搜索</btn>
+            <btn nativeType="cx" @click="handleAdd">新增</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -2,6 +2,9 @@
   <div class="timedTask from-clues">
     <div class="from-clues-header">
       <el-form ref="ruleForm" :model="form" label-width="100px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row class="mb-5">
           <!-- 按钮操作 -->
           <el-col :span="2" class="btnColRight">
@@ -13,15 +16,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :page-size="pageData.size"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-      >
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
     </div>
     <edit-dialog ref="dialogForm" />
@@ -46,7 +43,7 @@ export default {
   components: {
     EditDialog,
   },
-  data() {
+  data () {
     return {
       taskData: null,
       form: {
@@ -183,12 +180,12 @@ export default {
     };
   },
   methods: {
-    handleAdd() {
+    handleAdd () {
       this.taskData = null;
       this.$refs.dialogForm.add();
       this.$refs.dialogForm.title = "添加";
     },
-    featchData() {
+    featchData () {
       this.tableData.data = [
         {
           id: "6a269fa4-49ee-40ed-be72-302ebdf7b9d6",
@@ -251,7 +248,7 @@ export default {
     // },
 
     // 更新用户解锁状态
-    updateLock(id, name) {
+    updateLock (id, name) {
       this.$confirm(
         `<div  class="customer-message-wrapper">
               <h5 class="title">确定要更新用户解锁状态吗</h5>
@@ -278,25 +275,25 @@ export default {
           //   }
           // })
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 上移下移
-    moveUpward(index, row) {
-      console.log("index",index);
-      console.log("row",row);
+    moveUpward (index, row) {
+      console.log("index", index);
+      console.log("row", row);
       realMove(row.bsmDict, "UP", this.tableData);
       this.key++;
       let id = findParents(this.tableData, row.bsmDict);
       this.keyList = id;
     },
-    moveDown(index, row) {
+    moveDown (index, row) {
       realMove(row.bsmDict, "DOWN", this.tableData);
       this.key++;
       let id = findParents(this.tableData, row.bsmDict);
       this.keyList = id;
     },
     // 重置用户密码
-    resetPassword(data) {
+    resetPassword (data) {
       const ids = [];
       if (data instanceof Array) {
         data.forEach((item) => {
@@ -339,15 +336,15 @@ export default {
           //   }
           // })
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 修改人员信息
-    handleEdit(row) {
+    handleEdit (row) {
       this.$refs.dialogForm.edit(row);
       this.$refs.dialogForm.title = "修改";
     },
     // 删除
-    handleDelete(id, content) {
+    handleDelete (id, content) {
       this.$confirm("此操将进行删除操作, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -363,7 +360,7 @@ export default {
           //   this.getTableList()
           // })
         })
-        .catch(() => {});
+        .catch(() => { });
     },
   },
 };

 <template>
   <div class="dictionary-config from-clues">
     <div class="from-clues-header">
-      <el-form ref="form" :model="form" label-width="125px">
+      <el-form ref="form" :model="form" label-width="90px">
+        <el-form-item>
+          <Breadcrumb />
+        </el-form-item>
         <el-row>
           <el-col :span="6">
             <el-form-item label="数据表名">
-              <el-input
-                v-model="form.DATATABLE"
-                placeholder="数据表名"
-              ></el-input>
+              <el-input v-model="form.DATATABLE" placeholder="数据表名"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="中文名称">
-              <el-input
-                v-model="form.CHINESETABLE"
-                placeholder="中文名称"
-              ></el-input>
+              <el-input v-model="form.CHINESETABLE" placeholder="中文名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="tab表头链接标识">
-              <el-input
-                v-model="form.SOLEURL"
-                placeholder="tab表头链接标识"
-              ></el-input>
+            <el-form-item label="tab表头链接标识" label-width="130px">
+              <el-input v-model="form.SOLEURL" placeholder="tab表头链接标识"></el-input>
             </el-form-item>
           </el-col>
 
           <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
-            <btn nativeType="sb" @click="handleUpdateDic">刷新缓存</btn>
+            <btn nativeType="cx" @click="handleUpdateDic">刷新缓存</btn>
             <btn nativeType="cx" @click="handleSubmit">查询</btn>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table
-        :page-size="pageData.size"
-        :current-page.sync="pageData.current"
-        :total="pageData.total"
-        @size-change="handleSizeChange"
-        @p-current-change="handleCurrentChange"
-        :column="tableData.columns"
-        :data="tableData.data"
-      >
+      <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
       <message-tips ref="msg" :message="message" />
     </div>
@@ -65,7 +53,7 @@ export default {
   components: {
     editValidRule,
   },
-  data() {
+  data () {
     return {
       message: "",
       form: {
@@ -129,7 +117,7 @@ export default {
     };
   },
   methods: {
-    async featchData() {
+    async featchData () {
       try {
         this.form = Object.assign(this.form, this.formData);
         let {
@@ -146,7 +134,7 @@ export default {
         this.$refs.msg.messageShow();
       }
     },
-    async handleEdit(index, row) {
+    async handleEdit (index, row) {
       try {
         let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB);
         this.ruleData = res;
@@ -158,7 +146,7 @@ export default {
         });
       }
     },
-    handleDel(index, row) {
+    handleDel (index, row) {
       let _this = this;
       this.$confirm("此操作将进行删除校验规则, 是否继续?", "提示", {
         cancelButtonText: "取消",
@@ -192,7 +180,7 @@ export default {
           });
         });
     },
-    handleUpdateDic() {
+    handleUpdateDic () {
       this.$store.dispatch("dictionaries/generateDic").then((res) => {
         if (res) {
           this.$message({