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

@@ -59,6 +59,9 @@ export default {
     initChart () {
       // 初始化echart
       this.chart = this.$echarts.init(this.$el, 'tdTheme')
+      function nowSize(val,initWidth=1920){
+    return val * (nowClientWidth/initWidth);
+}
       this.chart.setOption(this.options, true)
 
 

@@ -35,6 +35,16 @@ export default {
       }
       return rgbaColor;
     },
+    fontSize(res) {
+  let docEl = document.documentElement,
+    clientWidth =
+      window.innerWidth ||
+      document.documentElement.clientWidth ||
+      document.body.clientWidth;
+  if (!clientWidth) return;
+  let fontSize = clientWidth / 1920;
+  return res * fontSize;
+}
   },
   watch: {
     cdata: {
@@ -51,6 +61,7 @@ export default {
             data: newData.legendItem,
             textStyle: {
               color: "#00DEFF",
+              fontSize:this.fontSize(12),
             },
           },
           // calculable: true,
@@ -97,8 +108,8 @@ export default {
                 textStyle: {
                   color: "rgba(255, 255, 255,0.7)", // x轴颜色
                   fontWeight: "normal",
-                  fontSize: "12",
-                  lineHeight: 22,
+                  fontSize: this.fontSize(12),
+                  lineHeight: this.fontSize(22),
                 },
               },
               data: this.xAxisData,
@@ -136,7 +147,7 @@ export default {
               smooth: false, //是否平滑
               showSymbol: true,
               symbol: "circle",
-              symbolSize: 6,
+              symbolSize: this.fontSize(6),
               zlevel: 3,
               lineStyle: {
                 normal: {
@@ -154,7 +165,7 @@ export default {
               smooth: false,
               showSymbol: true,
               symbol: "circle",
-              symbolSize: 8,
+              symbolSize: this.fontSize(8),
               zlevel: 3,
               lineStyle: {
                 normal: {
@@ -172,7 +183,7 @@ export default {
               smooth: false,
               showSymbol: true,
               symbol: "circle",
-              symbolSize: 8,
+              symbolSize: this.fontSize(8),
               zlevel: 3,
               lineStyle: {
                 normal: {

 <template>
-  <Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart>
+  <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart>
 </template>
 <script>
 import Echart from '@/common/echart'
@@ -23,7 +23,7 @@ export default {
       handler (newData) {
         console.log("newData",newData);
         this.options = {
-         grid: {
+           grid: {
             right:"1%",
             bottom:"4%"
           },
@@ -49,7 +49,7 @@ export default {
             {
               name: "业务量",
               type: "pie",
-              radius: [0,100],
+              radius: [20,100],
               roseType: "area",
               data: newData.seriesData
             }
@@ -67,7 +67,7 @@ export default {
 
 <style lang="scss" scoped>
 #centreLeft1Chart {
-  margin-bottom: 10px;
-  margin-left: 60px;
+  margin-bottom: .0521rem;
+  margin-left:60px;
 }
 </style>

@@ -20,10 +20,14 @@ export default {
   },
   mounted () {
     this.getdjywltotal();
+     window.addEventListener("resize", () => {
+      this.getdjywltotal();
+    });
   },
   methods: {
     // 获取登记业务量玫瑰图数据
    async getdjywltotal () {
+     this.cdata.seriesData=[]
         try {
           let p = {
             DJLX: "",

@@ -5,10 +5,10 @@
 <template>
   <div class='result'>
     <p>响应xml</p>
-    <el-input type="textarea" :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
+    <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
     </el-input>
     <p>错误信息</p>
-    <el-input type="textarea" :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
+    <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
     </el-input>
   </div>
 </template>
@@ -57,5 +57,4 @@ export default {
   }
 
 }
-
 </style>

@@ -100,7 +100,7 @@
       <div v-if="titleName == 'xyjg'">
         <Xyjg :form-data='dataReport'></Xyjg>
       </div>
-      <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" />
+      <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" />
     </div>
   </el-dialog>
 </template>

 <template>
-  <el-input type="textarea" :rows="6" placeholder="配置参数" v-model="resultInfo">
+  <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
   </el-input>
 </template>
 <script>

@@ -59,7 +59,7 @@ let mixin = {
       }
       this.$refs.editLog.isShow(row);
     },
-    // // 重置表单
+    // 重置表单
     resetForm () {
       if (!this.form) return
       Object.keys(this.form).forEach((key) => {

@@ -10,7 +10,8 @@
         }
 
         .el-table__row .cell {
-            color: #CEF8FF !important;
+            color: #8DEAF9 !important;
+            font-weight: 100 !important;
         }
 
         .el-table__row {
@@ -62,6 +63,7 @@
         /deep/.el-input__inner {
             background: #07388B;
             border-radius: 2px;
+            color: #CEF8FF;
             border: 1px solid #6BC1FC;
         }
     }

@@ -23,7 +23,6 @@ export default {
       this.queryClick()
     },
     handleCurrentChange (val) {
-      console.log(val, '222222222');
       this.pageData.currentPage = val
       if (this.queryClick) {
         this.queryClick()
@@ -33,6 +32,16 @@ export default {
       let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)
       let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage
       this.pageData.currentPage = currentPage < 1 ? 1 : currentPage
+    },
+    // 重置表单
+    resetForm () {
+      if (!this.form) return
+      Object.keys(this.form).forEach((key) => {
+        if (key !== 'currentPage') this.form[key] = '';
+      })
+      this.form.currentPage = 1
+      this.tableData.data = []
+      this.queryClick()
     }
   }
 }

 import { Message } from "element-ui";
 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
+  debugger
   if (!treeList || !treeList.length) {
     return
   }

@@ -6,7 +6,7 @@
           <Breadcrumb />
         </el-form-item>
         <el-row>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="行政区" label-width="80px">
               <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
                 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -14,7 +14,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="权属状态">
               <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态">
                 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -22,29 +22,24 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="5">
-            <el-form-item label="坐落">
-              <el-input v-model="form.ZL" placeholder="坐落"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="不动产权证号">
               <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="抵押人" label-width="80px">
               <el-input v-model="form.dyr" placeholder="抵押人"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row class="mt-10">
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="不动产单元号">
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="抵押不动产类型">
               <el-select v-model="form.dybdclx" class="width100" clearable placeholder="抵押不动产类型">
                 <el-option v-for="item in dicData['A27']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -52,7 +47,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="登记类型">
               <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型">
                 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -61,7 +56,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="9" class="btnColRight">
+          <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSubmit">查询</btn>
           </el-col>

@@ -32,12 +32,12 @@
               <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="权利人">
               <el-input v-model="form.QLR" placeholder="权利人"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="mt-10">
+          <el-col :span="6">
             <el-form-item label="权利类型" label-width="105px">
               <el-select v-model="form.QLLX" class="width100" clearable placeholder="权利类型">
                 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
@@ -50,7 +50,7 @@
               <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="btnColRight mt-10">
+          <el-col :span="18" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="handleSubmit">查询</btn>
           </el-col>

@@ -103,7 +103,7 @@ export default {
     height: 33%;
     background: url("~@/image/djywl.png") no-repeat;
     background-size: 100% 100%;
-    padding: .2825rem 0 0 0;
+    padding: .3825rem 0 0 0;
   }
 
   .card3 {

@@ -49,6 +49,7 @@ export default {
   margin: auto;
   display: flex;
   justify-content: space-between;
+  margin-top: 15px;
 
 }
   // #box{

@@ -178,7 +178,7 @@ export default {
             type: "index",
             width: "50",
             index: this.indexMethod,
-          },
+          }
         ]
           .concat(data.columns())
           .concat([
@@ -224,9 +224,10 @@ export default {
       getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
         (res) => {
           if (res.code === 200) {
-            let { total, records } = res.result;
+            let { total, records, current } = res.result;
             this.tableData.total = total;
             this.tableData.data = records ? records : [];
+            this.pageData.current = current
           }
         }
       )
@@ -234,11 +235,11 @@ export default {
     // 重置
     resetForm () {
       this.$refs.ruleForm.resetFields();
-      this.pageData.currentPage = 1
+      this.form.currentPage = 1
       this.queryClick();
     },
     featchData () {
-      this.pageData.currentPage = 1
+      this.form.currentPage = 1
       this.queryClick();
     },
     // 结果

@@ -6,18 +6,6 @@ class data {
   columns () {
     return [
       {
-        label: '序号',
-        type: 'index',
-        width: '50',
-        render: (h, scope) => {
-          return (
-            <div>
-              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
-            </div>
-          )
-        }
-      },
-      {
         prop: "AREANAME",
         label: "区域名称",
       },

@@ -9,9 +9,9 @@
         </el-form-item>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="行政区">              
-               <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
-                  <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+            <el-form-item label="行政区">
+              <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
+                <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -39,9 +39,9 @@
     <!-- 列表区域 -->
     <div class="from-clues-content">
       <!-- table组件 -->
-      <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 ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
+        @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
+        :data="tableData.data">
       </lb-table>
     </div>
   </div>
@@ -51,14 +51,14 @@
 // 引入列表数据
 import { datas, sendThis } from "./data"
 // 引入表格混入方法
-import table from "@/utils/mixin/table"
+import tableMixin from "@/mixins/tableMixin.js";
 import { getRecordLogPage } from "@/api/recordLog.js";
 import { mapGetters } from 'vuex'
 //引入日期处理方法
 import {timeFormat } from "@/utils/operation";
 export default {
   name: "dbrzcx",
-  mixins: [table],
+  mixins: [tableMixin],
   computed: {
     ...mapGetters(['dicData'])
   },
@@ -83,13 +83,21 @@ export default {
       // 表单
       form: {
         areacode: '',
-        startTime: null,
-        endTime: null,
+        startTime: '',
+        endTime: '',
       },
       // table数据
       tableData: {
         // 表头
-        columns: datas.columns(),
+        columns: [
+          {
+            label: "序号",
+            type: "index",
+            width: "50",
+            index: this.indexMethod,
+          }
+        ]
+          .concat(datas.columns()),
         // 列表
         data: [],
         total: 0,
@@ -104,19 +112,25 @@ export default {
     endTimeChange(val){
       this.form.endTime = timeFormat(new Date(val),true)
     },
-    // 重置表单
-    resetForm () {
-      this.$refs.ruleForm.resetFields();
-    },
     queryClick () {
       getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
         if (res.code === 200) {
-          let { records, total } = res.result
+          let { records, total, current } = res.result
           this.tableData.data = records ? records : []
           this.tableData.total = total ? total : 0
+          this.pageData.current = current
         }
       })
-    }
+    },
+    // 重置
+    resetForm () {
+      this.$refs.ruleForm.resetFields();
+      this.form.currentPage = 1
+      this.queryClick();
+    },
+    featchData () {
+      this.queryClick();
+    },
   }
 }
 </script>

@@ -33,7 +33,7 @@
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
               <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
-                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -71,7 +71,7 @@
     </div>
     <!-- 列表 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.pageSize" :current-page.sync="pageData.currentPage" :total="tableData.total"
+      <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">
       </lb-table>
@@ -86,7 +86,7 @@
 // 引入表头数据
 import { datas, sendThis } from "./data";
 // 引入表格混入方法
-import table from "@/utils/mixin/table";
+import tableMixin from "@/mixins/tableMixin.js";
 // 引入详情弹框
 import dataDetails from "@/components/EditDialog";
 import { getDataReportPage } from "@/api/dataReport.js";
@@ -94,7 +94,7 @@ import { getDataReportPage } from "@/api/dataReport.js";
 import {timeFormat } from "@/utils/operation";
 export default {
   name: "sbbwcx",
-  mixins: [table],
+  mixins: [tableMixin],
   // 注册组件
   components: {
     dataDetails,
@@ -131,6 +131,12 @@ export default {
         rkjg: "", //入库结果
         currentPage: 1,
       },
+      // 分页
+      pageData: {
+        total: 0,
+        pageSize: 10,
+        current: 1
+      },
       // table数据
       tableData: {
         // 表头数据
@@ -156,7 +162,7 @@ export default {
           },
         ]),
         total: 0,
-        data: [{}],
+        data: [],
       },
       title: "",
     };
@@ -169,21 +175,20 @@ export default {
     endTimeChange(val){
       this.form.exchangeEndTime = timeFormat(new Date(val),true)
     },
-    // 重置表单
-    resetForm () {
-      this.$refs.ruleForm.resetFields();
-      this.form.exchangeEndTime = ""
-    },
     // 初始化数据
     queryClick () {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
         if (res.code === 200) {
-          let { total, records } = res.result;
+          let { total, records, current } = res.result;
           this.tableData.total = total;
           this.tableData.data = records ? records : [];
+          this.pageData.current = current
         }
       });
     },
+    featchData () {
+      this.queryClick();
+    },
     // 多选
     handleSelectionChange (val) { },
     // 上报
@@ -193,6 +198,13 @@ export default {
       this.title = row.rectypeName;
       this.$refs.editLog.isShow(row);
     },
+    // 重置
+    resetForm () {
+      this.$refs.ruleForm.resetFields();
+      this.form.exchangeEndTime = ""
+      this.form.currentPage = 1
+      this.queryClick();
+    },
   },
 };
 </script>

@@ -290,7 +290,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          removeTreeListItem(this.tableData, row.dictid);
+          removeTreeListItem(this.tableData, row.dictid, 'dictid');
           this.$message({
             type: "success",
             message: "删除成功!",
@@ -358,7 +358,7 @@ export default {
     },
     // 上移下移
     moveUpward (index, row) {
-      console.log("row上移",row);
+      console.log("row上移", row);
 
       realMove(row.dictid, "UP", this.tableData);
       let id = findParents(this.tableData, row.dictid);
@@ -366,7 +366,7 @@ export default {
       this.key++;
     },
     moveDown (index, row) {
-      console.log("row下移",row);
+      console.log("row下移", row);
       realMove(row.dictid, "DOWN", this.tableData);
       let id = findParents(this.tableData, row.dictid);
       this.keyList = id;