--no commit message

@@ -4,57 +4,57 @@ import cookies from './util.cookies'
  * @param {*} paraName
  * @author: renchao
  */
-export function getUrlParam (paraName) {
-    let url = document.location.toString();
-    let arrObj = url.split('?');
+export function getUrlParam(paraName) {
+  let url = document.location.toString();
+  let arrObj = url.split('?');
 
-    if (arrObj.length > 1) {
-        let arrPara = arrObj[1].split('&');
-        let arr;
+  if (arrObj.length > 1) {
+    let arrPara = arrObj[1].split('&');
+    let arr;
 
-        for (let i = 0; i < arrPara.length; i++) {
-            arr = arrPara[i].split('=');
+    for (let i = 0; i < arrPara.length; i++) {
+      arr = arrPara[i].split('=');
 
-            if (arr != null && arr[0] === paraName) {
-                // 截取#之前的内容
-                let result = arr[1].endsWith('#/') ? arr[1].substr(0, arr[1].indexOf('#')) : arr[1];
-                return result;
-            }
-        }
-        return '';
-    } else {
-        return '';
+      if (arr != null && arr[0] === paraName) {
+        // 截取#之前的内容
+        let result = arr[1].endsWith('#/') ? arr[1].substr(0, arr[1].indexOf('#')) : arr[1];
+        return result;
+      }
     }
+    return '';
+  } else {
+    return '';
+  }
 }
 /**
  * @description: setToken
  * @param {*} token
  * @author: renchao
  */
-export function setToken (token) {
-    if (token === undefined) {
-        if (process.env.NODE_ENV === 'development') {
-            sessionStorage.removeItem('token')
-        } else {
-            cookies.remove('ACCESS_TOKEN')
-        }
+export function setToken(token) {
+  if (token === undefined) {
+    if (process.env.NODE_ENV === 'development') {
+      sessionStorage.removeItem('token')
+    } else {
+      cookies.remove('ACCESS_TOKEN')
+    }
+  } else {
+    if (process.env.NODE_ENV === 'development') {
+      sessionStorage.setItem('token', token);
     } else {
-        if (process.env.NODE_ENV === 'development') {
-            sessionStorage.setItem('token', token);
-        } else {
-            cookies.set('ACCESS_TOKEN', token)
-        }
+      cookies.set('ACCESS_TOKEN', token)
     }
+  }
 }
 /**
  * @description: getToken
  * @author: renchao
  */
-export function getToken () {
-    if (process.env.NODE_ENV === 'development') {
-        return sessionStorage.getItem('token')
-    }
-    return cookies.get('ACCESS_TOKEN')
+export function getToken() {
+  if (process.env.NODE_ENV === 'development') {
+    return sessionStorage.getItem('token')
+  }
+  return cookies.get('ACCESS_TOKEN')
 }
 
 // 获取当前时间
@@ -63,22 +63,22 @@ export function getToken () {
  * @param {*} type
  * @author: renchao
  */
-export function getNewDate (type = 1) {
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = String(now.getMonth() + 1).padStart(2, '0');
-    const day = String(now.getDate()).padStart(2, '0');
-    const hours = String(now.getHours()).padStart(2, '0');
-    const minutes = String(now.getMinutes()).padStart(2, '0');
-    const seconds = String(now.getSeconds()).padStart(2, '0');
-    if (type == 1) {
-        return `${year}年${month}月${day}日`
-    } else {
-        return `${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒`
-    }
+export function getNewDate(type = 1) {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  const seconds = String(now.getSeconds()).padStart(2, '0');
+  if (type == 1) {
+    return `${year}年${month}月${day}日`
+  } else {
+    return `${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒`
+  }
 }
 
-export function getNewDatesh () {
+export function getNewDatesh() {
   const now = new Date();
   const year = now.getFullYear();
   const month = String(now.getMonth() + 1).padStart(2, '0');
@@ -88,3 +88,31 @@ export function getNewDatesh () {
   const seconds = String(now.getSeconds()).padStart(2, '0');
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 }
+
+// 近一个月时间
+export function getdatamonth() {
+  var tempDate = new Date();
+  var year = tempDate.getFullYear();
+  var month = tempDate.getMonth();
+  var arr = []
+  arr.push(
+    formatDate(new Date(year, month, 1)),
+    formatDate(tempDate)
+  );
+  return arr
+}
+// 格式化日期
+export function formatDate(date) {
+  var year = date.getFullYear();
+  var month = changeNum(date.getMonth() + 1);
+  var day = changeNum(date.getDate());
+  return `${year}-${month}-${day}`;
+}
+// 数字转换
+export function changeNum(num) {
+  if (num >= 10) {
+    return num;
+  } else {
+    return "0" + num;
+  }
+}

@@ -7,7 +7,7 @@
   <div class="djlx">
     <div class="inquire">
       <el-form :model="queryForm" ref="queryForm" label-width="100px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="收件时间" class="width100">
               <el-date-picker
@@ -57,9 +57,11 @@
     <div class="concent">
       <div class="left">
         <el-table
+          class="tableBox"
           height="187"
           stripe
           :data="tableList"
+          show-summary
           size="mini"
           border
           header-cell-class-name="table-header-gray"
@@ -85,6 +87,7 @@
 <script>
 import * as echarts from "echarts";
 import { mapGetters } from "vuex";
+import { getdatamonth } from "@/utils/util";
 export default {
   components: {},
   computed: {
@@ -92,7 +95,9 @@ export default {
   },
   data() {
     return {
-      queryForm: {},
+      queryForm: {
+        sj: [],
+      },
       tableList: [
         { name: "首次登记", value: "2" },
         { name: "变更登记", value: "12" },
@@ -106,6 +111,7 @@ export default {
     };
   },
   mounted() {
+    this.setdata();
     // 创建一个 ECharts 实例
     this.chart = echarts.init(this.$refs.chart);
     // 在 ECharts 实例中配置图表
@@ -115,7 +121,7 @@ export default {
     getOption() {
       return {
         title: {
-          text: "统计分析图",
+          text: "登记类型统计",
           x: "center",
           textStyle: {
             //主标题文本设置
@@ -162,6 +168,10 @@ export default {
         ],
       };
     },
+    setdata() {
+      this.queryForm.sj = getdatamonth();
+      console.log("this.queryForm", this.queryForm);
+    },
 
     handleSearch() {
       console.log(" this.queryForm", this.queryForm);
@@ -178,9 +188,10 @@ export default {
   padding: 3px 10px 5px 10px;
   overflow: hidden;
 }
-.yhjgba {
+.djlx {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
@@ -199,7 +210,7 @@ export default {
     display: flex;
     //调整表头高度
     /deep/.el-table__header {
-      height: 22px!important;
+      height: 22px !important;
       background-color: salmon;
     }
     .left {
@@ -211,5 +222,12 @@ export default {
       height: 300px;
     }
   }
+
+    /deep/.el-table th {
+      height: 36px !important;
+      font-size: 14px;
+      color: #4a4a4a;
+    }
+
 }
 </style>

@@ -23,7 +23,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="11" class="btnColRight">
             <el-form-item>
               <el-button
                 type="primary"
@@ -42,6 +42,7 @@
           height="187"
           stripe
           :data="tableList"
+           show-summary
           size="mini"
           border
           header-cell-class-name="table-header-gray"
@@ -66,24 +67,23 @@
 </template>
 <script>
 import * as echarts from "echarts";
+import { getdatamonth } from "@/utils/util";
 export default {
   components: {},
   data() {
     return {
       queryForm: {},
       tableList: [
-        { name: "首次登记", value: "2" },
-        { name: "变更登记", value: "12" },
-        { name: "抵押登记", value: "23" },
-        { name: "转移登记", value: "33" },
-        { name: "预告登记", value: "13" },
-        { name: "注销登记", value: "3" },
-        { name: "查封登记", value: "4" },
-        { name: "其他登记", value: "26" },
+        { name: "浐灞", value: "2" },
+        { name: "长安", value: "12" },
+        { name: "莲湖", value: "23" },
+        { name: "高新", value: "33" },
+         { name: "高新", value: "33" },
       ],
     };
   },
   mounted() {
+     this.setdata();
     // 创建一个 ECharts 实例
     this.chart = echarts.init(this.$refs.chart);
     // 在 ECharts 实例中配置图表
@@ -93,7 +93,7 @@ export default {
     getOption() {
       return {
         title: {
-          text: "统计分析图",
+          text: "区域统计分析",
           x: "center",
           textStyle: {
             //主标题文本设置
@@ -140,7 +140,10 @@ export default {
         ],
       };
     },
-
+   setdata() {
+      this.queryForm.sj = getdatamonth();
+      console.log("this.queryForm", this.queryForm);
+    },
     handleSearch() {
       console.log(" this.queryForm", this.queryForm);
     },
@@ -159,6 +162,7 @@ export default {
 .yhjgba {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
@@ -175,10 +179,10 @@ export default {
     width: 100%;
     height: 300px;
     display: flex;
-    //调整表头高度
-    /deep/.el-table__header {
-      height: 22px!important;
-      background-color: salmon;
+    /deep/.el-table th {
+      height: 36px !important;
+      font-size: 14px;
+      color: #4a4a4a;
     }
     .left {
       width: 70%;

@@ -7,7 +7,7 @@
   <div class="djlx">
     <div class="inquire">
       <el-form :model="queryForm" ref="queryForm" label-width="100px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="收件时间" class="width100">
               <el-date-picker
@@ -59,6 +59,7 @@
         <el-table
           height="187"
           stripe
+           show-summary
           :data="tableList"
           size="mini"
           border
@@ -85,6 +86,7 @@
 <script>
 import * as echarts from "echarts";
 import { mapGetters } from "vuex";
+import { getdatamonth } from "@/utils/util";
 export default {
   components: {},
   computed: {
@@ -94,18 +96,14 @@ export default {
     return {
       queryForm: {},
       tableList: [
-        { name: "首次登记", value: "2" },
-        { name: "变更登记", value: "12" },
-        { name: "抵押登记", value: "23" },
-        { name: "转移登记", value: "33" },
-        { name: "预告登记", value: "13" },
-        { name: "注销登记", value: "3" },
-        { name: "查封登记", value: "4" },
-        { name: "其他登记", value: "26" },
+        { name: "小红", value: "2" },
+        { name: "小张", value: "12" },
+        { name: "小王", value: "23" },
       ],
     };
   },
   mounted() {
+    this.setdata();
     // 创建一个 ECharts 实例
     this.chart = echarts.init(this.$refs.chart);
     // 在 ECharts 实例中配置图表
@@ -115,7 +113,7 @@ export default {
     getOption() {
       return {
         title: {
-          text: "统计分析图",
+          text: "登记类型统计",
           x: "center",
           textStyle: {
             //主标题文本设置
@@ -162,7 +160,10 @@ export default {
         ],
       };
     },
-
+   setdata() {
+      this.queryForm.sj = getdatamonth();
+      console.log("this.queryForm", this.queryForm);
+    },
     handleSearch() {
       console.log(" this.queryForm", this.queryForm);
     },
@@ -181,6 +182,7 @@ export default {
 .yhjgba {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
@@ -197,10 +199,10 @@ export default {
     width: 100%;
     height: 300px;
     display: flex;
-    //调整表头高度
-    /deep/.el-table__header {
-      height: 22px!important;
-      background-color: salmon;
+    /deep/.el-table th {
+      height: 36px !important;
+      font-size: 14px;
+      color: #4a4a4a;
     }
     .left {
       width: 70%;

@@ -11,7 +11,7 @@
           <el-col :span="6">
             <el-form-item label="统计时间" class="width100">
               <el-date-picker
-                v-model="queryForm.sj"
+                v-model="queryForm.monthValue"
                 class="width100"
                 type="month"
                 placeholder="选择月"
@@ -37,7 +37,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5" class="btnColRight">
+          <el-col :span="11" class="btnColRight">
             <el-form-item>
               <el-button
                 type="primary"
@@ -65,7 +65,9 @@ export default {
   },
   data() {
     return {
-      queryForm: {},
+      queryForm: {
+        monthValue:""
+      },
       datas: [12, 23, 15, 28, 37, 11, 13, 32, 34, 56, 12, 15],
       datatime: [
         "1日",
@@ -81,7 +83,22 @@ export default {
         "20日",
         "21日",
       ],
+
+    };
+  },
+   created() {
+    // 默认当月
+    var nowDate = new Date();
+    var date = {
+      year: nowDate.getFullYear(),
+      month: nowDate.getMonth() + 1,
+      day: nowDate.getDate()
     };
+    const dayDate =
+      date.year + "-" + (date.month >= 10 ? date.month : "0" + date.month);
+    var date = new Date();
+    this.$set(this.queryForm, "monthValue", dayDate.toString());
+    console.log("this.queryForm",this.queryForm);
   },
   mounted() {
     // 创建一个 ECharts 实例
@@ -167,12 +184,17 @@ export default {
 .yhjgba {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
     height: 40px;
-    border: 1px solid rgb(184, 217, 243);
-    // background-color: rebeccapurple;
+    background-color: #f4f7fd;
+    /deep/ .el-form {
+      .el-form-item--small.el-form-item {
+        margin-bottom: 5px;
+      }
+    }
   }
   .concent {
     width: 100%;

@@ -10,7 +10,12 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="统计年份" class="width100">
-              <el-date-picker class="width100" v-model="queryForm.sj" type="year" placeholder="选择年">
+              <el-date-picker
+                class="width100"
+                v-model="queryForm.sj"
+                type="year"
+                placeholder="选择年"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -32,7 +37,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="btnColRight">
+          <el-col :span="11" class="btnColRight">
             <el-form-item>
               <el-button
                 type="primary"
@@ -53,6 +58,7 @@
 <script>
 import * as echarts from "echarts";
 import { mapGetters } from "vuex";
+
 export default {
   components: {},
   computed: {
@@ -60,9 +66,20 @@ export default {
   },
   data() {
     return {
-      queryForm: {},
+      queryForm: {
+        sj:""
+      },
     };
   },
+  created() {
+    var tempDate = new Date();
+    var year = tempDate.getFullYear();
+    console.log("year", year);
+    // 默认当月
+
+    this.$set(this.queryForm, "sj", year.toString());
+        console.log("this.queryForm",this.queryForm);
+  },
   mounted() {
     // 创建一个 ECharts 实例
     this.chart = echarts.init(this.$refs.chart);
@@ -132,7 +149,6 @@ export default {
         },
         series: [
           {
-            name: "转诊量",
             data: [38, 42, 50, 157, 40, 45, 60, 140, 36, 47, 54, 143],
             barWidth: 40,
             type: "bar",
@@ -157,12 +173,17 @@ export default {
 .yhjgba {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
     height: 40px;
-    border: 1px solid rgb(184, 217, 243);
-    // background-color: rebeccapurple;
+    background-color: #f4f7fd;
+    /deep/ .el-form {
+      .el-form-item--small.el-form-item {
+        margin-bottom: 5px;
+      }
+    }
   }
   .concent {
     width: 100%;

@@ -60,6 +60,7 @@
           height="187"
           stripe
           :data="tableList"
+           show-summary
           size="mini"
           border
           header-cell-class-name="table-header-gray"
@@ -85,6 +86,7 @@
 <script>
 import * as echarts from "echarts";
 import { mapGetters } from "vuex";
+import { getdatamonth } from "@/utils/util";
 export default {
   components: {},
   computed: {
@@ -94,18 +96,14 @@ export default {
     return {
       queryForm: {},
       tableList: [
-        { name: "首次登记", value: "2" },
-        { name: "变更登记", value: "12" },
-        { name: "抵押登记", value: "23" },
-        { name: "转移登记", value: "33" },
-        { name: "预告登记", value: "13" },
-        { name: "注销登记", value: "3" },
-        { name: "查封登记", value: "4" },
-        { name: "其他登记", value: "26" },
+        { name: "单一版不动产权证书", value: "459" },
+        { name: "不动产登记证明", value: "164" },
+
       ],
     };
   },
   mounted() {
+    this.setdata();
     // 创建一个 ECharts 实例
     this.chart = echarts.init(this.$refs.chart);
     // 在 ECharts 实例中配置图表
@@ -115,7 +113,7 @@ export default {
     getOption() {
       return {
         title: {
-          text: "统计分析图",
+          text: "证书种类统计分析发证",
           x: "center",
           textStyle: {
             //主标题文本设置
@@ -162,7 +160,10 @@ export default {
         ],
       };
     },
-
+    setdata() {
+      this.queryForm.sj = getdatamonth();
+      console.log("this.queryForm", this.queryForm);
+    },
     handleSearch() {
       console.log(" this.queryForm", this.queryForm);
     },
@@ -181,6 +182,7 @@ export default {
 .yhjgba {
   .el-col {
     padding: 4px;
+    margin-right: 4px;
   }
   .inquire {
     width: 100%;
@@ -198,9 +200,10 @@ export default {
     height: 300px;
     display: flex;
     //调整表头高度
-    /deep/.el-table__header {
-      height: 22px!important;
-      background-color: salmon;
+    /deep/.el-table th {
+      height: 36px !important;
+      font-size: 14px;
+      color: #4a4a4a;
     }
     .left {
       width: 70%;

@@ -123,7 +123,6 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "~@/styles/mixin.scss";
 /deep/.el-card__header {
   padding: 8px 10px;
 }