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

 <template>
-  <Echart :options="options" id="centreLeft1Chart" height="200px" width="95%"></Echart>
+  <Echart :options="options" id="centreLeft1Chart" height="200px" width="100%"></Echart>
 </template>
 <script>
 import Echart from '@/common/echart'
@@ -19,9 +19,8 @@ export default {
         this.options = {
           grid: {
             // 让图表占满容器
-            top: "50%",
-            right: '30%',
-            bottom: "0%",
+            top: 20,
+            right: 0,
           },
           color: [
             "#37a2da",

 <template>
   <div>
     <Chart :cdata="cdata" />
+    <el-carousel height="40px" indicator-position="none">
+      <el-carousel-item v-for="item in 4" :key="item">
         <div class="rotograph">佛坪县</div>
+      </el-carousel-item>
+    </el-carousel>
   </div>
 </template>
 
@@ -53,6 +57,5 @@ export default {
   border-radius: 6px;
   font-weight: 600;
   color: #02D9FD;
-  margin-top: 20px;
 }
 </style>

 <template>
   <!-- 柱状图 -->
-  <Echart :options="options" id="bottomLeftChart" height="420px" width="100%"></Echart>
+  <Echart :options="options" id="bottomLeftChart" height="100%" width="100%"></Echart>
 </template>
 
 <script>

@@ -26,10 +26,10 @@ export default {
         this.options = {
           grid: {
             // 让图表占满容器
-            top: "12%",
-            left: "15%",
+            top: "20%",
+            left: "18%",
             right: "10%",
-            bottom: "26%",
+            bottom: "16%",
           },
           xAxis: {
             data: newData.category,

 <template>
   <!-- 地图 -->
-  <Echart id="centreLeft2Chart" class="centreLeft2Chart" ref="centreLeft2ChartRef" width="100%" height="470px"
+  <Echart id="centreLeft2Chart" class="centreLeft2Chart" ref="centreLeft2ChartRef" width="100%" height="505px"
     :options="options"></Echart>
 </template>
 
@@ -109,7 +109,7 @@ export default {
           visualMap: {
             min: 0,
             max: _this.max,
-            bottom: '2%',
+            bottom: '0%',
             right: 30,
             splitNumber: 6,
             seriesIndex: [0],

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

 <template>
   <el-menu router :default-active="activeMenu" mode="horizontal">
     <!-- 权限菜单 -->
-    <sidebar-item v-for="route in permission_routes.slice(5, 8)" :key="route.path" :item="route"
+    <sidebar-item v-for="route in permission_routes.slice(4, 7)" :key="route.path" :item="route"
       :base-path="route.path" />
     <!-- 菜单全部展示 -->
     <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->

@@ -27,7 +27,7 @@ router.beforeEach(async (to, from, next) => {
         if (routeTo && routeTo !== '/') {
             next({ ...to, replace: true })
         } else {
-            next('/jgHome')
+            next('/home')
         }
     }
     NProgress.done()

@@ -20,22 +20,17 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/dataView',
-    name: 'dataView',
-    component: () => import('@/views/dataView/index')
-  },
   // 监管首页
   {
     path: '/',
     component: Layout,
-    redirect: '/jgHome',
+    redirect: '/home',
     meta: { title: '首页' },
     children: [
       {
-        path: 'jgHome',
+        path: 'home',
         component: () => import('@/views/home/index'),
-        name: 'jgHome',
+        name: 'home',
         meta: { title: '工作台', icon: 'workbench', affix: true }
       }
     ]

@@ -173,33 +173,35 @@
 // element table 样式修改
 //去掉表格内的线
 table th {
-  border-bottom: 1px solid #29409D !important;
+  border-bottom: none !important;
+}
+
+.el-table__body {
+  -webkit-border-vertical-spacing: 6px !important; // 垂直间距
 }
 
 table td {
-  border-bottom: 1px solid #29409D !important;
+  box-sizing: border-box;
+  border-bottom: none !important;
+  ;
 }
 
 //去掉最下面的那一条线
 .el-table::before {
-  height: 1px !important;
-  background-color: #29409D !important;
+  height: 0;
 }
 
-.lb-table {
-  background-color: $containerbg;
-}
-
-.el-table__body-wrapper {
-  background-color: $containerbg !important;
+.el-table__body tr {
+  box-sizing: content-box !important;
+  cursor: pointer;
 }
 
 .el-table__body tr:hover {
-  background: rgba(2, 160, 253, 0.1) !important;
+  background: rgba(2, 160, 253, 0.3) !important;
   box-shadow: inset 0px 0px 18px 0px #02A0FD !important;
 }
 
-.el-table__body tr:hover>td.el-table__cell {
+.el-table__body tr:hover>td {
   background: none !important;
 }
 
@@ -211,17 +213,12 @@ table td {
 }
 
 
-.el-table tr:nth-child(even) {
-  background: #FCFDFD !important;
-}
-
 .el-table tr td {
   font-size: 14px;
   color: #7A7A7A;
 }
 
 .lb-table .el-table {
-  border: 1px solid #E4EBF4;
   border-bottom: none;
   border-radius: 4px 4px 0 0;
 }

@@ -2,9 +2,11 @@
     /deep/.el-table {
         border: none !important;
         border-radius: 0 !important;
+        background-color: rgba(0, 0, 0, 0);
 
         .el-table__header-wrapper {
             border-right: 1px solid #103E99;
+
         }
 
         .cell {
@@ -12,7 +14,7 @@
         }
 
         .el-table__row {
-            background-color: $containerbg !important;
+            background: #0F56A3 !important;
         }
 
         thead {
@@ -113,22 +115,34 @@
             color: #FFFFFF;
         }
 
+        .bgc {
+            box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
+            background-color: rgba(0, 0, 0, 0);
+        }
+
         /deep/ .el-pagination {
             .el-input__inner {
-                background: #1F357A !important;
                 color: #FFFFFF;
                 border: none;
+                @extend .bgc;
+            }
+
+            .el-pager li:not(.disabled).active {
+                box-shadow: inset 0px 0px 12px 0px #02D9FD;
+                border-radius: 1px;
+                border: 1px solid #02D9FD;
+                background-color: rgba(0, 0, 0, 0);
             }
 
             .el-pager li {
-                background: #1F357A;
+                @extend .bgc;
                 color: #FFFFFF;
             }
         }
 
         /deep/.btn-next,
         /deep/.btn-prev {
-            background: #1F357A !important;
+            @extend .bgc;
             color: #FFFFFF;
         }
 

@@ -2,24 +2,24 @@ import store from '@/store'
 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
 export default class filter {
   // 业务来源
-  busSource (val) {
+  busSource(val) {
     let status = { 1: '办事大厅', 2: '微信小程序' }
     return status[val]
   }
 
   //申请分类（1：正常申请，2：一并申请，3：补录申请）
-  sqfls (val) {
+  sqfls(val) {
     let status = { 1: '正常申请', 2: '一并申请', 3: '补录申请' }
     return status[val]
   }
   // 字典
-  dicStatus (val, code) {
+  dicStatus(val, code) {
     let data = store.getters.dicData[code],
       name = '暂无'
     if (data) {
       data.map((item) => {
-        if (item.dcode == val) {
-          name = item.dname
+        if (item.DCODE == val) {
+          name = item.DNAME
         }
       })
       return name

@@ -159,5 +159,6 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
 @import "./index.scss";
 </style>
\ No newline at end of file

@@ -20,22 +20,22 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <span>{ this.dicStatus(scope.row.dybdclx, 'A27')}</span>
+              <span>{this.dicStatus(scope.row.dybdclx, 'A27')}</span>
             </div>
           )
         },
       },
-      // {
-      //   label: "登记类型",
-      //   width: 70,
-      //   render: (h, scope) => {
-      //     return (
-      //       <div>
-      //         <span>{this.djlxStatus(scope.row.DJLX)}</span>
-      //       </div>
-      //     )
-      //   }
-      // },
+      {
+        label: "登记类型",
+        width: 70,
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{this.dicStatus(scope.row.djlx, 'A21')}</span>
+            </div>
+          )
+        }
+      },
       {
         label: "不动产单元号",
         prop: "bdcdyh"

@@ -29,7 +29,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current"
+      <lb-table v-loading="loading" :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
         :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>
@@ -150,3 +150,8 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+// 引入表单整体样式
+@import "~@/styles/public.scss";
+</style>
+

@@ -38,9 +38,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :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>
@@ -68,7 +68,6 @@ export default {
   },
   data () {
     return {
-      loading: false,
       form: {
         YWH: '',
         YGDJZL: '',
@@ -148,7 +147,6 @@ export default {
     },
     async featchData () {
       try {
-        this.loading = true
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQlfQlYgdjByCondition(this.form)
@@ -162,7 +160,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-      this.loading = false
     },
     async handlDatadetails (index, row) {
       let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
@@ -177,3 +174,7 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+// 引入表单整体样式
+@import "~@/styles/public.scss";
+</style>

@@ -38,9 +38,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :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>
@@ -68,7 +68,6 @@ export default {
   },
   data () {
     return {
-      loading: false,
       form: {
         YWH: '',
         QLLX: '',
@@ -131,7 +130,6 @@ export default {
     },
     async featchData () {
       try {
-        this.loading = true
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQlfQlYydjByCondition(this.form)
@@ -145,7 +143,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-      this.loading = false
     },
     async handlDatadetails (index, row) {
       let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
@@ -160,3 +157,6 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+@import "~@/styles/public.scss";
+</style>
\ No newline at end of file

@@ -34,9 +34,9 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table v-loading="loading" :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>
@@ -62,7 +62,6 @@ export default {
   },
   data () {
     return {
-      loading: false,
       form: {
         YWH: '',
         BDCDYH: '',
@@ -124,7 +123,6 @@ export default {
     },
     async featchData () {
       try {
-        this.loading = true
         let { result: { list, total, pages: pageSize, pageNum: current }
         } = await business.getQlfQlCfdjByCondtion(this.form)
         this.tableData.data = list
@@ -137,7 +135,6 @@ export default {
         this.message = error
         this.$refs.msg.messageShow()
       }
-      this.loading = false
     },
     async handlDatadetails (index, row) {
       let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
@@ -152,3 +149,6 @@ export default {
   }
 }
 </script>
+<style scoped lang="scss">
+@import "~@/styles/public.scss";
+</style>
\ No newline at end of file

@@ -39,7 +39,7 @@ export default {
     background: url("~@/image/mapcenter.png") no-repeat;
     background-size: 100% 100%;
     position: relative;
-    height: 470px;
+    height: 510px;
 
     .title {
       position: absolute;
@@ -74,7 +74,7 @@ export default {
       position: absolute;
       left: 0;
       right: 0;
-      top: 9px;
+      top: 3px;
       text-align: center;
       margin-bottom: 10px;
     }

@@ -77,16 +77,16 @@ export default {
 <style lang="scss" scoped>
 .leftcard {
   width: 30%;
-  height: 100%;
+  height: calc(100% -94px);
   display: flex;
   flex-direction: column;
+
   .card {
     background: url("~@/image/homeLeftBg.png") no-repeat;
     background-size: 100% 100%;
     position: relative;
-    flex: 1;
-    height: 100%;
     padding: 8px 0;
+    height: 170px;
   }
 
   .card1 {
@@ -94,6 +94,9 @@ export default {
     background-size: 100% 100%;
     position: relative;
     padding: 10px 0;
+    box-sizing: border-box;
+    flex: 1;
+    height: 100%;
   }
 
   .cardhead {

@@ -2,7 +2,7 @@
   <div class="rightcard">
     <div class="card1 cardCon d-center">
       <div class="cardhead">房屋情况统计表</div>
-      <div class="cardcontent" style="margin-top: 50px">
+      <div class="cardcontent" style="margin-top: 70px">
         <dv-scroll-board :config="config" class="board" />
       </div>
     </div>
@@ -27,7 +27,7 @@ export default {
         headerBGC: '#016AC5',
         oddRowBGC: '#154295',
         evenRowBGC: '#154295',
-        header: ['序号', '行政区名称', '行政区总数', '接入量'],
+        header: ['序号', '用途', '性质', '面积'],
         data: [
           ['1', '咸阳市', '6', '998'],
           ['1', '咸阳市', '6', '998'],
@@ -51,7 +51,9 @@ export default {
 }
 
 .rightcard {
+  width: 30%;
   display: flex;
+  height: calc(100% -94px);
   flex-direction: column;
 
   .cardhead {
@@ -62,7 +64,7 @@ export default {
     position: absolute;
     left: 0;
     right: 0;
-    top: 15px;
+    top: 12px;
     text-align: center;
   }
 
@@ -72,21 +74,21 @@ export default {
   }
 
   .cardCon {
-    padding: 20px 10px;
+    padding: 20px 5px;
     position: relative;
     text-align: center;
     width: 100%;
   }
 
   .card1 {
-    height: 240px;
+    height: 200px;
     background: url("~@/image/homeLeftBg.png") no-repeat;
     background-size: 100% 100%;
 
     .board {
       width: 90%;
       margin: 0 auto;
-      height: 165px;
+      height: 135px;
       margin-top: 40px;
     }
   }
@@ -94,13 +96,18 @@ export default {
   .card2 {
     background: url("~@/image/djywl.png") no-repeat;
     background-size: 100% 100%;
-    padding: 70px 0 20px 0;
+    padding: 60px 0 0 0;
   }
 
   .card3 {
-    height: 170px;
+    flex: 1;
+    height: 100%;
     background: url("~@/image/lxzl.png") no-repeat;
     background-size: 100% 100%;
+    padding-bottom: 0;
+    .cardhead {
+      top: 8px;
+    }
   }
 
   .cardhead {

@@ -46,43 +46,6 @@ export default {
   margin: auto;
   display: flex;
   justify-content: space-between;
-  .centercard {
-    width: 40%;
-
-    .card1 {
-      width: 100%;
-      box-sizing: border-box;
-      background-size: 100% 100%;
-    }
-
-    .card2 {
-      width: 100%;
-      box-sizing: border-box;
-      background-size: 100% 100%;
-    }
-  }
-
-  .rightcard {
-    width: 30%;
-    height: 100%;
-
-    .card1 {
-      width: 100%;
-      box-sizing: border-box;
-      background-size: 100% 100%;
-    }
-
-    .card2 {
-      width: 100%;
-      box-sizing: border-box;
-      background-size: 100% 100%;
-    }
-
-    .card3 {
-      width: 100%;
-      box-sizing: border-box;
-      background-size: 100% 100%;
-    }
-  }
+  margin-top: 15px;
 }
 </style>

@@ -36,7 +36,7 @@
     <!-- 列表区域 -->
     <div class="from-clues-content">
       <!-- table组件 -->
-      <lb-table :page-size="pageData.size" :heightNum="225" :current-page.sync="pageData.current"
+      <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
         :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>

@@ -87,7 +87,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js";
 export default {
   name: "jsbwcx",
   mixins: [tableMixin],
-  data() {
+  data () {
     return {
       // 开始结束日期限制
       pickerOptionsStart: {
@@ -172,7 +172,7 @@ export default {
       // 分页
       pageData: {
         total: 0,
-        pageSize: 15,
+        pageSize: 10,
         current: 1,
       },
       // 业务名称
@@ -200,7 +200,7 @@ export default {
   },
   methods: {
     // 初始化数据
-    queryClick() {
+    queryClick () {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -210,14 +210,14 @@ export default {
       });
     },
     // 重置
-    resetForm() {
+    resetForm () {
       this.$refs.ruleForm.resetFields();
     },
-    featchData() {
+    featchData () {
       this.queryClick();
     },
     // 详情
-    handleEdit() {
+    handleEdit () {
       this.$popupDialog(
         "业务报文",
         "components/JsonEditor/index",

@@ -13,12 +13,18 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="汇交时间" prop="reportStartTime">
+              <el-row :gutter="20">
+                <el-col :span="12">
                   <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
                     clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
+                </el-col>
+                <el-col :span="12">
                   <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
                     clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+                </el-col>
+              </el-row>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -32,7 +38,7 @@
         </el-row>
         <el-row class="mt-10">
           <!-- 操作按钮 -->
-          <el-col :span="12" class="btnColRight">
+          <el-col :span="24" class="btnColRight">
             <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn>
             <btn nativeType="cx" @click="queryClick">查询</btn>
           </el-col>
@@ -68,7 +74,7 @@ export default {
   components: {
     dataDetails,
   },
-  data() {
+  data () {
     return {
       isShow: false,
       // 开始结束日期限制
@@ -159,11 +165,11 @@ export default {
   },
   methods: {
     // 重置表单
-    resetForm() {
+    resetForm () {
       this.$refs.ruleForm.resetFields();
     },
     // 初始化数据
-    queryClick() {
+    queryClick () {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -173,11 +179,11 @@ export default {
       });
     },
     // 多选
-    handleSelectionChange(val) {},
+    handleSelectionChange (val) { },
     // 上报
-    handleEscalation() {},
+    handleEscalation () { },
     // 详情
-    handleDetail(row) {
+    handleDetail (row) {
       this.$refs.editLog.isShow(row);
     },
   },