Merge branch 'sunzee-test' of http://112.74.63.148:3000/litianbiao/shenze-sysMan into sunzee-test

src/assets/language/en.json

@@ -645,6 +645,15 @@
       "notification": "Notification",
       "nextTime": "See it next time",
       "roger": "Do not show again"
+    },
+    "week" : {
+      "mon": "Mon",
+      "tue": "Tue",
+      "wed": "Wed",
+      "thu": "Thu",
+      "fri": "Fri",
+      "sat": "Sat",
+      "sun": "Sun"
     }
   },
   "airwallex": {

src/assets/language/zh.json

@@ -646,6 +646,15 @@
       "notification": "通知",
       "nextTime": "下次再看",
       "roger": "不再显示"
+    },
+    "week" : {
+      "mon": "周一",
+      "tue": "周二",
+      "wed": "周三",
+      "thu": "周四",
+      "fri": "周五",
+      "sat": "周六",
+      "sun": "周日"
     }
   },
   "airwallex": {

src/styles/alarmClock/index.less

@@ -391,11 +391,10 @@
     .ImageText1 {
       height: 18px;
       width: auto;
-      margin: 23px 0 0 15px;
+      margin: 15px 0 0 15px;
 
       .mod4 {
         width: 109px;
-        height: auto;
 
         .TextGroup1 {
           height: 13px;
@@ -404,6 +403,7 @@
 
           .info4 {
             width: auto;
+            margin-top: 3px;
             height: 13px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);

src/views/device/alarmClockSet/index.vue

@@ -26,17 +26,17 @@
         :placeholder="$t('device.alarmTypePlaceholder')" @click="alarmClockTypeShow = true" class="field" />
       <van-field v-model="alarmClockName" name="alarmClockName" :label="$t('device.alarmNameLabel')"
         :placeholder="$t('device.alarmNamePlaceholder')" />
-      <div class="ImageText1 flex-col">
-        <div class="mod4 flex-row justify-between">
-          <div class="TextGroup1 flex-col">
+      <div class="ImageText1">
+        <div class="mod4 justify-between">
+          <div class="TextGroup1">
             <span class="info4">{{ $t("device.effectiveImmediately") }}：</span>
           </div>
-          <div class="section1 flex-col">
-            <van-switch v-model="checked" />
+          <div class="">
+            <van-switch  v-model="checked" size="20px"/>
           </div>
         </div>
       </div>
-      <van-row justify="space-around" style="padding: 1em">
+      <van-row justify="space-around" style="padding: 5em">
         <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" @click="submitSet">
           {{ $t("device.submitSettings") }}</van-button>
       </van-row>

src/views/home/index.vue

@@ -247,6 +247,29 @@ export default {
         data.data.series[2].data.forEach((item) => {
           orderNumber.value = parseInt(orderNumber.value + item);
         });
+        data.data.categories.forEach((item, index) => {
+          if (item == "周1") {
+            data.data.categories[index] = t("home.week.mon");
+          }
+          if (item == "周2") {
+            data.data.categories[index] = t("home.week.tue");
+          }
+          if (item == "周3") {
+            data.data.categories[index] = t("home.week.wed");
+          }
+          if (item == "周4") {
+            data.data.categories[index] = t("home.week.thu");
+          }
+          if (item == "周5") {
+            data.data.categories[index] = t("home.week.fri");
+          }
+          if (item == "周6") {
+            data.data.categories[index] = t("home.week.sat");
+          }
+          if (item == "周日") {
+            data.data.categories[index] = t("home.week.sun");
+          }
+        })
         // 解决eacharts与v-if的渲染问题
         await nextTick();
         if (chartBox.value) {