fix: "参数没改完"

src/assets/language/en.json

@@ -1138,5 +1138,9 @@
   },
   "kCascader":{
     "selectRegion":"Please select your region"
+  },
+  "paramNames": {
+    "D405": "A",
+    "D406": "B"
   }
 }

src/assets/language/zh.json

@@ -1140,5 +1140,9 @@
   },
   "kCascader":{
     "selectRegion":"请选择所在地区"
+  },
+  "paramNames": {
+    "D405": "炉头低速",
+    "D406": "炉头中速"
   }
 }

src/common/js/utils.js

@@ -4,7 +4,8 @@ Big.prototype.toNumber = function () {
   return Number(this)
 }
 // 导入格式化时间插件
-import moment from "moment";
+// import moment from "moment";
+import dayjs from 'dayjs';
 // 导入语言
 import i18n from '../../utils/i18n';
 const t = i18n.global.t;
@@ -100,8 +101,12 @@ export const $M_ExportFile = (data, headers) => {
   window.URL.revokeObjectURL(href); //释放掉blob对象
 }
 // 格式化时间
-export const $M_FormatTime = (time, format = "YYYY-MM-DD HH:MM") => {
-  if (time) return moment(time).format(format);
+// export const $M_FormatTime = (time, format = "YYYY-MM-DD HH:MM") => {
+//   if (time) return moment(time).format(format);
+//   return time;
+// }
+export const $M_FormatTime = (time, format = 'YYYY-MM-DD HH:mm') => {
+  if (time) return dayjs(time).format(format);
   return time;
 }
 // 判断是不是时间格式

src/utils/dateUtil.js

@@ -43,12 +43,31 @@ const dateUtil = {
     }
     return format;
   },
-  isSameWeek(old,now){
-    var oneDayTime = 1000*60*60*24;  
-    var old_count =parseInt(old.getTime()/oneDayTime);  
-    var now_other =parseInt(now.getTime()/oneDayTime);  
-    return parseInt((old_count+4)/7) == parseInt((now_other+4)/7);  
-  }
+  // isSameWeek(old,now){
+  //   var oneDayTime = 1000*60*60*24;  
+  //   var old_count =parseInt(old.getTime()/oneDayTime);  
+  //   var now_other =parseInt(now.getTime()/oneDayTime);  
+  //   return parseInt((old_count+4)/7) == parseInt((now_other+4)/7);  
+  // }
+
+  // 获取本周第一天
+  getFirstDayOfWeek(date = new Date()) {
+    let firstDay = new Date(dateUtil.formatDate(date, "yyyy-MM-dd")); // 当前日期的 0 点
+    let weekDay = firstDay.getDay(); // 星期几（0-6，0 表示星期天）
+    let diff = weekDay === 0 ? 6 : weekDay - 1; // 本周第一天的偏移量
+    firstDay.setDate(firstDay.getDate() - diff);
+    return firstDay;
+  },
+  // 判断两个日期是否在同一周
+  isSameWeek(date1, date2) {
+    const startOfWeek = (date) => {
+      const diff = date.getDay() - 1;
+      return new Date(date.getFullYear(), date.getMonth(), date.getDate() - diff);
+    };
+    const start1 = startOfWeek(date1);
+    const start2 = startOfWeek(date2);
+    return start1.getTime() === start2.getTime();
+  },
 }
 
 export default dateUtil;

src/views/device/paramsSet/paramsSetInfo.vue

@@ -16,7 +16,8 @@
           v-model="item.val"
           name="phone"
           type="tel"
-          :label="item.name"
+    
+          :label="paramName[key]"
         >
           <template #button>
             <van-button size="small" type="primary" class="updataButton" @click="updateParams(item)">{{$t('device.submitUpdates')}}</van-button>
@@ -26,13 +27,17 @@
     </div>
   </div>
 </template>
-  <script>
-import { onMounted, ref } from "vue";
+
+<script>
+// import { createApp } from "vue";
+// import App from './App.vue';
+import {  onMounted, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
 import { useRoute } from "vue-router";
 import { getDeviceDetal, getParameters, updateParameters } from "@/service/device";
 import { Toast } from "vant";
 import { useI18n } from 'vue-i18n';
+import zh from '@/assets/language/zh.json';
 
 export default {
   components: { sHeader },
@@ -43,6 +48,14 @@ export default {
     const deviceDetal = ref(null);
     const paramsTitle = ref("");
     const paramsList = ref([]);
+    const comParams = ref([]);
+    const paramName = ref([]);
+
+    // const paramNames = reactive({
+    //   name : '',
+    //   value : '',
+    // });
+
     // 初始化页面获取列表
     onMounted(async () => {
       if (route.query.type === "0") {
@@ -69,6 +82,7 @@ export default {
         Toast.fail(data.message);
       }
     };
+    // 获取参数列表
     const getParametersFun = async () => {
       paramsList.value = [];
       const params = {
@@ -79,10 +93,56 @@ export default {
       const { data } = await getParameters(params);
       if (data.code) {
         paramsList.value = data.data;
+        paramsList.value.forEach((paramItem) => {
+          console.log(paramItem.name);
+          comParams.value.push(paramItem.name);
+          paramName.value.push(t("paramNames."+paramItem.name));
+          console.log(zh.paramNames[paramItem.name]);        
+        })
+        console.log(comParams.value);
+
       } else {
         Toast.fail(data.message);
       }
     };
+/*     const paramName = computed(() => {
+      return zh.paramNames[comParams.value.name];
+    }) */
+    // const paramName = zh.paramNames[comParams.value.name];
+    console.log(t("paramNames.D405"));
+    
+
+    // // 定义过滤器
+    // computed: {
+    //   paramName: () => {
+    //     const paramNames = {
+    //       D405: '炉头低速',
+    //     };
+    //     return paramNames[item.name] || '';
+    //   }
+    // }
+    // const app = createApp(App);
+    // app.config.globalProperties.$filters = {
+    //   getParamName(name) {
+    //     const paramNames = {
+    //       D405: '炉头低速',
+    //     };
+    //     return paramNames[name];
+    //   },
+    // };
+    // const getParamName = async (name) => {
+    //   const paramNames = {
+    //     D405: '炉头低速',
+    //   };
+    //   return paramNames[name];
+    // };
+    // getParamName.config.globalProperties.$filters = {
+    //   getParamName(name) {
+
+    //   }
+    // }
+
+    // 更新参数值
     const updateParams = async (item) => {
       const params = {
         id: deviceId,
@@ -100,7 +160,9 @@ export default {
       deviceDetal,
       paramsTitle,
       paramsList,
-      updateParams
+      // getParamName,
+      updateParams,
+      paramName
     };
   },
 };

src/views/orderCenter/index.vue

@@ -417,14 +417,23 @@ export default {
         // searchParams.adminType = isShowAdmin() ? 'all' : null;
         searchParams.adminId = user.id;
         searchParams.userName = user.username;
-        searchParams.startDate = dateUtil.formateDate(
-          new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0)),
-          "yyyy-MM-dd hh:mm:ss"
-        );
-        searchParams.endDate = dateUtil.formateDate(
-          new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 59)),
-          "yyyy-MM-dd hh:mm:ss"
-        );
+        // searchParams.startDate = dateUtil.formateDate(
+        //   new Date(new Date(new Date().getTime()).setHours(0, 0, 0, 0)),
+        //   "yyyy-MM-dd hh:mm:ss"
+        // );
+        let dayInMs = 24 * 60 * 60 * 1000;
+        let now = new Date();
+        let firstDay = new Date(now.getTime() - (now.getDay() - 1) * dayInMs);
+        searchParams.startDate = dateUtil.formatDate(firstDay, "yyyy-MM-dd hh:mm:ss");
+        
+        
+        // searchParams.endDate = dateUtil.formateDate(
+        //   new Date(new Date(new Date().getTime()).setHours(23, 59, 59, 59)),
+        //   "yyyy-MM-dd hh:mm:ss"
+        // );
+        let lastDay = new Date(now.getTime() + (7 - now.getDay()) * dayInMs);
+        searchParams.endDate = dateUtil.formatDate(lastDay, "yyyy-MM-dd hh:mm:ss");
+
         finished.value = false;
         getList();
         // 获取账户详情

src/views/robotRanking.vue

@@ -296,7 +296,7 @@ export default {
       const startDate =
         moment().year(year).startOf("year").format("YYYY-MM-DD") + " 00:00:00";
       const endDate =
-        moment().year(year).endOf("year").format("YYYY-MM-DD") + " 59:59:59";
+        moment().year(year).endOf("year").format("YYYY-MM-DD") + " 23:59:59";
       getEquipRankList("year", startDate, endDate);
       yearShow.value = false;
     };
@@ -338,7 +338,7 @@ export default {
         }
       }
       const startTime = moment(e[0]).format("YYYY-MM-DD") + " 00:00:00";
-      const endTime = moment(e[1]).format("YYYY-MM-DD") + " 59:59:59";
+      const endTime = moment(e[1]).format("YYYY-MM-DD") + " 23:59:59";
       getEquipRankList(weekOrMont, startTime, endTime);
       if (idx === 1) {
         weekShow.value = false;
@@ -350,7 +350,7 @@ export default {
     // 日历选择触发
     const calendarDayConfirm = (e) => {
       const startDate = moment(e).format("YYYY-MM-DD") + " 00:00:00";
-      const endDate = moment(e).format("YYYY-MM-DD") + " 59:59:59";
+      const endDate = moment(e).format("YYYY-MM-DD") + " 23:59:59";
       getEquipRankList("day", startDate, endDate);
       dayShow.value = false;
     };
@@ -430,7 +430,7 @@ export default {
     const defaultTime = reactive({
       // 今日
       todayStart: moment().format("YYYY-MM-DD") + " 00:00:00",
-      todayEnd: moment().format("YYYY-MM-DD") + " 59:59:59",
+      todayEnd: moment().format("YYYY-MM-DD") + " 23:59:59",
       // 昨日
       colastdayStart:
         moment()
@@ -439,10 +439,10 @@ export default {
       colastdayEnd:
         moment()
           .day(moment().day() - 1)
-          .format("YYYY-MM-DD") + " 59:59:59",
+          .format("YYYY-MM-DD") + " 23:59:59",
       // 这周
       weekStart: moment().weekday(1).format("YYYY-MM-DD") + " 00:00:00",
-      weekEnd: moment().weekday(7).format("YYYY-MM-DD") + " 59:59:59",
+      weekEnd: moment().weekday(7).format("YYYY-MM-DD") + " 23:59:59",
       // 上周
       lastWeekStart:moment().week(moment().week() - 1).startOf('week').add(1,'days').format("YYYY-MM-DD") + " 00:00:00",
         // moment()
@@ -450,15 +450,15 @@ export default {
         //   .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",
+      lastWeekEnd:moment().week(moment().week() - 1).endOf('week').add(1,'days').format("YYYY-MM-DD") + " 23:59:59",
         // moment()
         //   .week(moment().week() - 1)
         //   .endOf("week")
-        //   .format("YYYY-MM-DD") + " 59:59:59",
+        //   .format("YYYY-MM-DD") + " 23:59:59",
 		
       // 这个月
       monthStart: moment().startOf("month").format("YYYY-MM-DD") + " 00:00:00",
-      monthEnd: moment().endOf("month").format("YYYY-MM-DD") + " 59:59:59",
+      monthEnd: moment().endOf("month").format("YYYY-MM-DD") + " 23:59:59",
       // 上个月
       lastmonthStart:
         moment()
@@ -469,10 +469,10 @@ export default {
         moment()
           .month(moment().month() - 1)
           .endOf("month")
-          .format("YYYY-MM-DD") + " 59:59:59",
+          .format("YYYY-MM-DD") + " 23:59:59",
       // 今年
       yearStart: moment().startOf("year").format("YYYY-MM-DD") + " 00:00:00",
-      yearEnd: moment().endOf("year").format("YYYY-MM-DD") + " 59:59:59",
+      yearEnd: moment().endOf("year").format("YYYY-MM-DD") + " 23:59:59",
       // 上年
       lastYearStart:
         moment()
@@ -483,7 +483,7 @@ export default {
         moment()
           .year(moment().year() - 1)
           .endOf("year")
-          .format("YYYY-MM-DD") + " 59:59:59",
+          .format("YYYY-MM-DD") + " 23:59:59",
     });
     // 点击tab
     const tabclk = (e, type) => {