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

@@ -56,12 +56,15 @@ export default {
 
 <style lang="scss" scoped>
 .breadcrumb {
-  box-sizing: border-box;
+  width: 80%;
   text-indent: 10px;
-  background: linear-gradient(90deg, #0047B8 0%, rgba(0, 26, 95, 0.1) 100%);
+  background: url("~@/image/breadcrumb.png") no-repeat;
+  background-size: 100% 100%;
   line-height: 32px;
-  color: #FFFFFF;
-  margin-bottom: 8px;
+  height: 32px;
+  padding-left: 35px;
+  margin: 8px 0 8px 6px;
+  color: #CEF8FF;
 }
 
 /deep/.el-icon-arrow-right {
@@ -73,7 +76,7 @@ export default {
 }
 
 /deep/.el-breadcrumb__inner {
-  color: #FFFFFF !important;
+  color: #CEF8FF !important;
 }
 
 .breadcrumb1366 {

@@ -175,7 +175,7 @@ export default {
         clearInterval(this.intervalId);
       }
       this.intervalId = setInterval(() => {
-        _self.reSelectMapRandomArea();
+        this.$refs.centreLeft2ChartRef && _self.reSelectMapRandomArea();
       }, time);
     },
     // 重新随机选中地图区域

@@ -27,22 +27,7 @@ export default {
   watch: {
     cdata: {
       handler(newData) {
-        let pieColors = ["#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de"];
-        let richColor = {};
-        pieColors.forEach((item, idx) => {
-          richColor[`color${idx}`] = {
-            fontSize: 10,
-            color: item,
-          };
-        });
 
-        let chartData = [
-          { value: 1048, name: "Search Engine" },
-          { value: 735, name: "Direct" },
-          { value: 580, name: "Email" },
-          { value: 484, name: "Union Ads" },
-          { value: 300, name: "Video Ads" },
-        ];
         this.options = {
           color: [
             "#37a2da",
@@ -64,9 +49,8 @@ export default {
               label: {
                 formatter: (params) => {
                   // console.log(params)
-                  return `{color${params.dataIndex}|${params.name}(${params.value})}`;
+                  return `${params.name}(${params.value}`;
                 },
-                rich: richColor,
               },
               labelLine: {
                 lineStyle: {

@@ -17,11 +17,11 @@
             <span>业务报文ID：</span>
             <p>{{ dataReport.BizMsgId }}</p>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="6">
             <span>接入报文ID：</span>
             <p>{{ dataReport.ASID }}</p>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <span>行政区划编码：</span>
             <p>{{ dataReport.AreaCode }}</p>
           </el-col>
@@ -35,13 +35,13 @@
             <span>业务编码：</span>
             <p>{{ dataReport.RecType }}</p>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="6">
             <span>权利类型：</span>
-            <p>{{ dataReport.RightType }}</p>
+            <p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="6">
             <span>登记类型：</span>
-            <p>{{ dataReport.RegType }}</p>
+            <p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p>
           </el-col>
           <el-col :span="7">
             <span>不动产权证书数量：</span>
@@ -53,13 +53,13 @@
             <span>创建时间：</span>
             <p>{{ dataReport.createDate }}</p>
           </el-col>
-          <el-col :span="7">
+          <el-col :span="6">
             <span>业务流水号：</span>
             <p>{{ dataReport.RecFlowID }}</p>
           </el-col>
-          <el-col :span="5">
-            <span>登记机构：</span>
-            <p>{{ dataReport.RegOrgID }}</p>
+          <el-col :span="6">
+            <span>宗地/宗海代码：</span>
+            <p>{{ dataReport.ParcelID }}</p>
           </el-col>
           <el-col :span="7">
             <span>证明数量：</span>
@@ -67,15 +67,15 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="5">
-            <span>宗地/宗海代码：</span>
-            <p>{{ dataReport.ParcelID }}</p>
-          </el-col>
-          <el-col :span="7">
+          <el-col :span="6">
             <span>不动产单元号：</span>
             <p>{{ dataReport.EstateNum }}</p>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
+            <span>登记机构：</span>
+            <p>{{ dataReport.RegOrgID }}</p>
+          </el-col>
+          <el-col :span="11">
             <span>上次不动产权证号/不动产登记证明：</span>
             <p>{{ dataReport.PreCertID }}</p>
           </el-col>
@@ -127,6 +127,7 @@ export default {
       default: false
     }
   },
+
   computed: {
     ...mapGetters(["dicData"]),
   },
@@ -168,6 +169,18 @@ export default {
     };
   },
   methods: {
+    dicStatus (val, code) {
+      let data = this.dicData[code],
+        name = ''
+      if (data) {
+        data.map((item) => {
+          if (item.DCODE == val) {
+            name = item.DNAME
+          }
+        })
+        return name
+      }
+    },
     handleTitleTab (val) {
       console.log(val);
     },

@@ -64,7 +64,6 @@ export default {
       this.visible = show
     },
     handleClick(tab, event) {
-      console.log(tab, event)
     },
     changeData(iconName) {
       this.visible = false

@@ -18,10 +18,8 @@ export default {
   },
   methods: {
     onJsonChange (value) {
-      console.log('value:', value);
     },
     onJsonSave (value) {
-      console.log('value:', value);
     }
   }
 }

@@ -69,7 +69,6 @@ export default {
     },
     onJsonSave () {
       const value = this.resultInfo
-      console.log(this.resultInfo, 'resultInfo')
       if (this.hasJsonFlag === false) {
         this.$message.error({ message: 'json格式验证失败', showClose: true })
         // alert("json验证失败")
@@ -87,7 +86,6 @@ export default {
       this.dialogVisible = true
     },
     cancel () {
-      console.log(this.tmpResultInfo, 'tmpResultInfo')
       this.resultInfo = this.tmpResultInfo
       this.dialogVisible = false
     },

@@ -39,7 +39,7 @@
 
     <br>
     <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
-      :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange"
+      layout="total,  prev, pager, next" @current-change="paginationCurrentChange"
       :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
     </el-pagination>
   </div>

@@ -32,8 +32,6 @@ export default {
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
-
       const $message = this.$message({
         message: '  Compiling the theme',
         customClass: 'theme-message',

@@ -46,7 +46,6 @@ export default {
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
-      console.log(this.levelList)
     },
     isDashboard (route) {
       const name = route && route.name

@@ -28,6 +28,16 @@ let mixin = {
       this.formData.pageSize = val
       this.featchData()
     },
+    handleSearch () {
+      this.form.currentPage = 1
+      this.tableData.data = []
+      if (this.featchData) {
+        this.featchData()
+      }
+      if (this.queryClick) {
+        this.queryClick()
+      }
+    },
     handleCurrentChange (val) {
       this.form.currentPage = val
       this.featchData()

@@ -348,6 +348,11 @@ aside {
   position: relative;
 }
 
+.fail {
+  color: #F56C6C;
+  position: relative;
+}
+
 
 .adopt::before {
   position: absolute;

@@ -50,7 +50,7 @@
 
     &-header {
         width: 100%;
-        padding: 5px 30px 20px 20px;
+        padding: 5px 30px 20px 24px;
         box-sizing: border-box;
         background: url("~@/image/formHeader.png") no-repeat;
         background-size: 100% 100%;
@@ -110,7 +110,7 @@
         margin-top: 15px;
         background: url("~@/image/formContent.png") no-repeat;
         background-size: 100% 100%;
-        padding: 20px 30px 20px 30px;
+        padding: 22px 42px 20px;
         //修改表头的背景颜色横向渐变色
         @extend .tableClass;
 

@@ -68,7 +68,7 @@
 
           <el-col :span="4" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -58,7 +58,7 @@
 
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -63,7 +63,7 @@
           <el-col :span="4" class="btnColRight">
             <el-form-item>
               <btn nativeType="cz" @click="resetForm">重置</btn>
-              <btn nativeType="cx" @click="handleSubmit">查询</btn>
+              <btn nativeType="cx" @click="handleSearch">查询</btn>
             </el-form-item>
           </el-col>
         </el-row>

@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -27,7 +27,7 @@
           </el-col>
           <el-col :span="9" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="12" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -47,7 +47,7 @@
           </el-col>
           <el-col :span="12" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
 

@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -49,7 +49,7 @@
           </el-col>
           <el-col :span="12" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -48,7 +48,7 @@
           </el-col>
           <el-col :span="19" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

@@ -52,7 +52,7 @@
           </el-col>
           <el-col :span="18" class="btnColRight mt-10">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>

+<template>
+  <div
+    class="ScaleBox"
+    ref="ScaleBox"
+    :style="{
+      width: width + 'px',
+      height: height + 'px',
+    }"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ScaleBox",
+  props: {},
+  data() {
+    return {
+      scale: 0,
+      width: 1920,
+      height: 1080,
+    };
+  },
+  mounted() {
+    this.setScale();
+    window.addEventListener("resize", this.debounce(this.setScale));
+  },
+  methods: {
+    getScale() {
+      // 固定好16：9的宽高比，计算出最合适的缩放比
+      const { width, height } = this;
+      const wh = window.innerHeight / height;
+      const ww = window.innerWidth / width;
+      return ww < wh ? ww : wh;
+    },
+    setScale() {
+      // 获取到缩放比例，设置它
+      this.scale = this.getScale();
+      if (this.$refs.ScaleBox) {
+        this.$refs.ScaleBox.style.setProperty("--scale", this.scale);
+      }
+    },
+    debounce(fn, delay) {
+      const delays = delay || 500;
+      let timer;
+      return function () {
+        const th = this;
+        const args = arguments;
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = setTimeout(function () {
+          timer = null;
+          fn.apply(th, args);
+        }, delays);
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+#ScaleBox {
+  --scale: 1;
+}
+.ScaleBox {
+  position: absolute;
+  transform: scale(var(--scale)) translate(-50%, -50%);
+  display: flex;
+  flex-direction: column;
+  transform-origin: 0 0;
+  left: 50%;
+  top: 50%;
+  transition: 0.1s;
+  z-index: 999;
+  // background: rgba(255, 0, 0, 0.3);
+}
+</style>

@@ -3,8 +3,8 @@
     <div class="card1 cardCon d-center">
       <div class="cardhead">新建国有房屋信息</div>
       <div class="cardcontent" style="margin-top: .3646rem">
-        <dv-scroll-board v-if="config.data.length>0" :config="config" class="board" />
-         <div v-else="config.data.length==0" class="nodata">暂无数据</div>
+        <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 class="card2 cardCon mt-10">
@@ -31,7 +31,7 @@ export default {
         evenRowBGC: '#154295',
         header: ['序号', '用途', '性质', '面积'],
         data: [],
-        key:0
+        key: 0
       }
     }
   },
@@ -40,18 +40,17 @@ export default {
     this.addhousetotal();
     // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
   },
-   methods: {
+  methods: {
     async addhousetotal () {
       try {
-        let {result:res}= await work.addhousetotal();
-        res.map((item,index) => {
+        let { result: res } = await work.addhousetotal();
+        res.map((item, index) => {
           return (
-            this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
+            this.config.data.push([index, item.fwyt, item.fwxz, item.mj])
           )
-
         });
       } catch (error) {
-        console.log("error",error);
+        console.log("error", error);
       }
     }
   }
@@ -85,12 +84,13 @@ export default {
     height: 100%;
     display: -webkit-box;
     overflow: hidden;
-    .nodata{
- font-size: .1042rem;
- color: #02D9FD;
- font-weight: bold;
- margin:auto;
- margin-top: 120px;
+
+    .nodata {
+      font-size: .1042rem;
+      color: #02D9FD;
+      font-weight: bold;
+      margin: auto;
+      margin-top: 120px;
     }
   }
 
@@ -102,7 +102,7 @@ export default {
   }
 
   .card1 {
-     height: 33%;
+    height: 33%;
     background: url("~@/image/xjgyfwxx.png") no-repeat;
     background-size: 100% 100%;
 
@@ -136,6 +136,7 @@ export default {
     background: url("~@/image/djlxzl.png") no-repeat;
     background-size: 100% 100%;
     padding-bottom: 0;
+
     .cardhead {
       top: .0417rem;
     }

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

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

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

@@ -37,8 +37,8 @@
         </el-row>
         <el-row class="mt-10">
           <el-col :span="6">
-            <el-form-item label="业务号流水号" prop="ywh">
-              <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务号流水号"></el-input>
+            <el-form-item label="业务流水号" prop="ywh">
+              <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务流水号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -80,7 +80,7 @@
           <el-col :span="6" class="btnColRight">
             <el-form-item>
               <btn nativeType="cz" @click="resetForm">重置</btn>
-              <btn nativeType="cx" @click="featchData">查询</btn>
+              <btn nativeType="cx" @click="handleSearch">查询</btn>
               <btn nativeType="cx">存量导入</btn>
             </el-form-item>
           </el-col>

@@ -32,7 +32,7 @@
           <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="queryClick">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -120,8 +120,8 @@ export default {
     endTimeChange (val) {
       this.form.endTime = timeFormat(new Date(val), true)
     },
-    queryClick () {
-      getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
+    featchData () {
+      getRecordLogPage({ ...this.form }).then(res => {
         if (res.code === 200) {
           let { records, total, current } = res.result
           this.tableData.data = records ? records : []
@@ -134,11 +134,8 @@ export default {
     resetForm () {
       this.$refs.ruleForm.resetFields();
       this.form.currentPage = 1
-      this.queryClick();
-    },
-    featchData () {
-      this.queryClick();
-    },
+      this.featchData();
+    }
   }
 }
 </script>

@@ -11,13 +11,13 @@ class data extends filter {
     return [
       {
         label: '汇交状态',
-        width: '110',
+        width: '130',
         render: (h, scope) => {
           return (
             <div>
               <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
               <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
-              <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span>
+              <span v-show={scope.row.exchangeState == 2} class='fail'>上报响应失败</span>
               <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span>
             </div>
           )
@@ -62,7 +62,7 @@ class data extends filter {
         label: "业务名称",
       },
       {
-        prop: "uploadtime",
+        prop: "exchangeDate",
         label: "汇交时间",
         width: 140,
       }

@@ -12,4 +12,7 @@
 .zhi {
   color: #FFFFFF;
   text-align: center;
+}
+.hjsj {
+  
 }
\ No newline at end of file

@@ -18,7 +18,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="汇交时间" prop="exchangeStartTime">
-              <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
+              <el-date-picker type="date" class="width100 hjsj" placeholder="开始日期" clearable
                 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
                 value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
@@ -41,8 +41,8 @@
         </el-row>
         <el-row class="mt-10">
           <el-col :span="6">
-            <el-form-item label="业务号流水号" prop="ywh">
-              <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务号流水号"></el-input>
+            <el-form-item label="业务流水号" prop="ywh">
+              <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务流水号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -64,7 +64,7 @@
           <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
-            <btn nativeType="cx" @click="queryClick">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -185,8 +185,8 @@ export default {
       this.form.exchangeEndTime = timeFormat(new Date(val), true)
     },
     // 初始化数据
-    queryClick () {
-      getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
+    featchData () {
+      getDataReportPage({ ...this.form }).then((res) => {
         if (res.code === 200) {
           let { total, records, current } = res.result;
           this.tableData.total = total;
@@ -195,11 +195,6 @@ export default {
         }
       });
     },
-    featchData () {
-      this.queryClick();
-    },
-    // 多选
-    handleSelectionChange (val) { },
     // 上报
     handleEscalation () { },
     // 详情
@@ -212,7 +207,7 @@ export default {
       this.$refs.ruleForm.resetFields();
       this.form.exchangeEndTime = ""
       this.form.currentPage = 1
-      this.queryClick();
+      this.featchData();
     },
   },
 };

@@ -343,7 +343,6 @@ export default {
     },
     // 上移下移
     moveUpward (index, row) {
-
       realMove(row.dictid, "UP", this.tableData);
       let id = findParents(this.tableData, row.dictid);
       this.keyList = id;

@@ -19,8 +19,7 @@
           </el-col>
           <!-- 操作按钮 -->
           <el-col :span="12" class="btnColRight">
-
-            <btn nativeType="cx" @click="queryClick">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleRefresh">刷新缓存</btn>
           </el-col>
         </el-row>
@@ -83,12 +82,16 @@ export default {
     // 初始化数据
     queryClick () {
       getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => {
-        // this.$endLoading();
         let { records, total } = res.result
         this.tableData.data = records ? records : []
         this.tableData.total = total ? total : 0
       })
     },
+    handleSearch () {
+      this.pageData.currentPage = 1
+      this.tableData.data = []
+      this.queryClick()
+    },
     handleRefresh () {
       this.$confirm('是否确认刷新', '提示', {
         confirmButtonText: '确定',

@@ -119,7 +119,6 @@ export default {
       // })
     },
     handleSelectionChange (val) {
-      console.log("vadddl",val);
       this.multipleSelection = val
     }
   }

@@ -12,7 +12,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="18" class="btnColRight">
-            <btn nativeType="cx" @click="handleSubmit">搜索</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
             <btn nativeType="cx" @click="handleAdd">新增</btn>
           </el-col>
         </el-row>
@@ -112,6 +112,11 @@ export default {
       this.taskData = null
       this.$refs.task.isShow()
     },
+    handleSearch () {
+      this.form.currentPage = 1
+      this.tableData.data = []
+      this.queryClick()
+    },
     async featchData () {
       try {
         this.form = Object.assign(this.form, this.formData)

@@ -25,7 +25,7 @@
           <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cx" @click="handleUpdateDic">刷新缓存</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="handleSearch">查询</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -134,6 +134,11 @@ export default {
         this.$refs.msg.messageShow();
       }
     },
+    handleSearch () {
+      this.form.currentPage = 1
+      this.tableData.data = []
+      this.featchData()
+    },
     async handleEdit (index, row) {
       try {
         let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB);