From 1910b6dd5a45e33b4e54cebf6f130e123296b0e6 Mon Sep 17 00:00:00 2001
From: hanyuxia <hanyuxia@geedgenetworks.com>
Date: Fri, 22 Mar 2024 18:14:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20element=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=90=8E=E6=8A=A5=E5=91=8A=E6=96=B0=E5=A2=9E=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=EF=BC=88Input=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=EF=BC=9BTime=20Limit=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=AA=8C=E8=AF=81=E4=BB=A3=E7=A0=81=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=EF=BC=9Bprovider=E6=A0=B7=E5=BC=8F=E6=9C=AA=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/rightBox/report/reportBox.scss |  3 ++
 src/components/rightBox/report/ReportBox.vue  | 53 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/assets/css/components/components/rightBox/report/reportBox.scss b/src/assets/css/components/components/rightBox/report/reportBox.scss
index d7961f2b..a369c36b 100644
--- a/src/assets/css/components/components/rightBox/report/reportBox.scss
+++ b/src/assets/css/components/components/rightBox/report/reportBox.scss
@@ -142,6 +142,9 @@
     //  border: 1px solid #dcdfe6;
     //  border-radius: 2px 0 0 2px;
     //}
+    .el-select__prefix {
+      line-height:30px;
+    }
     .el-select__prefix, .el-input__prefix {
       left: 0;
       background-color: #f5f7fa;
diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue
index c5fe7036..c2c459aa 100644
--- a/src/components/rightBox/report/ReportBox.vue
+++ b/src/components/rightBox/report/ReportBox.vue
@@ -43,10 +43,10 @@
               </el-select>
             </template>
             <div v-else-if="editObject.config.timeConfig.type === 'last' || editObject.config.timeConfig.type === 'previous'" style="display: flex;">
-              <el-input v-model.number="editObject.config.timeConfig.offset" size="small" class="el-input-single" placeholder=" ">
+              <el-input-number v-model.number="editObject.config.timeConfig.offset" size="small" class="el-input-single" placeholder=" ">
                 <template #prepend><i @click="timeOffsetHandle('m')" class="cn-icon cn-icon-a-"></i></template>
                 <template #append><i @click="timeOffsetHandle('p')" class="cn-icon cn-icon-a-1"></i></template>
-              </el-input>
+              </el-input-number>
               <el-select id="reportBoxTimeUnitSelect"
                          v-model="editObject.config.timeConfig.unit"
                          class="right-box__select right-box__select-single"
@@ -107,14 +107,14 @@
             </div>
             <div class="enable-tabs-daily" v-if="scheduleType === scheduleTypeList[0].value">
               <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-              <el-input v-model.number="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
+              <el-input-number v-model.number="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
                 <template #append>{{$t('report.day')}}</template>
-              </el-input>
+              </el-input-number>
             </div>
             <div class="enable-tabs-weekly" v-else-if="scheduleType === scheduleTypeList[1].value">
               <!-- 每隔几周暂时隐藏 -->
               <!-- <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-              <el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder="Please input">
+              <el-input-number v-model="editObject.config.schedulerConfig.interval" size="small" placeholder="Please input">
                 <template #append>{{$t('report.week')}}</template>
               </el-input>-->
               <el-checkbox-group v-model="editObject.config.schedulerConfig.weekDates" style="margin-top: 0.3125rem">
@@ -132,9 +132,9 @@
                 <!-- 自定义月，循环 -->
                 <template v-if="monthIsCycle">
                   <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
-                  <el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
+                  <el-input-number v-model="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
                     <template #append>{{$t('report.month')}}</template>
-                  </el-input>
+                  </el-input-number>
                 </template>
                 <!-- 自定义月，非循环 -->
                 <template v-else>
@@ -229,13 +229,13 @@
           </el-form-item>
           <!-- 参数 -->
           <el-form-item :label="$t('config.operationlog.params')" prop="categoryParams" v-if="editObject.categoryParams && editObject.categoryParams.length > 0">
-<!--            <el-input v-model="param.value" placeholder=" " v-for="(param, index) in editObject.categoryParams" :key="index" size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
+<!--            <el-input-number v-model="param.value" placeholder=" " v-for="(param, index) in editObject.categoryParams" :key="index" size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
               <template #prepend>{{param.key}}</template>
-            </el-input>-->
+            </el-input-number>-->
             <template v-for="(param, index) in editObject.categoryParams" :key="index">
-              <el-input v-if="param.labelType === 'input'" v-model="param.value" placeholder=" " size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
+              <el-input-number v-if="param.labelType === 'input'" v-model="param.value" placeholder=" " size="small" style="vertical-align: unset;" :disabled="!!editObject.id">
                 <template #prepend>{{param.key}}</template>
-              </el-input>
+              </el-input-number>
               <el-select v-model="param.value"
                          v-else
                          class="right-box__select right-box__select--param"
@@ -332,7 +332,7 @@ export default {
     }
     const startTimeValidator = (rule, value, callback) => {
       const form = proxy.$refs.reportForm
-      if (form.model.config.endTime) {
+      if (form.model && form.model.config && form.model.config.endTime) {
         form.validateField('config.endTime', () => null)
       }
       callback()
@@ -414,14 +414,7 @@ export default {
     scheduleChecked (n) {
       this.editObject.config.isScheduler = n ? 1 : 0
       this.cleanScheduleConfig()
-      this.$nextTick(() => {
-        let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
-        if(datePrefixIcon && datePrefixIcon.length > 0) {
-          Array.prototype.forEach.call(datePrefixIcon, function (element) {
-            element.innerHTML = '<i class="el-input__icon cn-icon cn-icon-shijian"></i>'
-          })
-        }
-      })
+      this.initDateCalendarPreIcon()
     },
     monthScheduleType (n) {
       this.cleanScheduleConfig()
@@ -530,16 +523,19 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
-      if(datePrefixIcon && datePrefixIcon.length > 0) {
-        Array.prototype.forEach.call(datePrefixIcon, function (element) {
-          element.innerHTML = '<i class="el-input__icon cn-icon cn-icon-shijian"></i>'
-        })
-      }
-    })
+    this.initDateCalendarPreIcon()
   },
   methods: {
+    initDateCalendarPreIcon() {
+      this.$nextTick(() => {
+        let datePrefixIcon = document.getElementsByClassName('el-input__prefix-inner')
+        if(datePrefixIcon && datePrefixIcon.length > 0) {
+          Array.prototype.forEach.call(datePrefixIcon, function (element) {
+            element.innerHTML = '<i class="el-input__icon cn-icon cn-icon-shijian"></i>'
+          })
+        }
+      })
+    },
     loadParamOptions () {
       if (_.isArray(this.editObject.categoryParams) && !_.isEmpty(this.editObject.categoryParams)) {
         this.editObject.categoryParams.forEach(param => {
@@ -587,6 +583,7 @@ export default {
       if (val === 'customize') {
         this.scheduleChecked = false
       }
+      this.initDateCalendarPreIcon()
     },
     scheduleTypeChange (val) {
       this.scheduleType = val