修改更新

package.json

@@ -56,7 +56,8 @@
       "parser": "babel-eslint"
     },
     "rules": {
-      "no-irregular-whitespace": "off"
+      "no-irregular-whitespace": "off",
+	  "no-mixed-spaces-and-tabs":0
     }
   },
   "browserslist": [

src/assets/language/en.json

@@ -232,6 +232,10 @@
     "weekday": "Working days (Monday to Friday)",
     "weekend": "Weekend (Saturday to Sunday)",
     "custom": "custom",
+	"messageReceiver1":"Device alarm contact 1",
+	"messageReceiver2":"Device alarm contact 2",
+	"messageReceiver3":"Device alarm contact 3",
+	"equipmentmessageReceiverPlaceholder":"Please enter email",
     "repetitionsLabel": "Repetitions",
     "repetitionsPlaceholder": "Please enter the number of repetitions",
     "alarmTypeLabel": "Alarm type",
@@ -702,6 +706,7 @@
     "orderDetails": "order details",
     "exportToExcel": "Export to Excel",
     "equipmentNo": "Equipment No",
+	"equipmentName": "Equipment Name",
     "tradeName": "Trade name",
     "dividingDomesticService": "Dividing domestic service",
     "business": "business",

src/assets/language/zh.json

@@ -232,6 +232,10 @@
     "weekday": "工作日(周一至周五)",
     "weekend": "周末(周六至周日)",
     "custom": "自定义",
+	"messageReceiver1":"设备报警联系人1",
+	"messageReceiver2":"设备报警联系人2",
+	"messageReceiver3":"设备报警联系人3",
+	"equipmentmessageReceiverPlaceholder":"请输入手机号",
     "repetitionsLabel": "重复次数",
     "repetitionsPlaceholder": "请输入重复次数",
     "alarmTypeLabel": "闹钟类型",
@@ -702,6 +706,7 @@
     "orderDetails": "订单明细",
     "exportToExcel": "导出excel",
     "equipmentNo": "设备编号",
+	"equipmentName": "设备名称",
     "tradeName": "商品名称",
     "dividingDomesticService": "分佣",
     "business": "商家",
@@ -1049,13 +1054,13 @@
     "today": "今日",
     "yesterday": "昨日",
     "other": "其他",
-    "salesRankingThisWeek": "本周售排行",
+    "salesRankingThisWeek": "周销售排行",
     "thisWeek": "本周",
     "lastWeek": "上周",
-    "salesRankingThisMonth": "本月售排行",
+    "salesRankingThisMonth": "月销售排行",
     "thisMonth": "本月",
     "lastMonth": "上月",
-    "salesRankingThisYear": "本年售排行",
+    "salesRankingThisYear": "年销售排行",
     "thisYear": "今年",
     "lastYear": "去年",
     "yearPopTitle":"请选择年份",

src/views/changePassword.vue

@@ -22,16 +22,19 @@ import md5 from 'js-md5';
 import { ref } from 'vue';
 import { Toast } from 'vant';
 import sHeader from "@/components/SimpleHeader";
-import { useRouter, useRoute } from "vue-router";
+// import { useRouter, useRoute } from "vue-router";
+import { useRouter} from "vue-router";
 import { updatePassword } from '@/service/changePassword';
 import { useI18n } from 'vue-i18n';
+import { getLoginUser } from "@/common/js/utils";
 
 export default {
   setup() {
     // 引入语言
     const { t } = useI18n();
     const router = useRouter();
-    const route = useRoute();
+    // const route = useRoute();
+	const user = getLoginUser();
     const password = ref('');
     const passwordCheck = ref('');
     // 验证-表单
@@ -41,7 +44,8 @@ export default {
         return false;
       }
       const { data } = await updatePassword({
-        username: route.query.name,
+        // username: route.query.name,
+		username: user.username,
         password: md5(password.value)
       });
       if (data.code === '00000') {

src/views/device/deviceSet.vue

@@ -242,6 +242,7 @@
               },
             ]"
           />
+
           <van-field
             clearable
             v-model="deviceDetal.timeRuleId"
@@ -249,7 +250,30 @@
             :placeholder="$t('device.advertisingRulesPlaceholder')"
           />
         </div>
-
+		<div class="cust_vantBorder">
+			<van-field
+			  clearable
+			  v-model="deviceDetal.messageReceiver1"
+			  :label="`${$t('device.messageReceiver1')}:`"
+			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
+			/>
+		</div>
+		<div class="cust_vantBorder">
+			<van-field
+			  clearable
+			  v-model="deviceDetal.messageReceiver2"
+			  :label="`${$t('device.messageReceiver2')}:`"
+			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
+			/>
+		</div>
+		<div class="cust_vantBorder">
+			<van-field
+			  clearable
+			  v-model="deviceDetal.messageReceiver3"
+			  :label="`${$t('device.messageReceiver3')}:`"
+			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
+			/>
+		</div>
         <van-field
           colon
           readonly
@@ -440,6 +464,9 @@ export default {
       payType: "",
       channel: "",
       flowers:"18",
+	  messageReceiver1:"",
+	  messageReceiver2:"",
+	  messageReceiver3:"",
     });
     let tagsList = reactive({
       arr: [],

src/views/device/index.vue

@@ -69,6 +69,7 @@
                     <span class="txt4 c-text-line1">{{ item.name }}</span>
                   </div>
                   <div class="l-flex-RC">
+					  <!-- 报警标志 -->
                     <div v-if="item.hasTodayAlarm" class="box4 flex-col">
 						<img class="pic1" src="../../assets/home/M4.png"/>
 					</div>

src/views/home/index.vue

@@ -33,6 +33,7 @@
           >
         </div>
       </div>
+	  <!-- 数据概览 -->
       <div class="titleBox flex-col">
         <div class="layer2 flex-row">
           <div class="section5 flex-col"></div>
@@ -41,8 +42,10 @@
           </div>
         </div>
       </div>
+	  <!-- 时间选择 -->
       <dateSelectList @update="update($event)"></dateSelectList>
       <typeSelectList :isHome="true" @upselectdata="upselectdata($event)"></typeSelectList>
+	  <!-- 订单数据 -->
       <div class="o-plr-8">
         <div class="outer5 flex-col" @click="pushOrderCenter">
           <div class="block5 flex-col">

src/views/merchantManage/merchantSearch.vue

@@ -11,8 +11,8 @@
             :placeholder="$t('merchantManage.userNamePlaceholder')"
           />
           <van-field
-            v-model="uesrName"
-            name="uesrName"
+            v-model="userName"
+            name="userName"
             :label="$t('merchantManage.userLoginNameLabel')"
             :placeholder="$t('merchantManage.userLoginNamePlaceholder')"
           />
@@ -36,12 +36,12 @@ export default {
     const sheetShow = ref(false);
     const showSearch = () => { sheetShow.value = true; };
     const name = ref('');
-    const uesrName = ref('');
+    const userName = ref('');
     // 提交搜索表单触发搜索
     const onSubmit = () => {
       const searchParam = {};
       searchParam.name = name.value;
-      searchParam.uesrName = uesrName.value;
+      searchParam.userName = userName.value;
       context.emit('search', searchParam);
       sheetShow.value = false;
     }
@@ -49,7 +49,7 @@ export default {
       sheetShow,
       showSearch,
       name,
-      uesrName,
+      userName,
       onSubmit
     };
   },

src/views/orderCenter/index.vue

@@ -100,6 +100,10 @@
                         <span class="word11">{{ $t('orderCenter.equipmentNo') }}：{{ showClientId(item) }}</span>
                         <span class="word13">{{ $t('orderCenter.tradeName') }}：{{ item.productName }}</span>
                       </div>
+					  <div class="flex-row align-center">
+					    <span class="word11">{{ $t('orderCenter.equipmentName') }}：{{ item.es }}</span>
+						<span class="word13"></span>
+					  </div>
                       <div class="flex-row align-end">
                         <div class="pricBox flex-row align-end" :class="{ orderError: item.status === 0 }">
                           <span class="txt9">{{ item.statusText }}：</span>

src/views/robotRanking.vue

@@ -441,19 +441,21 @@ export default {
           .day(moment().day() - 1)
           .format("YYYY-MM-DD") + " 59:59:59",
       // 这周
-      weekStart: moment().weekday(0).format("YYYY-MM-DD") + " 00:00:00",
-      weekEnd: moment().weekday(6).format("YYYY-MM-DD") + " 59:59:59",
+      weekStart: moment().weekday(1).format("YYYY-MM-DD") + " 00:00:00",
+      weekEnd: moment().weekday(7).format("YYYY-MM-DD") + " 59:59:59",
       // 上周
-      lastWeekStart:
-        moment()
-          .week(moment().week() - 1)
-          .startOf("week")
-          .format("YYYY-MM-DD") + " 00:00:00",
-      lastWeekEnd:
-        moment()
-          .week(moment().week() - 1)
-          .endOf("week")
-          .format("YYYY-MM-DD") + " 59:59:59",
+      lastWeekStart:moment().week(moment().week() - 1).startOf('week').add(1,'days').format("YYYY-MM-DD") + " 00:00:00",
+        // moment()
+        //   .week(moment().week() - 1)
+        //   .startOf("week")
+        //   .format("YYYY-MM-DD") + " 00:00:00",
+		
+      lastWeekEnd:moment().week(moment().week() - 1).endOf('week').add(1,'days').format("YYYY-MM-DD") + " 59:59:59",
+        // moment()
+        //   .week(moment().week() - 1)
+        //   .endOf("week")
+        //   .format("YYYY-MM-DD") + " 59:59:59",
+		
       // 这个月
       monthStart: moment().startOf("month").format("YYYY-MM-DD") + " 00:00:00",
       monthEnd: moment().endOf("month").format("YYYY-MM-DD") + " 59:59:59",