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

@@ -36,6 +36,16 @@ class work {
       }
       }
     })
     })
   }
   }
+   // 新建国有房屋信息
+   async addhousetotal (code) {
+    return request({
+      url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
+      method: 'get',
+      params: {
+        code: code
+      }
+    })
+  }
   // 地图区县成功失败统计，code区县编码，汉中为：A20
   // 地图区县成功失败统计，code区县编码，汉中为：A20
   async submitViews (code) {
   async submitViews (code) {
     return request({
     return request({

@@ -69,6 +69,7 @@ export default {
   position: relative;
   position: relative;
   left: -10px;
   left: -10px;
   color: #FFFFFF;
   color: #FFFFFF;
+  // background-color: rgb(155, 200, 200);
 }
 }
 
 
 /deep/.el-breadcrumb__inner {
 /deep/.el-breadcrumb__inner {

@@ -27,8 +27,8 @@ export default {
           grid: {
           grid: {
             // 让图表占满容器
             // 让图表占满容器
             top: "20%",
             top: "20%",
-            left: "18%",
-            right: "10%",
+            left: "12%",
+            right: "5%",
             bottom: "16%",
             bottom: "16%",
           },
           },
           xAxis: {
           xAxis: {

@@ -104,8 +104,8 @@ export default {
             map: '汉中市',
             map: '汉中市',
             itemStyle: {
             itemStyle: {
               normal: {//阴影
               normal: {//阴影
-                areaColor: '#02D9FD ',
-                shadowColor: '#01271F',
+                areaColor: '#5689FD ',
+                shadowColor: '#21371d',
                 borderWidth: 0,
                 borderWidth: 0,
                 shadowOffsetX: 2,
                 shadowOffsetX: 2,
                 shadowOffsetY: 25
                 shadowOffsetY: 25
@@ -125,17 +125,17 @@ export default {
                   areaColor: 'rgba(19,54,162,.5)',
                   areaColor: 'rgba(19,54,162,.5)',
                   borderColor: 'rgba(0,242,252,.5)',
                   borderColor: 'rgba(0,242,252,.5)',
                   borderWidth: 2,
                   borderWidth: 2,
-                  shadowBlur: 7,
-                  borderColor: 'rgba(19,54,162,.1)',
+                  shadowBlur: 1,
+                  borderColor: 'rgb(155, 200, 200)',
                   shadowColor: '#44f2fc',
                   shadowColor: '#44f2fc',
                 },
                 },
-                emphasis: {
-                  areaColor: '#4f7fff',
-                  borderColor: 'rgba(0,242,252,.5)',
-                  borderWidth: 2,
-                  shadowBlur: 10,
-                  shadowColor: '#00f2fc',
-                },
+                // emphasis: {
+                //   areaColor: '#4f7fff',
+                //   borderColor: 'rgba(0,242,252,.5)',
+                //   borderWidth: 2,
+                //   shadowBlur: 10,
+                //   shadowColor: '#00f2fc',
+                // },
               },
               },
               label: {
               label: {
                 formatter: params => {
                 formatter: params => {

@@ -37,8 +37,7 @@ export default {
           let res = await work.getdjywltotal(p);
           let res = await work.getdjywltotal(p);
           // 遍历修改数组键，作为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 })
 
 
           )
           )

@@ -119,7 +119,7 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .leftcard {
 .leftcard {
   width: 32%;
   width: 32%;
-    height: calc(100% -0.5729rem);
+    height: calc(100% -110px);
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
 
 
@@ -179,19 +179,21 @@ export default {
 
 
     .qxjr {
     .qxjr {
       background: url("~@/image/jrl3.png");
       background: url("~@/image/jrl3.png");
+      background-size: 100% 100%;
     }
     }
 
 
     .sthj {
     .sthj {
       background: url("~@/image/jh.png");
       background: url("~@/image/jh.png");
+       background-size: 100% 100%;
     }
     }
 
 
    p {
    p {
       margin: 0 .0156rem .0521rem .0156rem;
       margin: 0 .0156rem .0521rem .0156rem;
       font-weight: 700;
       font-weight: 700;
-      width: .125rem;
-      height: .1875rem;
-      font-size: .1563rem;
-      font-size: .1667rem;
+      width: .195rem;
+      height: .2475rem;
+      font-size: .1863rem;
+      font-size: .1867rem;
     }
     }
   }
   }
 
 
@@ -202,6 +204,7 @@ export default {
     // padding: 35px 20px 20px 20px;
     // padding: 35px 20px 20px 20px;
     box-sizing: border-box;
     box-sizing: border-box;
     color: #e3f1ff;
     color: #e3f1ff;
+    margin-top: .1263rem;
 
 
     .cardcontent-left {
     .cardcontent-left {
       width: 60%;
       width: 60%;

@@ -3,7 +3,8 @@
     <div class="card1 cardCon d-center">
     <div class="card1 cardCon d-center">
       <div class="cardhead">新建国有房屋信息</div>
       <div class="cardhead">新建国有房屋信息</div>
       <div class="cardcontent" style="margin-top: .3646rem">
       <div class="cardcontent" style="margin-top: .3646rem">
-        <dv-scroll-board :config="config" class="board" />
+        <dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
+         <div v-else="config.data.length==0" class="nodata">暂无数据</div>
       </div>
       </div>
     </div>
     </div>
     <div class="card2 cardCon mt-10">
     <div class="card2 cardCon mt-10">
@@ -20,6 +21,7 @@
 <script>
 <script>
 import columnarsmat from "@/components/Echart/Columnarsmat";
 import columnarsmat from "@/components/Echart/Columnarsmat";
 import Rose from "@/components/Echart/Rose";
 import Rose from "@/components/Echart/Rose";
+import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {
     return {
     return {
@@ -28,24 +30,34 @@ export default {
         oddRowBGC: '#154295',
         oddRowBGC: '#154295',
         evenRowBGC: '#154295',
         evenRowBGC: '#154295',
         header: ['序号', '用途', '性质', '面积'],
         header: ['序号', '用途', '性质', '面积'],
-        data: [
-          ['住宅', '自建房', '转移登记', '73.94'],
-          ['商业服务', '市场化商品房', '转移登记', '1067.14'],
-          ['住宅', '成本售价房', '转移登记', '601.47'],
-          ['住宅', '市场化商品房', '转移登记', '38111.37'],
-          ['住宅', '移民搬迁安置房', '转移登记', '104.16'],
-          ['办公', '自建房', '转移登记', '14913.86'],
-          ['柴房', '市场化商品房', '转移登记', '615.55'],
-          ['住宅', '经济适用住房', '转移登记', '173.17'],
-          ['车库/车位', '市场化商品房', '转移登记', '105.27'],
-          ['住宅', '房改房', '转移登记', '372.4']
-        ]
+        data: [],
+        key:0
       }
       }
     }
     }
   },
   },
   components: { columnarsmat, Rose },
   components: { columnarsmat, Rose },
   mounted () {
   mounted () {
+    this.addhousetotal();
     // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
     // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
+  },
+   methods: {
+    async addhousetotal () {
+      try {
+        let {result:res}= await work.addhousetotal();
+        console.log("resultssssssssssss",res);
+        res.map((item,index) => {
+          console.log("item",item);
+          console.log("index",index);
+          return (
+            this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
+          )
+
+        });
+        console.log("this.config.data",this.config.data);
+      } catch (error) {
+        console.log("error",error);
+      }
+    }
   }
   }
 }
 }
 </script>
 </script>
@@ -77,6 +89,13 @@ export default {
     height: 100%;
     height: 100%;
     display: -webkit-box;
     display: -webkit-box;
     overflow: hidden;
     overflow: hidden;
+    .nodata{
+ font-size: .1042rem;
+ color: #02D9FD;
+ font-weight: bold;
+ margin:auto;
+ margin-top: 120px;
+    }
   }
   }
 
 
   .cardCon {
   .cardCon {
@@ -94,8 +113,8 @@ export default {
     .board {
     .board {
       width: 90%;
       width: 90%;
       margin: 0 auto;
       margin: 0 auto;
-      height: .7031rem;
-      margin-top: .2083rem;
+      height: 1.1031rem;
+      margin-top: .0521rem;
     }
     }
   }
   }
 
 

@@ -57,7 +57,7 @@ import efficient from "@/api/efficient";
 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
 export default {
 export default {
   name: "jktj",
   name: "jktj",
-  data () {
+  data() {
     return {
     return {
       // 开始日期限制
       // 开始日期限制
       pickerOptionsStart: {
       pickerOptionsStart: {
@@ -83,7 +83,7 @@ export default {
       pieChartsData: [],
       pieChartsData: [],
     };
     };
   },
   },
-  created () {},
+  created() {},
   mounted() {
   mounted() {
     this.getProcessCounts();
     this.getProcessCounts();
   },
   },
@@ -91,11 +91,11 @@ export default {
     ...mapGetters(["dicData"]),
     ...mapGetters(["dicData"]),
   },
   },
   methods: {
   methods: {
-    endTimeChange(val){
-      this.form.endTime = timeFormat(new Date(val),true)
+    endTimeChange(val) {
+      this.form.endTime = timeFormat(new Date(val), true);
     },
     },
     //查询各区县办件数量
     //查询各区县办件数量
-    async getProcessCounts () {
+    async getProcessCounts() {
       this.pieChartsData = [];
       this.pieChartsData = [];
       let { result: res } = await efficient.getProcessCounts(
       let { result: res } = await efficient.getProcessCounts(
         this.form.startTime,
         this.form.startTime,
@@ -113,14 +113,15 @@ export default {
             groupId: item.recType,
             groupId: item.recType,
           });
           });
         });
         });
-        res.length && this.$nextTick(() => {
-        // 初始化图表
-        this.echartInit();
-        this.barChartInit(res[0].recType);
-      });
+      res.length &&
+        this.$nextTick(() => {
+          // 初始化图表
+          this.echartInit();
+          this.barChartInit(res[0].recType);
+        });
     },
     },
     // 重置
     // 重置
-    resetForm () {
+    resetForm() {
       this.form = {
       this.form = {
         startTime: getFirstDayOfSeason(),
         startTime: getFirstDayOfSeason(),
         endTime: timeFormat(new Date(), true),
         endTime: timeFormat(new Date(), true),
@@ -128,7 +129,7 @@ export default {
       this.getProcessCounts();
       this.getProcessCounts();
     },
     },
     //玫瑰图初始化
     //玫瑰图初始化
-    echartInit () {
+    echartInit() {
       let _this = this;
       let _this = this;
       // 基于准备好的dom，初始化echarts实例
       // 基于准备好的dom，初始化echarts实例
       let myChart = this.$echarts.init(document.getElementById("myChart"));
       let myChart = this.$echarts.init(document.getElementById("myChart"));
@@ -189,7 +190,7 @@ export default {
       });
       });
     },
     },
     //柱图初始化
     //柱图初始化
-    async barChartInit (recType) {
+    async barChartInit(recType) {
       //请求recType对应业务的各区县数据
       //请求recType对应业务的各区县数据
       let { result: res } = await efficient.getProcessDays(
       let { result: res } = await efficient.getProcessDays(
         recType,
         recType,
@@ -274,19 +275,46 @@ export default {
         series: [
         series: [
           {
           {
             type: "bar",
             type: "bar",
-            barMaxWidth: '60',
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
+            barMaxWidth: "60",
             name: "最短用时",
             name: "最短用时",
             data: dealArr.map((item) => item.minDay),
             data: dealArr.map((item) => item.minDay),
           },
           },
           {
           {
             type: "bar",
             type: "bar",
-            barMaxWidth: '60',
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
+            barMaxWidth: "60",
             name: "平均用时",
             name: "平均用时",
             data: dealArr.map((item) => item.avgDay),
             data: dealArr.map((item) => item.avgDay),
           },
           },
           {
           {
             type: "bar",
             type: "bar",
-            barMaxWidth: '60',
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
+            barMaxWidth: "60",
             name: "最长用时",
             name: "最长用时",
             data: dealArr.map((item) => item.maxDay),
             data: dealArr.map((item) => item.maxDay),
           },
           },

@@ -246,6 +246,15 @@ export default {
           {
           {
             name: "成功",
             name: "成功",
             type: "bar",
             type: "bar",
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
             barMaxWidth: '60',
             barMaxWidth: '60',
             data: this.chartData.map((item) => {
             data: this.chartData.map((item) => {
               return item.success;
               return item.success;
@@ -254,6 +263,15 @@ export default {
           {
           {
             name: "失败",
             name: "失败",
             type: "bar",
             type: "bar",
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
             barMaxWidth: '60',
             barMaxWidth: '60',
             data: this.chartData.map((item) => {
             data: this.chartData.map((item) => {
               return item.failure;
               return item.failure;
@@ -261,6 +279,15 @@ export default {
           },
           },
           {
           {
             name: "成功率",
             name: "成功率",
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
             type: "line",
             type: "line",
             barMaxWidth: '60',
             barMaxWidth: '60',
             yAxisIndex: 1,
             yAxisIndex: 1,

@@ -210,9 +210,18 @@ export default {
         ],
         ],
         series: [
         series: [
           {
           {
-            data: chartArr.map(item=>item.counts),
             type: "bar",
             type: "bar",
+            //显示数值
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true, //开启显示
+                  position: "top", //在上方显示
+                },
+              },
+            },
             barMaxWidth: '60',
             barMaxWidth: '60',
+            data: chartArr.map(item=>item.counts),
           },
           },
         ],
         ],
       });
       });

@@ -62,7 +62,7 @@ class data extends filter {
         label: "业务名称",
         label: "业务名称",
       },
       },
       {
       {
-        prop: "uploadtime",
+        prop: "exchangeDate",
         label: "汇交时间",
         label: "汇交时间",
         width: 140,
         width: 140,
       }
       }