From 45f891e6f477faec6a8b50615e48f3186cdbd688 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Wed, 7 Jun 2023 11:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=99=E7=A0=81=E5=95=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Crontab/index.vue              | 78 ++++++-------------
 src/views/carddealer/carddealer/index.vue     |  4 +-
 .../data-view/components/data-view-echart.vue |  2 +-
 .../data-view/components/data-view-table.vue  |  2 +-
 src/views/merchant/merchant/index.vue         |  2 +-
 5 files changed, 30 insertions(+), 58 deletions(-)

diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue
index 3963df2..bf26384 100644
--- a/src/components/Crontab/index.vue
+++ b/src/components/Crontab/index.vue
@@ -2,66 +2,31 @@
   <div>
     <el-tabs type="border-card">
       <el-tab-pane label="秒" v-if="shouldHide('second')">
-        <CrontabSecond
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronsecond"
-        />
+        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronsecond" />
       </el-tab-pane>
 
       <el-tab-pane label="分钟" v-if="shouldHide('min')">
-        <CrontabMin
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmin"
-        />
+        <CrontabMin @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmin" />
       </el-tab-pane>
 
       <el-tab-pane label="小时" v-if="shouldHide('hour')">
-        <CrontabHour
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronhour"
-        />
+        <CrontabHour @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronhour" />
       </el-tab-pane>
 
       <el-tab-pane label="日" v-if="shouldHide('day')">
-        <CrontabDay
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronday"
-        />
+        <CrontabDay @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronday" />
       </el-tab-pane>
 
       <el-tab-pane label="月" v-if="shouldHide('month')">
-        <CrontabMonth
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmonth"
-        />
+        <CrontabMonth @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmonth" />
       </el-tab-pane>
 
       <el-tab-pane label="周" v-if="shouldHide('week')">
-        <CrontabWeek
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronweek"
-        />
+        <CrontabWeek @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronweek" />
       </el-tab-pane>
 
       <el-tab-pane label="年" v-if="shouldHide('year')">
-        <CrontabYear
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronyear"
-        />
+        <CrontabYear @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronyear" />
       </el-tab-pane>
     </el-tabs>
 
@@ -70,33 +35,33 @@
         <p class="title">时间表达式</p>
         <table>
           <thead>
-            <th v-for="item of tabTitles" width="40" :key="item">{{item}}</th>
+            <th v-for="item of tabTitles" width="40" :key="item">{{ item }}</th>
             <th>Cron 表达式</th>
           </thead>
           <tbody>
             <td>
-              <span>{{crontabValueObj.second}}</span>
+              <span>{{ crontabValueObj.second }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.min}}</span>
+              <span>{{ crontabValueObj.min }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.hour}}</span>
+              <span>{{ crontabValueObj.hour }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.day}}</span>
+              <span>{{ crontabValueObj.day }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.month}}</span>
+              <span>{{ crontabValueObj.month }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.week}}</span>
+              <span>{{ crontabValueObj.week }}</span>
             </td>
             <td>
-              <span>{{crontabValueObj.year}}</span>
+              <span>{{ crontabValueObj.year }}</span>
             </td>
             <td>
-              <span>{{crontabValueString}}</span>
+              <span>{{ crontabValueString }}</span>
             </td>
           </tbody>
         </table>
@@ -329,7 +294,7 @@ export default {
     },
   },
   computed: {
-    crontabValueString: function() {
+    crontabValueString: function () {
       let obj = this.crontabValueObj;
       let str =
         obj.second +
@@ -363,7 +328,7 @@ export default {
       // 隐藏部分组件
     },
   },
-  mounted: function() {
+  mounted: function () {
     this.resolveExp();
   },
 };
@@ -373,6 +338,7 @@ export default {
   text-align: center;
   margin-top: 20px;
 }
+
 .popup-main {
   position: relative;
   margin: 10px auto;
@@ -381,12 +347,14 @@ export default {
   font-size: 12px;
   overflow: hidden;
 }
+
 .popup-title {
   overflow: hidden;
   line-height: 34px;
   padding-top: 6px;
   background: #f2f2f2;
 }
+
 .popup-result {
   box-sizing: border-box;
   line-height: 24px;
@@ -395,6 +363,7 @@ export default {
   border: 1px solid #ccc;
   position: relative;
 }
+
 .popup-result .title {
   position: absolute;
   top: -28px;
@@ -406,11 +375,13 @@ export default {
   line-height: 30px;
   background: #fff;
 }
+
 .popup-result table {
   text-align: center;
   width: 100%;
   margin: 0 auto;
 }
+
 .popup-result table span {
   display: block;
   width: 100%;
@@ -421,6 +392,7 @@ export default {
   overflow: hidden;
   border: 1px solid #e8e8e8;
 }
+
 .popup-result-scroll {
   font-size: 12px;
   line-height: 24px;
diff --git a/src/views/carddealer/carddealer/index.vue b/src/views/carddealer/carddealer/index.vue
index 8e50c78..8fa5d23 100644
--- a/src/views/carddealer/carddealer/index.vue
+++ b/src/views/carddealer/carddealer/index.vue
@@ -195,8 +195,8 @@
           <el-input v-model="form.limitReceive" placeholder="请输入最大收款限额" style="width:300px" @input="change" />
         </el-form-item>
 
-        <el-form-item label="收款额度" prop="">
-          <el-input v-model="form.collectionLimit" placeholder="请输入收款额度" style="width:300px" @input="change" />
+        <el-form-item label="低于押金预警值" prop="">
+          <el-input v-model="form.collectionLimit" placeholder="请输入低于押金预警值" style="width:300px" @input="change" />
         </el-form-item>
 
         <el-form-item label="上级" prop="superiorId">
diff --git a/src/views/data-view/components/data-view-echart.vue b/src/views/data-view/components/data-view-echart.vue
index addba5b..faa7ab2 100644
--- a/src/views/data-view/components/data-view-echart.vue
+++ b/src/views/data-view/components/data-view-echart.vue
@@ -54,7 +54,7 @@ export default {
   },
   methods: {
     getOption() {
-      console.log("reseize")
+      // console.log("reseize")
       let percent = 0
       if (this.config.total === 0) {
         percent = 0
diff --git a/src/views/data-view/components/data-view-table.vue b/src/views/data-view/components/data-view-table.vue
index dfa92d0..89e1108 100644
--- a/src/views/data-view/components/data-view-table.vue
+++ b/src/views/data-view/components/data-view-table.vue
@@ -89,7 +89,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.getHeight())
+    // console.log(this.getHeight())
     window.addEventListener('resize', debounce(() => {
       this.$refs.tbody.style.height = `${this.getHeight()}px`
     }))
diff --git a/src/views/merchant/merchant/index.vue b/src/views/merchant/merchant/index.vue
index 9de105e..dee2eca 100644
--- a/src/views/merchant/merchant/index.vue
+++ b/src/views/merchant/merchant/index.vue
@@ -713,7 +713,7 @@ export default {
       this.id = row.id;
       payMerchant.getmd5Key(this.id).then((response) => {
         this.form.md5Key = response.data.md5Key;
-        console.log(this.form)
+        // console.log(this.form)
         // this.title = "重置MD5";
         // this.openMd5 = true;
       });