修正单词拼写错误

linzh

2021-09-05 b35f708c07dec9dc490548186df318d82c9ab595

修正单词拼写错误

 ruoyi-ui/src/components/Crontab/day.vue

@@ -75,7 +75,7 @@
            if (this.radioValue === 1) {

                this.$emit('update', 'day', '*', 'day');

                this.$emit('update', 'week', '?', 'day');

                this.$emit('update', 'mouth', '*', 'day');

                this.$emit('update', 'month', '*', 'day');
            } else {

                if (this.cron.hour === '*') {

                    this.$emit('update', 'hour', '0', 'day');


 ruoyi-ui/src/components/Crontab/index.vue

@@ -2,59 +2,59 @@
  <div>

    <el-tabs type="border-card">

      <el-tab-pane label="秒" v-if="shouldHide('second')">

        <CrontabSecond @update="updateContabValue" :check="checkNumber" ref="cronsecond" />

        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" />
      </el-tab-pane>



      <el-tab-pane label="分钟" v-if="shouldHide('min')">

        <CrontabMin

          @update="updateContabValue"

          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          :cron="crontabValueObj"
          ref="cronmin"

        />

      </el-tab-pane>



      <el-tab-pane label="小时" v-if="shouldHide('hour')">

        <CrontabHour

          @update="updateContabValue"

          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          :cron="crontabValueObj"
          ref="cronhour"

        />

      </el-tab-pane>



      <el-tab-pane label="日" v-if="shouldHide('day')">

        <CrontabDay

          @update="updateContabValue"

          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          :cron="crontabValueObj"
          ref="cronday"

        />

      </el-tab-pane>



      <el-tab-pane label="月" v-if="shouldHide('mouth')">

        <CrontabMouth

          @update="updateContabValue"

      <el-tab-pane label="月" v-if="shouldHide('month')">
        <CrontabMonth
          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          ref="cronmouth"

          :cron="crontabValueObj"
          ref="cronmonth"
        />

      </el-tab-pane>



      <el-tab-pane label="周" v-if="shouldHide('week')">

        <CrontabWeek

          @update="updateContabValue"

          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          :cron="crontabValueObj"
          ref="cronweek"

        />

      </el-tab-pane>



      <el-tab-pane label="年" v-if="shouldHide('year')">

        <CrontabYear

          @update="updateContabValue"

          @update="updateCrontabValue"
          :check="checkNumber"

          :cron="contabValueObj"

          :cron="crontabValueObj"
          ref="cronyear"

        />

      </el-tab-pane>

@@ -70,33 +70,33 @@
          </thead>

          <tbody>

            <td>

              <span>{{contabValueObj.second}}</span>

              <span>{{crontabValueObj.second}}</span>
            </td>

            <td>

              <span>{{contabValueObj.min}}</span>

              <span>{{crontabValueObj.min}}</span>
            </td>

            <td>

              <span>{{contabValueObj.hour}}</span>

              <span>{{crontabValueObj.hour}}</span>
            </td>

            <td>

              <span>{{contabValueObj.day}}</span>

              <span>{{crontabValueObj.day}}</span>
            </td>

            <td>

              <span>{{contabValueObj.mouth}}</span>

              <span>{{crontabValueObj.month}}</span>
            </td>

            <td>

              <span>{{contabValueObj.week}}</span>

              <span>{{crontabValueObj.week}}</span>
            </td>

            <td>

              <span>{{contabValueObj.year}}</span>

              <span>{{crontabValueObj.year}}</span>
            </td>

            <td>

              <span>{{contabValueString}}</span>

              <span>{{crontabValueString}}</span>
            </td>

          </tbody>

        </table>

      </div>

      <CrontabResult :ex="contabValueString"></CrontabResult>

      <CrontabResult :ex="crontabValueString"></CrontabResult>


      <div class="pop_btn">

        <el-button size="small" type="primary" @click="submitFill">确定</el-button>

@@ -112,7 +112,7 @@
import CrontabMin from "./min.vue";

import CrontabHour from "./hour.vue";

import CrontabDay from "./day.vue";

import CrontabMouth from "./mouth.vue";

import CrontabMonth from "./month.vue";
import CrontabWeek from "./week.vue";

import CrontabYear from "./year.vue";

import CrontabResult from "./result.vue";

@@ -123,12 +123,12 @@
      tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],

      tabActive: 0,

      myindex: 0,

      contabValueObj: {

      crontabValueObj: {
        second: "*",

        min: "*",

        hour: "*",

        day: "*",

        mouth: "*",

        month: "*",
        week: "?",

        year: "",

      },

@@ -152,11 +152,11 @@
            min: arr[1],

            hour: arr[2],

            day: arr[3],

            mouth: arr[4],

            month: arr[4],
            week: arr[5],

            year: arr[6] ? arr[6] : "",

          };

          this.contabValueObj = {

          this.crontabValueObj = {
            ...obj,

          };

          for (let i in obj) {

@@ -173,9 +173,9 @@
      this.tabActive = index;

    },

    // 由子组件触发，更改表达式组成的字段值

    updateContabValue(name, value, from) {

      "updateContabValue", name, value, from;

      this.contabValueObj[name] = value;

    updateCrontabValue(name, value, from) {
      "updateCrontabValue", name, value, from;
      this.crontabValueObj[name] = value;
      if (from && from !== name) {

        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);

        this.changeRadio(name, value);

@@ -183,108 +183,108 @@
    },

    //赋值到组件

    changeRadio(name, value) {

      let arr = ["second", "min", "hour", "mouth"],

      let arr = ["second", "min", "hour", "month"],
        refName = "cron" + name,

        insVlaue;

        insValue;


      if (!this.$refs[refName]) return;



      if (arr.includes(name)) {

        if (value === "*") {

          insVlaue = 1;

          insValue = 1;
        } else if (value.indexOf("-") > -1) {

          let indexArr = value.split("-");

          isNaN(indexArr[0])

            ? (this.$refs[refName].cycle01 = 0)

            : (this.$refs[refName].cycle01 = indexArr[0]);

          this.$refs[refName].cycle02 = indexArr[1];

          insVlaue = 2;

          insValue = 2;
        } else if (value.indexOf("/") > -1) {

          let indexArr = value.split("/");

          isNaN(indexArr[0])

            ? (this.$refs[refName].average01 = 0)

            : (this.$refs[refName].average01 = indexArr[0]);

          this.$refs[refName].average02 = indexArr[1];

          insVlaue = 3;

          insValue = 3;
        } else {

          insVlaue = 4;

          insValue = 4;
          this.$refs[refName].checkboxList = value.split(",");

        }

      } else if (name == "day") {

        if (value === "*") {

          insVlaue = 1;

          insValue = 1;
        } else if (value == "?") {

          insVlaue = 2;

          insValue = 2;
        } else if (value.indexOf("-") > -1) {

          let indexArr = value.split("-");

          isNaN(indexArr[0])

            ? (this.$refs[refName].cycle01 = 0)

            : (this.$refs[refName].cycle01 = indexArr[0]);

          this.$refs[refName].cycle02 = indexArr[1];

          insVlaue = 3;

          insValue = 3;
        } else if (value.indexOf("/") > -1) {

          let indexArr = value.split("/");

          isNaN(indexArr[0])

            ? (this.$refs[refName].average01 = 0)

            : (this.$refs[refName].average01 = indexArr[0]);

          this.$refs[refName].average02 = indexArr[1];

          insVlaue = 4;

          insValue = 4;
        } else if (value.indexOf("W") > -1) {

          let indexArr = value.split("W");

          isNaN(indexArr[0])

            ? (this.$refs[refName].workday = 0)

            : (this.$refs[refName].workday = indexArr[0]);

          insVlaue = 5;

          insValue = 5;
        } else if (value === "L") {

          insVlaue = 6;

          insValue = 6;
        } else {

          this.$refs[refName].checkboxList = value.split(",");

          insVlaue = 7;

          insValue = 7;
        }

      } else if (name == "week") {

        if (value === "*") {

          insVlaue = 1;

          insValue = 1;
        } else if (value == "?") {

          insVlaue = 2;

          insValue = 2;
        } else if (value.indexOf("-") > -1) {

          let indexArr = value.split("-");

          isNaN(indexArr[0])

            ? (this.$refs[refName].cycle01 = 0)

            : (this.$refs[refName].cycle01 = indexArr[0]);

          this.$refs[refName].cycle02 = indexArr[1];

          insVlaue = 3;

          insValue = 3;
        } else if (value.indexOf("#") > -1) {

          let indexArr = value.split("#");

          isNaN(indexArr[0])

            ? (this.$refs[refName].average01 = 1)

            : (this.$refs[refName].average01 = indexArr[0]);

          this.$refs[refName].average02 = indexArr[1];

          insVlaue = 4;

          insValue = 4;
        } else if (value.indexOf("L") > -1) {

          let indexArr = value.split("L");

          isNaN(indexArr[0])

            ? (this.$refs[refName].weekday = 1)

            : (this.$refs[refName].weekday = indexArr[0]);

          insVlaue = 5;

          insValue = 5;
        } else {

          this.$refs[refName].checkboxList = value.split(",");

          insVlaue = 7;

          insValue = 7;
        }

      } else if (name == "year") {

        if (value == "") {

          insVlaue = 1;

          insValue = 1;
        } else if (value == "*") {

          insVlaue = 2;

          insValue = 2;
        } else if (value.indexOf("-") > -1) {

          insVlaue = 3;

          insValue = 3;
        } else if (value.indexOf("/") > -1) {

          insVlaue = 4;

          insValue = 4;
        } else {

          this.$refs[refName].checkboxList = value.split(",");

          insVlaue = 5;

          insValue = 5;
        }

      }

      this.$refs[refName].radioValue = insVlaue;

      this.$refs[refName].radioValue = insValue;
    },

    // 表单选项的子组件校验数字格式（通过-props传递）

    checkNumber(value, minLimit, maxLimit) {

@@ -303,29 +303,29 @@
    },

    // 填充表达式

    submitFill() {

      this.$emit("fill", this.contabValueString);

      this.$emit("fill", this.crontabValueString);
      this.hidePopup();

    },

    clearCron() {

      // 还原选择项

      ("准备还原");

      this.contabValueObj = {

      this.crontabValueObj = {
        second: "*",

        min: "*",

        hour: "*",

        day: "*",

        mouth: "*",

        month: "*",
        week: "?",

        year: "",

      };

      for (let j in this.contabValueObj) {

        this.changeRadio(j, this.contabValueObj[j]);

      for (let j in this.crontabValueObj) {
        this.changeRadio(j, this.crontabValueObj[j]);
      }

    },

  },

  computed: {

    contabValueString: function() {

      let obj = this.contabValueObj;

    crontabValueString: function() {
      let obj = this.crontabValueObj;
      let str =

        obj.second +

        " " +

@@ -335,7 +335,7 @@
        " " +

        obj.day +

        " " +

        obj.mouth +

        obj.month +
        " " +

        obj.week +

        (obj.year == "" ? "" : " " + obj.year);

@@ -347,7 +347,7 @@
    CrontabMin,

    CrontabHour,

    CrontabDay,

    CrontabMouth,

    CrontabMonth,
    CrontabWeek,

    CrontabYear,

    CrontabResult,


 ruoyi-ui/src/components/Crontab/month.vue

文件名从 ruoyi-ui/src/components/Crontab/mouth.vue 修改
@@ -46,56 +46,56 @@
            checkNum: this.check

        }

    },

    name: 'crontab-mouth',

    name: 'crontab-month',
    props: ['check', 'cron'],

    methods: {

        // 单选按钮值变化时

        radioChange() {

            if (this.radioValue === 1) {

                this.$emit('update', 'mouth', '*');

                this.$emit('update', 'month', '*');
                this.$emit('update', 'year', '*');

            } else {

                if (this.cron.day === '*') {

                    this.$emit('update', 'day', '0', 'mouth');

                    this.$emit('update', 'day', '0', 'month');
                }

                if (this.cron.hour === '*') {

                    this.$emit('update', 'hour', '0', 'mouth');

                    this.$emit('update', 'hour', '0', 'month');
                }

                if (this.cron.min === '*') {

                    this.$emit('update', 'min', '0', 'mouth');

                    this.$emit('update', 'min', '0', 'month');
                }

                if (this.cron.second === '*') {

                    this.$emit('update', 'second', '0', 'mouth');

                    this.$emit('update', 'second', '0', 'month');
                }

            }

            switch (this.radioValue) {

                case 2:

                    this.$emit('update', 'mouth', this.cycle01 + '-' + this.cycle02);

                    this.$emit('update', 'month', this.cycle01 + '-' + this.cycle02);
                    break;

                case 3:

                    this.$emit('update', 'mouth', this.average01 + '/' + this.average02);

                    this.$emit('update', 'month', this.average01 + '/' + this.average02);
                    break;

                case 4:

                    this.$emit('update', 'mouth', this.checkboxString);

                    this.$emit('update', 'month', this.checkboxString);
                    break;

            }

        },

        // 周期两个值变化时

        cycleChange() {

            if (this.radioValue == '2') {

                this.$emit('update', 'mouth', this.cycleTotal);

                this.$emit('update', 'month', this.cycleTotal);
            }

        },

        // 平均两个值变化时

        averageChange() {

            if (this.radioValue == '3') {

                this.$emit('update', 'mouth', this.averageTotal);

                this.$emit('update', 'month', this.averageTotal);
            }

        },

        // checkbox值变化时

        checkboxChange() {

            if (this.radioValue == '4') {

                this.$emit('update', 'mouth', this.checkboxString);

                this.$emit('update', 'month', this.checkboxString);
            }

        }

    },


 ruoyi-ui/src/components/Crontab/result.vue

@@ -37,7 +37,7 @@
            // 获取当前时间精确至[年、月、日、时、分、秒]

            let nTime = new Date();

            let nYear = nTime.getFullYear();

            let nMouth = nTime.getMonth() + 1;

            let nMonth = nTime.getMonth() + 1;
            let nDay = nTime.getDate();

            let nHour = nTime.getHours();

            let nMin = nTime.getMinutes();

@@ -47,7 +47,7 @@
            this.getMinArr(ruleArr[1]);

            this.getHourArr(ruleArr[2]);

            this.getDayArr(ruleArr[3]);

            this.getMouthArr(ruleArr[4]);

            this.getMonthArr(ruleArr[4]);
            this.getWeekArr(ruleArr[5]);

            this.getYearArr(ruleArr[6], nYear);

            // 将获取到的数组赋值-方便使用

@@ -62,7 +62,7 @@
            let mIdx = this.getIndex(mDate, nMin);

            let hIdx = this.getIndex(hDate, nHour);

            let DIdx = this.getIndex(DDate, nDay);

            let MIdx = this.getIndex(MDate, nMouth);

            let MIdx = this.getIndex(MDate, nMonth);
            let YIdx = this.getIndex(YDate, nYear);

            // 重置月日时分秒的函数(后面用的比较多)

            const resetSecond = function () {

@@ -84,17 +84,17 @@
                nDay = DDate[DIdx]

                resetHour();

            }

            const resetMouth = function () {

            const resetMonth = function () {
                MIdx = 0;

                nMouth = MDate[MIdx]

                nMonth = MDate[MIdx]
                resetDay();

            }

            // 如果当前年份不为数组中当前值

            if (nYear !== YDate[YIdx]) {

                resetMouth();

                resetMonth();
            }

            // 如果当前月份不为数组中当前值

            if (nMouth !== MDate[MIdx]) {

            if (nMonth !== MDate[MIdx]) {
                resetDay();

            }

            // 如果当前“日”不为数组中当前值

@@ -114,12 +114,12 @@
            goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {

                let YY = YDate[Yi];

                // 如果到达最大值时

                if (nMouth > MDate[MDate.length - 1]) {

                    resetMouth();

                if (nMonth > MDate[MDate.length - 1]) {
                    resetMonth();
                    continue;

                }

                // 循环月份数组

                goMouth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {

                goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
                    // 赋值、方便后面运算

                    let MM = MDate[Mi];

                    MM = MM < 10 ? '0' + MM : MM;

@@ -127,7 +127,7 @@
                    if (nDay > DDate[DDate.length - 1]) {

                        resetDay();

                        if (Mi == MDate.length - 1) {

                            resetMouth();

                            resetMonth();
                            continue goYear;

                        }

                        continue;

@@ -144,10 +144,10 @@
                            if (Di == DDate.length - 1) {

                                resetDay();

                                if (Mi == MDate.length - 1) {

                                    resetMouth();

                                    resetMonth();
                                    continue goYear;

                                }

                                continue goMouth;

                                continue goMonth;
                            }

                            continue;

                        }

@@ -155,7 +155,7 @@
                        // 判断日期的合法性，不合法的话也是跳出当前循环

                        if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {

                            resetDay();

                            continue goMouth;

                            continue goMonth;
                        }

                        // 如果日期规则中有值时

                        if (this.dayRule == 'lastDay') {

@@ -205,10 +205,10 @@
                                if (Di == DDate.length - 1) {

                                    resetDay();

                                    if (Mi == MDate.length - 1) {

                                        resetMouth();

                                        resetMonth();
                                        continue goYear;

                                    }

                                    continue goMouth;

                                    continue goMonth;
                                }

                                continue;

                            }

@@ -254,10 +254,10 @@
                                    if (Di == DDate.length - 1) {

                                        resetDay();

                                        if (Mi == MDate.length - 1) {

                                            resetMouth();

                                            resetMonth();
                                            continue goYear;

                                        }

                                        continue goMouth;

                                        continue goMonth;
                                    }

                                    continue goDay;

                                }

@@ -277,10 +277,10 @@
                                            if (Di == DDate.length - 1) {

                                                resetDay();

                                                if (Mi == MDate.length - 1) {

                                                    resetMouth();

                                                    resetMonth();
                                                    continue goYear;

                                                }

                                                continue goMouth;

                                                continue goMonth;
                                            }

                                            continue goDay;

                                        }

@@ -308,10 +308,10 @@
                                                if (Di == DDate.length - 1) {

                                                    resetDay();

                                                    if (Mi == MDate.length - 1) {

                                                        resetMouth();

                                                        resetMonth();
                                                        continue goYear;

                                                    }

                                                    continue goMouth;

                                                    continue goMonth;
                                                }

                                                continue goDay;

                                            }

@@ -323,7 +323,7 @@
                            } //goMin

                        }//goHour

                    }//goDay

                }//goMouth

                }//goMonth
            }

            // 判断100年内的结果条数

            if (resultArr.length == 0) {

@@ -365,7 +365,7 @@
            }

        },

        // 获取"月"数组

        getMouthArr(rule) {

        getMonthArr(rule) {
            this.dateArr[4] = this.getOrderArr(1, 12);

            if (rule.indexOf('-') >= 0) {

                this.dateArr[4] = this.getCycleArr(rule, 12, false)


 ruoyi-ui/src/components/Crontab/second.vue

 ruoyi-ui/src/components/Crontab/week.vue

@@ -71,8 +71,8 @@
                this.$emit('update', 'week', '*');

                this.$emit('update', 'year', '*');

            } else {

                if (this.cron.mouth === '*') {

                    this.$emit('update', 'mouth', '0', 'week');

                if (this.cron.month === '*') {
                    this.$emit('update', 'month', '0', 'week');
                }

                if (this.cron.day === '*') {

                    this.$emit('update', 'day', '0', 'week');


 ruoyi-ui/src/components/Crontab/year.vue

@@ -55,12 +55,12 @@
        }

    },

    name: 'crontab-year',

    props: ['check', 'mouth', 'cron'],

    props: ['check', 'month', 'cron'],
    methods: {

        // 单选按钮值变化时

        radioChange() {

            if (this.cron.mouth === '*') {

                this.$emit('update', 'mouth', '0', 'year');

            if (this.cron.month === '*') {
                this.$emit('update', 'month', '0', 'year');
            }

            if (this.cron.day === '*') {

                this.$emit('update', 'day', '0', 'year');