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

@@ -61,7 +61,7 @@ class business {
     })
   }
   // 构（建）筑物所有权
-  async getQltQlGjzwsyqByCondition (data) {
+  async getQltQlGjzwsyqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QltQlGjzwsyq/getDataPage',
       method: 'post',
@@ -77,7 +77,7 @@ class business {
     })
   }
   // 林权
-  async getQltQlLqByCondition (data) {
+  async getQltQlLqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QltQlLq/getDataPage',
       method: 'post',
@@ -120,7 +120,7 @@ class business {
 
 
   // 抵押权登记
-  async getQlfQlDyaqByCondition (data) {
+  async getQlfQlDyaqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyaq/getDataPage',
       method: 'post',
@@ -129,7 +129,7 @@ class business {
   }
 
   // 地役权
-  async getQlfQlDyiqByCondtion (data) {
+  async getQlfQlDyiqList (data) {
     return request({
       url: SERVER.SERVERAPI +'/rest/reg/QlfQlDyiq/getDataPage',
       method: 'post',

@@ -128,6 +128,7 @@ export default {
                         type: "line",
                         smooth: true, //是否平滑
                         showSymbol: false,
+                        symbol: 'circle',
                         symbolSize: 6,
                         zlevel: 3,
                         lineStyle: {
@@ -144,6 +145,7 @@ export default {
                         type: "line",
                         smooth: true,
                         showSymbol: false,
+                        symbol: 'circle',
                         symbolSize: 8,
                         zlevel: 3,
                         lineStyle: {
@@ -161,6 +163,7 @@ export default {
                         type: "line",
                         smooth: true,
                         showSymbol: false,
+                        symbol: 'circle',
                         symbolSize: 8,
                         zlevel: 3,
                         lineStyle: {

@@ -88,4 +88,4 @@ export default {
     Chart
   }
 }
-</script>
\ No newline at end of file
+</script>

@@ -212,27 +212,27 @@ export const asyncRoutes = [
         meta: { title: '建筑物区分所有权业主共有部分' }
       },
       {
-        path: 'seaArea',
-        component: () => import('@/views/business-info/sea-area/index'),
-        name: 'seaArea',
+        path: 'hysyq',
+        component: () => import('@/views/business-info/hysyq/index'),
+        name: 'hysyq',
         meta: { title: '海域(含无居民海岛)使用权' }
       },
       {
-        path: 'buildingOwnership',
-        component: () => import('@/views/business-info/building-ownership/index'),
-        name: 'buildingOwnership',
+        path: 'gzwsyq',
+        component: () => import('@/views/business-info/gzwsyq/index'),
+        name: 'gzwsyq',
         meta: { title: '构（建）筑物所有权' }
       },
       {
-        path: 'agriculturalLand',
-        component: () => import('@/views/business-info/agricultural-land/index'),
-        name: 'agriculturalLand',
+        path: 'nydsyq',
+        component: () => import('@/views/business-info/nydsyq/index'),
+        name: 'nydsyq',
         meta: { title: '农用地使用权（非林地）' }
       },
       {
-        path: 'forestOwnership',
-        component: () => import('@/views/business-info/forest-ownership/index'),
-        name: 'forestOwnership',
+        path: 'lq',
+        component: () => import('@/views/business-info/lq/index'),
+        name: 'lq',
         meta: { title: '林权' }
       },
       {
@@ -260,15 +260,15 @@ export const asyncRoutes = [
         meta: { title: '查封登记' }
       },
       {
-        path: 'mortgageReg',
-        component: () => import('@/views/business-info/mortgage-registration/index'),
-        name: 'mortgageReg',
+        path: 'dyaq',
+        component: () => import('@/views/business-info/dyaq/index'),
+        name: 'dyaq',
         meta: { title: ' 抵押权登记' }
       },
       {
-        path: 'easementReg',
-        component: () => import('@/views/business-info/easement-registration/index'),
-        name: 'easementReg',
+        path: 'dyiq',
+        component: () => import('@/views/business-info/dyiq/index'),
+        name: 'dyiq',
         meta: { title: ' 地役权登记' }
       }
     ]

@@ -257,13 +257,38 @@ table td {
 }
 
 .el-popper[x-placement^="bottom"] .popper__arrow::after {
-  border-bottom-color: #074487 !important;
+display: none;
 }
 
 .el-popper[x-placement^="bottom"] .popper__arrow {
-  border-bottom-color: #074487 !important;
+  display: none;
+}
+.el-date-picker{
+  background-color: #031a46;
+  .el-date-picker__header-label{
+    color: #A6CFD6;
+  }
+  .el-picker-panel__icon-btn{
+    color: #A6CFD6;
+  }
+  .el-date-table th{
+    color: #02D9FD;
+  }
+  .el-date-table td span{
+    color: #A6CFD6;
+  }
+  .el-date-table td.current:not(.disabled) span{
+   background-color: #074487;
+  //  border:1px solid saddlebrown;
+   box-shadow: inset 0 0 7px #02D9FD;
+   border: 1px solid #02D9FD;
+  }
+
 }
+.el-picker-panel__content{
+  background-color:#074487;
 
+}
 
 
 .el-menu--horizontal .el-menu .el-menu-item,
@@ -282,4 +307,4 @@ table td {
   border: 1px solid #02D9FD;
   color: #FFFFFF !important;
   font-weight: 700;
-}
\ No newline at end of file
+}

@@ -25,11 +25,11 @@ class data extends filter {
       },
       {
         label: "查封开始时间",
-        prop: "CFQSSJ"
+        prop: "cfqssj"
       },
       {
         label: "查封结束时间",
-        prop: "CFJSSJ"
+        prop: "cfjssj"
       },
       {
         label: "查封类型",
@@ -45,7 +45,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       }
     ]
   }

 <template>
-  <div class="mortgageReg from-clues">
+  <div class="dyaq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -51,7 +51,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "mortgageReg",
+  name: "dyaq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -122,7 +122,7 @@ export default {
       try {
         this.loading = true
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlDyaqByCondition(this.form)
+        } = await business.getQlfQlDyaqList(this.form)
         this.tableData.data = list;
         this.pageData = {
           pageSize,

 <template>
-  <div class="easementReg from-clues">
+  <div class="dyiq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -47,7 +47,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "easementReg",
+  name: "dyiq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -113,7 +113,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQlfQlDyiqByCondtion(this.form)
+        } = await business.getQlfQlDyiqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -42,7 +42,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号3">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -35,7 +35,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号5">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -7,7 +7,7 @@ class data extends filter {
     return [
       {
         label: "业务号",
-        prop: "YWH",
+        prop: "ywh",
         width: 150
       },
       // {
@@ -42,11 +42,11 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "djjg"
       }
     ]
   }

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号4">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

 <template>
-  <div class="buildingOwnership from-clues">
+  <div class="gzwsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "buildingOwnership",
+  name: "gzwsyq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -134,7 +134,7 @@ export default {
         this.loading = true
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQltQlGjzwsyqByCondition(this.form)
+        } = await business.getQltQlGjzwsyqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,
@@ -162,5 +162,6 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+@import "~@/styles/public.scss";
 @import "./index.scss";
 </style>
\ No newline at end of file

 <template>
-  <div class="seaArea from-clues">
+  <div class="hysyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "seaArea",
+  name: "hysyq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -159,4 +159,8 @@ export default {
     },
   }
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped lang="scss">
+@import "~@/styles/public.scss";
+</style>
+

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号2">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

 <template>
-  <div class="forestOwnership from-clues">
+  <div class="lq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -42,7 +42,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "forestOwnership",
+  name: "lq",
   mixins: [tableMixin],
   components: {
     treeSelect,
@@ -107,7 +107,7 @@ export default {
       try {
         this.form = Object.assign(this.form, this.formData)
         let { result: { list, total, pages: pageSize, pageNum: current }
-        } = await business.getQltQlLqByCondition(this.form)
+        } = await business.getQltQlLqList(this.form)
         this.tableData.data = list
         this.pageData = {
           pageSize,

 <template>
-  <div class="agriculturalLand from-clues">
+  <div class="nydsyq from-clues">
     <div class="from-clues-header">
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
 import treeSelect from '@/components/treeSelect/index.vue'
 import editDialog from '@/components/dataDetails/edit-dialog.vue'
 export default {
-  name: "agriculturalLand",
+  name: "nydsyq",
   mixins: [tableMixin],
   components: {
     treeSelect,

@@ -42,7 +42,7 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号1">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -4,7 +4,7 @@
       <el-form ref="form" :model="form" label-width="80px">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="业务号6">
+            <el-form-item label="业务号">
               <el-input v-model="form.YWH" placeholder="业务号"></el-input>
             </el-form-item>
           </el-col>

@@ -25,11 +25,11 @@ class data extends filter {
       {
         label: "登记时间",
         width: 140,
-        prop: "DJSJ"
+        prop: "djsj"
       },
       {
         label: "登记机构",
-        prop: "DJJG"
+        prop: "djjg"
       }
     ]
   }

@@ -29,19 +29,23 @@ export default {
         evenRowBGC: '#154295',
         header: ['序号', '用途', '性质', '面积'],
         data: [
-          ['1', '咸阳市', '6', '998'],
-          ['1', '咸阳市', '6', '998'],
-          ['1', '咸阳市', '6', '998'],
-          ['1', '咸阳市', '6', '998'],
-          ['1', '咸阳市', '6', '998'],
-          ['1', '咸阳市', '6', '998'],
+          ['住宅', '自建房', '转移登记', '73.94'],
+          ['商业服务', '市场化商品房', '转移登记', '1067.14'],
+          ['住宅', '成本售价房', '转移登记', '601.47'],
+          ['住宅', '市场化商品房', '转移登记', '38111.37'],
+          ['住宅', '移民搬迁安置房', '转移登记', '104.16'],
+          ['办公', '自建房', '转移登记', '14913.86'],
+          ['柴房', '市场化商品房', '转移登记', '615.55'],
+          ['住宅', '经济适用住房', '转移登记', '173.17'],
+          ['车库/车位', '市场化商品房', '转移登记', '105.27'],
+          ['住宅', '房改房', '转移登记', '372.4']
         ]
       }
     }
   },
   components: { columnarsmat, Rose },
   mounted () {
-    scroll(tableref.value.$refs.bodyWrapper);//设置滚动
+    // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
   }
 }
 </script>

@@ -8,8 +8,8 @@
           <el-col :span="6">
             <el-form-item label="行政区" prop="pcode">
               <el-select v-model="form.pcode" class="width100" clearable placeholder="行政区">
-                <el-option v-for="item in xzqOptions" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
+                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                  </el-option>
               </el-select>
             </el-form-item>
           </el-col>

@@ -6,12 +6,12 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="字典类型编码">
-              <el-input v-model="ruleForm.DCODE" @clear="queryClick" clearable placeholder="字典类型编码"></el-input>
+              <el-input v-model="ruleForm.dcode" @clear="queryClick" clearable placeholder="字典类型编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="字典类型名称">
-              <el-input v-model="ruleForm.DNAME" @clear="queryClick" clearable placeholder="字典类型名称"></el-input>
+              <el-input v-model="ruleForm.dname" @clear="queryClick" clearable placeholder="字典类型名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" class="btnColRight">
@@ -57,8 +57,8 @@ export default {
         rowData: {}
       },
       ruleForm: {
-        DCODE: '',
-        DNAME: ''
+        dcode: '',
+        dname: ''
       },
       tableData: {
         total: 0,