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

-import dialogBox from '@/components/DialogBox/dialogBox.vue'
-import LbTable from '@/components/LbTable/lb-table.vue'
-import Theme from '@/components/Theme/theme.vue'
+import dialogBox from '@/components/DialogBox'
+import LbTable from '@/components/LbTable'
+import Theme from '@/components/Theme.vue'
 // 引入按钮
 // 引入按钮
-import btn from '@/components/Button/src/button'
+import btn from '@/components/Button.vue'
 import Popup from '@/components/Popup/index'
 import Popup from '@/components/Popup/index'
 import MessageBox from '@/components/MessageBox/index.js'
 import MessageBox from '@/components/MessageBox/index.js'
 export default {
 export default {

@@ -90,7 +90,7 @@
 import djfDjSqr from "@/api/djfDjSqr";
 import djfDjSqr from "@/api/djfDjSqr";
 import djfDjDb from "@/api/djfDjDb"
 import djfDjDb from "@/api/djfDjDb"
 import ruleMixin from "@/mixins/ruleMixin.js";
 import ruleMixin from "@/mixins/ruleMixin.js";
-import treeSelect from "@/components/treeSelect/index.vue";
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   mixins: [ruleMixin],
   mixins: [ruleMixin],
   props: {
   props: {

@@ -186,7 +186,7 @@
 // 发证信息
 // 发证信息
 import djfDjFz from '@/api/djfDjFz'
 import djfDjFz from '@/api/djfDjFz'
 import ruleMixin from '@/mixins/ruleMixin.js'
 import ruleMixin from '@/mixins/ruleMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   mixins: [ruleMixin],
   mixins: [ruleMixin],
   props: {
   props: {

@@ -311,7 +311,7 @@
 // 申请人属性信息
 // 申请人属性信息
 import djfDjSqr from "@/api/djfDjSqr";
 import djfDjSqr from "@/api/djfDjSqr";
 import ruleMixin from "@/mixins/ruleMixin.js";
 import ruleMixin from "@/mixins/ruleMixin.js";
-import treeSelect from "@/components/treeSelect/index.vue";
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   mixins: [ruleMixin],
   mixins: [ruleMixin],
   props: {
   props: {

@@ -435,7 +435,7 @@
 // 宗地基本信息
 // 宗地基本信息
 import kttZdjbxx from '@/api/kttZdjbxx'
 import kttZdjbxx from '@/api/kttZdjbxx'
 import ruleMixin from '@/mixins/ruleMixin.js'
 import ruleMixin from '@/mixins/ruleMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   mixins: [ruleMixin],
   mixins: [ruleMixin],
   components: {
   components: {

@@ -321,7 +321,7 @@
 <script>
 <script>
 import zttGyQlr from '@/api/zttGyQlr'
 import zttGyQlr from '@/api/zttGyQlr'
 import ruleMixin from '@/mixins/ruleMixin.js'
 import ruleMixin from '@/mixins/ruleMixin.js'
-import treeSelect from '../treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 // 权利人
 // 权利人
 export default {
 export default {
   mixins: [ruleMixin],
   mixins: [ruleMixin],

@@ -28,16 +28,16 @@ export default {
 }
 }
 
 
 .cx {
 .cx {
-  background: url('../../../image/btn.png') no-repeat -4px -40px;
+  background: url('../image/btn.png') no-repeat -4px -40px;
   cursor: pointer;
   cursor: pointer;
 }
 }
 
 
 .cz {
 .cz {
-  background: url('../../../image/btn.png') no-repeat -4px -4px;
+  background: url('../image/btn.png') no-repeat -4px -4px;
   cursor: pointer;
   cursor: pointer;
 }
 }
 
 
 .sb {
 .sb {
-  background: url('../../../image/btn.png') no-repeat -4px -112px;
+  background: url('../image/btn.png') no-repeat -4px -112px;
 }
 }
 </style>
 </style>

@@ -3,7 +3,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Chart from './chart.vue'
+import Chart from './Chart'
 export default {
 export default {
   data () {
   data () {
     return {
     return {

@@ -3,7 +3,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Chart from "./chart.vue";
+import Chart from "./Chart";
 import work from "@/api/work";
 import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {

@@ -3,7 +3,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Chart from "./chart.vue";
+import Chart from "./Chart";
 import work from "@/api/work";
 import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {

@@ -3,7 +3,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Chart from './chart.vue';
+import Chart from "./Chart";
 import work from "@/api/work";
 import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {

@@ -10,7 +10,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import Chart from "./chart.vue";
+import Chart from "./Chart";
 import work from "@/api/work";
 import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {

@@ -116,8 +116,8 @@
 
 
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
-import JsonEditor from "@/components/JsonEditor/index";
-import Xyjg from "./result";
+import JsonEditor from "@/components/JsonEditor.vue";
+import Xyjg from "./Result";
 import { getDetail, getXml } from "@/api/dataReport.js";
 import { getDetail, getXml } from "@/api/dataReport.js";
 import { MessageBox } from "element-ui";
 import { MessageBox } from "element-ui";
 export default {
 export default {
@@ -206,7 +206,7 @@ export default {
     },
     },
     loadView (view) {
     loadView (view) {
       return (r) =>
       return (r) =>
-        require.ensure([], () => r(require(`@/components/business/${view}`)));
+        require.ensure([], () => r(require(`@/components/Business/${view}`)));
     },
     },
     closeDialog () {
     closeDialog () {
       this.dialogVisible = false;
       this.dialogVisible = false;

@@ -39,7 +39,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import LbRender from './lb-render'
+import LbRender from './LbRender'
 import forced from './forced.js'
 import forced from './forced.js'
 export default {
 export default {
   name: 'LbColumn',
   name: 'LbColumn',

@@ -46,7 +46,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import LbColumn from './lb-column'
+import LbColumn from './LbColumn'
 export default {
 export default {
   props: {
   props: {
     column: Array,
     column: Array,

-<template>
-    <div>
-        <el-table :data="data" border v-loading="loading" v-bind="$attrs" v-on="$listeners">
-            <lb-column v-bind="$attrs" v-for="(item, index) in column" :key="index" :column="item">
-            </lb-column>
-        </el-table>
-        <el-pagination class="lb-table-pagination" v-if="pagination" :page-sizes="[10, 20, 50, 100]"
-            layout="total, prev, pager, next, jumper" :style="{
-                'margin-top': '16px',
-                'text-align': 'right',
-            }" v-bind="$attrs" v-on="$listeners" :pager-count="6" @current-change="paginationCurrentChange">
-        </el-pagination>
-    </div>
-</template>
-
-<script>
-import LbColumn from "@/components/LbTable/lb-column";
-
-export default {
-    components: { LbColumn },
-    props: {
-        data: Array,
-        column: Array,
-        pagination: {
-            type: Boolean,
-            default: true,
-        },
-    },
-    methods: {
-        paginationCurrentChange (val) {
-            this.$emit("current-change", val);
-        },
-    },
-};
-</script>
-<style  rel="stylesheet/less" lang="less" scoped>
-
-</style>

 import Vue from 'vue'
 import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon'// svg component
+import SvgIcon from '@/components/SvgIcon.vue'// svg component
 
 
 // register globally
 // register globally
 Vue.component('svg-icon', SvgIcon)
 Vue.component('svg-icon', SvgIcon)

@@ -7,7 +7,7 @@
   </section>
   </section>
 </template>
 </template>
 <script>
 <script>
-import Breadcrumb from "@/components/Breadcrumb/index";
+import Breadcrumb from "@/components/Breadcrumb.vue";
 export default {
 export default {
   name: 'AppMain',
   name: 'AppMain',
   components: {
   components: {

@@ -4,7 +4,7 @@ import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 import Element from 'element-ui'
 import Element from 'element-ui'
 import '@/styles/element-variables.scss'
 import '@/styles/element-variables.scss'
 import '@/styles/index.scss'
 import '@/styles/index.scss'
-import Base from '@/components/Base/base' // 全局组件引入
+import Base from './base' // 全局组件引入
 import mixin from '@/utils/mixin/theme.js'
 import mixin from '@/utils/mixin/theme.js'
 import dataV from '@jiaminghi/data-view';
 import dataV from '@jiaminghi/data-view';
 import echarts from "echarts"
 import echarts from "echarts"

 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 // 引入详情弹框
 // 引入详情弹框
-import dataDetails from "@/components/dataDetails/edit-dialog";
+import dataDetails from "@/components/EditDialog";
 let mixin = {
 let mixin = {
   data () {
   data () {
     return {
     return {

@@ -80,7 +80,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlDyaq from '@/api/qlfQlDyaq'
 import qlfQlDyaq from '@/api/qlfQlDyaq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "dyaq",
   name: "dyaq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -82,7 +82,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlDyiq from '@/api/qlfQlDyiq'
 import qlfQlDyiq from '@/api/qlfQlDyiq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "dyiq",
   name: "dyiq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -73,7 +73,7 @@ import data from "./data"
 import qltFwFdcqDz from '@/api/qltFwFdcqDz'
 import qltFwFdcqDz from '@/api/qltFwFdcqDz'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "fdcqdz",
   name: "fdcqdz",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -45,7 +45,7 @@ import data from "./data"
 import qlfFwFdcqQfsyq from '@/api/qlfFwFdcqQfsyq'
 import qlfFwFdcqQfsyq from '@/api/qlfFwFdcqQfsyq'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "fdcqqfsyq",
   name: "fdcqqfsyq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -73,7 +73,7 @@ import data from "./data"
 import qltFwFdcqYz from '@/api/qltFwFdcqYz'
 import qltFwFdcqYz from '@/api/qltFwFdcqYz'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "fdcqyz",
   name: "fdcqyz",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -69,7 +69,7 @@
 import data from "./data"
 import data from "./data"
 import qltQlGjzwsyq from '@/api/qltQlGjzwsyq'
 import qltQlGjzwsyq from '@/api/qltQlGjzwsyq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "gzwsyq",
   name: "gzwsyq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -70,7 +70,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlHysyq from '@/api/qlfQlHysyq'
 import qlfQlHysyq from '@/api/qlfQlHysyq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "hysyq",
   name: "hysyq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -68,7 +68,7 @@ import data from "./data"
 import qlfQlJsydsyq from '@/api/qlfQlJsydsyq'
 import qlfQlJsydsyq from '@/api/qlfQlJsydsyq'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import sjsbFunctionOper from '@/api/sjsbFunctionOper'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "jsydzjdsyq",
   name: "jsydzjdsyq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -65,7 +65,7 @@
 import data from "./data"
 import data from "./data"
 import qltQlLq from '@/api/qltQlLq'
 import qltQlLq from '@/api/qltQlLq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "lq",
   name: "lq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -69,7 +69,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlNydsyq from '@/api/qlfQlNydsyq'
 import qlfQlNydsyq from '@/api/qlfQlNydsyq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "nydsyq",
   name: "nydsyq",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -67,7 +67,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlTdsyq from '@/api/qlfQlTdsyq'
 import qlfQlTdsyq from '@/api/qlfQlTdsyq'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   components: {
   components: {
     treeSelect
     treeSelect

@@ -76,7 +76,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlYgdj from '@/api/qlfQlYgdj'
 import qlfQlYgdj from '@/api/qlfQlYgdj'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "ygdj",
   name: "ygdj",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -66,7 +66,7 @@
 import data from "./data"
 import data from "./data"
 import qlfQlYydj from '@/api/qlfQlYydj'
 import qlfQlYydj from '@/api/qlfQlYydj'
 import tableMixin from '@/mixins/tableMixin.js'
 import tableMixin from '@/mixins/tableMixin.js'
-import treeSelect from '@/components/treeSelect/index.vue'
+import treeSelect from '@/components/TreeSelect.vue'
 export default {
 export default {
   name: "yydj",
   name: "yydj",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -12,8 +12,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import maps from "@/components/echart/map";
-import brokenline from "@/components/echart/brokenline";
+import maps from "@/components/Echart/Map";
+import brokenline from "@/components/Echart/Brokenline";
 export default {
 export default {
   data () {
   data () {
     return {};
     return {};

@@ -54,7 +54,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import columnar from "@/components/echart/columnar";
+import columnar from "@/components/Echart/Columnar";
 import work from "@/api/work";
 import work from "@/api/work";
 export default {
 export default {
   data () {
   data () {

@@ -18,8 +18,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import columnarsmat from "@/components/echart/columnarsmat";
-import Rose from "@/components/echart/Rose";
+import columnarsmat from "@/components/Echart/Columnarsmat";
+import Rose from "@/components/Echart/Rose";
 export default {
 export default {
   data () {
   data () {
     return {
     return {

@@ -95,7 +95,7 @@
 <script>
 <script>
 // 上报首页
 // 上报首页
 import wgsl from "./wgsl.vue";
 import wgsl from "./wgsl.vue";
-import CenterLeft2Chart from "@/components/echart/map";
+import CenterLeft2Chart from "@/components/Echart/Map";
 // 引入表格数据
 // 引入表格数据
 import data from "./data"
 import data from "./data"
 export default {
 export default {

@@ -103,7 +103,7 @@ import data from "./data";
 import tableMixin from "@/mixins/tableMixin.js";
 import tableMixin from "@/mixins/tableMixin.js";
 import { getReceiveDataReportPage } from "@/api/dataReport.js";
 import { getReceiveDataReportPage } from "@/api/dataReport.js";
 // 引入详情弹框
 // 引入详情弹框
-import dataDetails from "@/components/dataDetails/edit-dialog";
+import dataDetails from "@/components/EditDialog";
 export default {
 export default {
   name: "jsbwcx",
   name: "jsbwcx",
   mixins: [tableMixin],
   mixins: [tableMixin],

@@ -85,7 +85,7 @@ import { datas, sendThis } from "./data";
 // 引入表格混入方法
 // 引入表格混入方法
 import table from "@/utils/mixin/table";
 import table from "@/utils/mixin/table";
 // 引入详情弹框
 // 引入详情弹框
-import dataDetails from "@/components/dataDetails/edit-dialog";
+import dataDetails from "@/components/EditDialog";
 import { getDataReportPage } from "@/api/dataReport.js";
 import { getDataReportPage } from "@/api/dataReport.js";
 
 
 export default {
 export default {