cloud-web-corejs-haier 1.0.43 → 1.0.45

package/src/views/user/wf/wf_work_calendar/configDialog.vue

@@ -108,8 +108,8 @@ export default {
       })
     },
     formatDate(time) {
-      var date = new Date(time);
-      var time1 = moment(date).format("YYYY");
+      let date = new Date(time);
+      let time1 = moment(date).format("YYYY");
       return time1; //年月日 格式自己定义 'yyyy : MM : dd' 例 2018年12月5日的格式
     },
     async changeYear(val) {
@@ -240,7 +240,7 @@ export default {
         return
       }
       this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-        var url = USER_PREFIX + '/wf_work_calendar/save';
+        let url = USER_PREFIX + '/wf_work_calendar/save';
 
         let requests = [];
 
@@ -315,9 +315,9 @@ export default {
       font-weight: 600;
       font-size: 14px;
 
-      ::v-deep .el-input__inner {
-        color: #ff8d4b;
-      }
+      // ::v-deep .el-input__inner {
+      //   color: #ff8d4b;
+      // }
     }
 
     .chose_detail {

package/src/views/user/wf/wf_work_calendar/date.js

@@ -147,8 +147,8 @@ export default {
    * 返回默认定义的内容里节日
    */
   getLunarFestival(y, m, d) {
-    if (m == 12 && d == 29) {
-      if (this.lunar2solar(y, m, 30) == -1) {
+    if (m === 12 && d === 29) {
+      if (this.lunar2solar(y, m, 30) === -1) {
         delete this.lfestival['12-30']
         this.lfestival['12-29'] = {
           title: '除夕'
@@ -223,10 +223,10 @@ export default {
    * 返回农历y年一整年的总天数
    * @param lunar Year
    * @return Number
-   * @eg:var count = calendar.lYearDays(1987) ;//count=387
+   * @eg:let count = calendar.lYearDays(1987) ;//count=387
    */
   lYearDays: function (y) {
-    var i,
+    let i,
       sum = 348
     for (i = 0x8000; i > 0x8; i >>= 1) {
       sum += this.lunarInfo[y - 1900] & i ? 1 : 0
@@ -238,7 +238,7 @@ export default {
    * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
    * @param lunar Year
    * @return Number (0-12)
-   * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+   * @eg:let leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
    */
   leapMonth: function (y) {
     //闰字编码 \u95f0
@@ -249,7 +249,7 @@ export default {
    * 返回农历y年闰月的天数 若该年没有闰月则返回0
    * @param lunar Year
    * @return Number (0、29、30)
-   * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+   * @eg:let leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
    */
   leapDays: function (y) {
     if (this.leapMonth(y)) {
@@ -262,7 +262,7 @@ export default {
    * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
    * @param lunar Year
    * @return Number (-1、29、30)
-   * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+   * @eg:let MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
    */
   monthDays: function (y, m) {
     if (m > 12 || m < 1) {
@@ -275,16 +275,16 @@ export default {
    * 返回公历(!)y年m月的天数
    * @param solar Year
    * @return Number (-1、28、29、30、31)
-   * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+   * @eg:let solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
    */
   solarDays: function (y, m) {
     if (m > 12 || m < 1) {
       return -1
     } //若参数错误 返回-1
-    var ms = m - 1
-    if (ms == 1) {
+    let ms = m - 1
+    if (ms === 1) {
       //2月份的闰平规律测算后确认返回28或29
-      return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0 ? 29 : 28
+      return (y % 4 === 0 && y % 100 !== 0) || y % 400 === 0 ? 29 : 28
     } else {
       return this.solarMonth[ms]
     }
@@ -296,10 +296,10 @@ export default {
    * @return Cn string
    */
   toGanZhiYear: function (lYear) {
-    var ganKey = (lYear - 3) % 10
-    var zhiKey = (lYear - 3) % 12
-    if (ganKey == 0) ganKey = 10 //如果余数为0则为最后一个天干
-    if (zhiKey == 0) zhiKey = 12 //如果余数为0则为最后一个地支
+    let ganKey = (lYear - 3) % 10
+    let zhiKey = (lYear - 3) % 12
+    if (ganKey === 0) ganKey = 10 //如果余数为0则为最后一个天干
+    if (zhiKey === 0) zhiKey = 12 //如果余数为0则为最后一个地支
     return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
   },
 
@@ -310,9 +310,9 @@ export default {
    * @return Cn string
    */
   toAstro: function (cMonth, cDay) {
-    var s =
+    let s =
       '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
-    var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+    let arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
     return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' //座
   },
 
@@ -329,7 +329,7 @@ export default {
    * 传入公历(!)y年获得该年第n个节气的公历日期
    * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
    * @return day Number
-   * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+   * @eg:let _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
    */
   getTerm: function (y, n) {
     if (y < 1900 || y > 2100) {
@@ -338,8 +338,8 @@ export default {
     if (n < 1 || n > 24) {
       return -1
     }
-    var _table = this.sTermInfo[y - 1900]
-    var _info = [
+    let _table = this.sTermInfo[y - 1900]
+    let _info = [
       parseInt('0x' + _table.substr(0, 5)).toString(),
       parseInt('0x' + _table.substr(5, 5)).toString(),
       parseInt('0x' + _table.substr(10, 5)).toString(),
@@ -347,7 +347,7 @@ export default {
       parseInt('0x' + _table.substr(20, 5)).toString(),
       parseInt('0x' + _table.substr(25, 5)).toString(),
     ]
-    var _calday = [
+    let _calday = [
       _info[0].substr(0, 1),
       _info[0].substr(1, 2),
       _info[0].substr(3, 1),
@@ -385,14 +385,14 @@ export default {
    * 传入农历数字月份返回汉语通俗表示法
    * @param lunar month
    * @return Cn string
-   * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+   * @eg:let cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
    */
   toChinaMonth: function (m) {
     // 月 => \u6708
     if (m > 12 || m < 1) {
       return -1
     } //若参数错误 返回-1
-    var s = this.nStr3[m - 1]
+    let s = this.nStr3[m - 1]
     s += '\u6708' //加上月字
     return s
   },
@@ -401,11 +401,11 @@ export default {
    * 传入农历日期数字返回汉字表示法
    * @param lunar day
    * @return Cn string
-   * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+   * @eg:let cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
    */
   toChinaDay: function (d) {
     //日 => \u65e5
-    var s
+    let s
     switch (d) {
       case 10:
         s = '\u521d\u5341'
@@ -429,7 +429,7 @@ export default {
    * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
    * @param y year
    * @return Cn string
-   * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+   * @eg:let animal = calendar.getAnimal(1987) ;//animal='兔'
    */
   getAnimal: function (y) {
     return this.Animals[(y - 4) % 12]
@@ -458,23 +458,24 @@ export default {
       return -1 // undefined转换为数字变为NaN
     }
     //公历传参最下限
-    if (y == 1900 && m == 1 && d < 31) {
+    if (y === 1900 && m === 1 && d < 31) {
       return -1
     }
     //未传参  获得当天
+    let objDate;
     if (!y) {
-      var objDate = new Date()
+      objDate = new Date()
     } else {
-      var objDate = new Date(y, parseInt(m) - 1, d)
+      objDate = new Date(y, parseInt(m) - 1, d)
     }
-    var i,
+    let i,
       leap = 0,
       temp = 0
     //修正ymd参数
-    var y = objDate.getFullYear(),
-      m = objDate.getMonth() + 1,
-      d = objDate.getDate()
-    var offset =
+    y = objDate.getFullYear();
+    m = objDate.getMonth() + 1;
+    d = objDate.getDate();
+    let offset =
       (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) -
         Date.UTC(1900, 0, 31)) /
       86400000
@@ -488,31 +489,31 @@ export default {
     }
 
     //是否今天
-    var isTodayObj = new Date(),
+    let isTodayObj = new Date(),
       isToday = false
     if (
-      isTodayObj.getFullYear() == y &&
-      isTodayObj.getMonth() + 1 == m &&
-      isTodayObj.getDate() == d
+      isTodayObj.getFullYear() === y &&
+      isTodayObj.getMonth() + 1 === m &&
+      isTodayObj.getDate() === d
     ) {
       isToday = true
     }
     //星期几
-    var nWeek = objDate.getDay(),
+    let nWeek = objDate.getDay(),
       cWeek = this.nStr1[nWeek]
     //数字表示周几顺应天朝周一开始的惯例
-    if (nWeek == 0) {
+    if (nWeek === 0) {
       nWeek = 7
     }
     //农历年
-    var year = i
-    var leap = this.leapMonth(i) //闰哪个月
-    var isLeap = false
+    let year = i
+    leap = this.leapMonth(i) //闰哪个月
+    let isLeap = false
 
     //效验闰月
     for (i = 1; i < 13 && offset > 0; i++) {
       //闰月
-      if (leap > 0 && i == leap + 1 && isLeap == false) {
+      if (leap > 0 && i === leap + 1 && isLeap === false) {
         --i
         isLeap = true
         temp = this.leapDays(year) //计算农历闰月天数
@@ -520,13 +521,13 @@ export default {
         temp = this.monthDays(year, i) //计算农历普通月天数
       }
       //解除闰月
-      if (isLeap == true && i == leap + 1) {
+      if (isLeap === true && i === leap + 1) {
         isLeap = false
       }
       offset -= temp
     }
     // 闰月导致数组下标重叠取反
-    if (offset == 0 && leap > 0 && i == leap + 1) {
+    if (offset === 0 && leap > 0 && i === leap + 1) {
       if (isLeap) {
         isLeap = false
       } else {
@@ -539,49 +540,49 @@ export default {
       --i
     }
     //农历月
-    var month = i
+    let month = i
     //农历日
-    var day = offset + 1
+    let day = offset + 1
     //天干地支处理
-    var sm = m - 1
-    var gzY = this.toGanZhiYear(year)
+    let sm = m - 1
+    let gzY = this.toGanZhiYear(year)
 
     // 当月的两个节气
     // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
-    var firstNode = this.getTerm(y, m * 2 - 1) //返回当月「节」为几日开始
-    var secondNode = this.getTerm(y, m * 2) //返回当月「节」为几日开始
+    let firstNode = this.getTerm(y, m * 2 - 1) //返回当月「节」为几日开始
+    let secondNode = this.getTerm(y, m * 2) //返回当月「节」为几日开始
 
     // 依据12节气修正干支月
-    var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+    let gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
     if (d >= firstNode) {
       gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
     }
 
     //传入的日期的节气与否
-    var isTerm = false
-    var Term = null
-    if (firstNode == d) {
+    let isTerm = false
+    let Term = null
+    if (firstNode === d) {
       isTerm = true
       Term = this.solarTerm[m * 2 - 2]
     }
-    if (secondNode == d) {
+    if (secondNode === d) {
       isTerm = true
       Term = this.solarTerm[m * 2 - 1]
     }
     //日柱 当月一日与 1900/1/1 相差天数
-    var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
-    var gzD = this.toGanZhi(dayCyclical + d - 1)
+    let dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+    let gzD = this.toGanZhi(dayCyclical + d - 1)
     //该日期所属的星座
-    var astro = this.toAstro(m, d)
+    let astro = this.toAstro(m, d)
 
-    var solarDate = y + '-' + (m + '').padStart(2, 0) + '-' + (d + '').padStart(2, 0)
-    var lunarDate = year + '-' + month + '-' + day
+    let solarDate = y + '-' + (m + '').padStart(2, 0) + '-' + (d + '').padStart(2, 0)
+    let lunarDate = year + '-' + month + '-' + day
 
-    var festival = this.festival
-    var lfestival = this.getLunarFestival(year, month, day)
+    let festival = this.festival
+    let lfestival = this.getLunarFestival(year, month, day)
 
-    var festivalDate = m + '-' + d
-    var lunarFestivalDate = month + '-' + day
+    let festivalDate = m + '-' + d
+    let lunarFestivalDate = month + '-' + day
 
     return {
       isWork: workday.includes(solarDate),
@@ -627,18 +628,18 @@ export default {
     y = parseInt(y)
     m = parseInt(m)
     d = parseInt(d)
-    var isLeapMonth = !!isLeapMonth
-    var leapOffset = 0
-    var leapMonth = this.leapMonth(y)
-    var leapDay = this.leapDays(y)
-    if (isLeapMonth && leapMonth != m) {
+    isLeapMonth = !!isLeapMonth
+    let leapOffset = 0
+    let leapMonth = this.leapMonth(y)
+    let leapDay = this.leapDays(y)
+    if (isLeapMonth && leapMonth !== m) {
       return -1
     } //传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
-    if ((y == 2100 && m == 12 && d > 1) || (y == 1900 && m == 1 && d < 31)) {
+    if ((y === 2100 && m === 12 && d > 1) || (y === 1900 && m === 1 && d < 31)) {
       return -1
     } //超出了最大极限值
-    var day = this.monthDays(y, m)
-    var _day = day
+    let day = this.monthDays(y, m)
+    let _day = day
     //bugFix 2016-9-25
     //if month is leap, _day use leapDays method
     if (isLeapMonth) {
@@ -649,13 +650,13 @@ export default {
     } //参数合法性效验
 
     //计算农历的时间差
-    var offset = 0
-    for (var i = 1900; i < y; i++) {
+    let offset = 0
+    for (let i = 1900; i < y; i++) {
       offset += this.lYearDays(i)
     }
-    var leap = 0,
+    let leap = 0,
       isAdd = false
-    for (var i = 1; i < m; i++) {
+    for (let i = 1; i < m; i++) {
       leap = this.leapMonth(y)
       if (!isAdd) {
         //处理闰月
@@ -671,11 +672,11 @@ export default {
       offset += day
     }
     //1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
-    var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
-    var calObj = new Date((offset + d - 31) * 86400000 + stmap)
-    var cY = calObj.getUTCFullYear()
-    var cM = calObj.getUTCMonth() + 1
-    var cD = calObj.getUTCDate()
+    let stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+    let calObj = new Date((offset + d - 31) * 86400000 + stmap)
+    let cY = calObj.getUTCFullYear()
+    let cM = calObj.getUTCMonth() + 1
+    let cD = calObj.getUTCDate()
     return `${cY}${cM}${cD}`
     // return this.solar2lunar(cY, cM, cD)
   },

package/src/views/user/wf/wf_work_calendar/list.vue

@@ -82,8 +82,8 @@ export default {
       })
     },
     formatDate(time) {
-      var date = new Date(time);
-      var time1 = moment(date).format("YYYY");
+      let date = new Date(time);
+      let time1 = moment(date).format("YYYY");
       return time1; //年月日 格式自己定义 'yyyy : MM : dd' 例 2018年12月5日的格式
     },
     async changeYear(val) {
@@ -188,7 +188,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 #containt > .calendar {
-  height: calc(100vh - 42px);
+  height:100%;
   overflow: auto;
 }
 
@@ -213,9 +213,9 @@ export default {
       font-weight: 600;
       font-size: 14px;
 
-      ::v-deep .el-input__inner {
-        color: #ff8d4b;
-      }
+      // ::v-deep .el-input__inner {
+      //   color: #ff8d4b;
+      // }
     }
 
     .chose_detail {