fix：“优化今日做糖列表”

src/App.vue

@@ -54,7 +54,10 @@ export default {
     })
     
 
-    return { ...toRefs(state),tabType };
+    return { 
+      ...toRefs(state),
+      tabType,
+    };
   },
   components: { navBar }
 };

src/assets/language/en.json

@@ -407,6 +407,9 @@
     "pleaseSelectTaste": "Please choose the flavor",
     "todaysMakeList": "Make Today List",
     "todaysSugarList": "Make a sugar list today",
+    "goods": "Product : ",
+    "doTime": " , Time ： ",
+    "byDeice": " , Machine : ",
     "submitToMakeSugar": "Submit",
     "viewResults": "View Results",
     "notUploadData": "The machine did not upload data !",

src/assets/language/zh.json

@@ -408,6 +408,9 @@
     "pleaseSelectTaste": "请选择口味",
     "todaysSugarList": "今日做糖列表",
     "todaysMakeList": "今日制作列表",
+    "goods": "商品：",
+    "doTime": "，时间：",
+    "byDeice": "，设备：",
     "submitToMakeSugar": "提交",
     "viewResults": "查看结果",
     "notUploadData": "机器未上传数据",

src/service/home.js

@@ -24,4 +24,8 @@ export function Api_getUpdateNotice(params) {
 // 获取设备情况
 export function Api_postMachineNum(params) {
     return axios.post(`/SZWL-SERVER/tEquipment/getMachineNum`, params );
+}
+// 查询是否有设备报警
+export function getIsAlarm(params) {
+    return axios.get(`/SZWL-SERVER/tAlarmRecord/isAlarm?${stringToUrl(params)}`);
 }

src/views/device/index.vue

@@ -474,7 +474,7 @@ export default {
       if (!date) {
         return "";
       }
-      const currentDate = new Date(dateUtil.formateDate(new Date(date), "yyyy-MM-dd hh:mm:ss"));
+      const currentDate = new Date(dateUtil.formateDate(new Date(date), "yyyy/MM/dd hh:mm:ss"));
       return dateUtil.timeZoneDate(currentDate);
     };
 

src/views/device/toDaySugarList.vue

@@ -9,7 +9,7 @@
       </div>
       <van-list class="o-pt-20" v-model:loading="loading" :finished="finished" :finished-text="$t('public.noMore')"
         @load="selectSugarListFun">
-        <van-cell v-for="(item, index) in list" :key="index" :title="item" />
+        <van-cell v-for="(item, index) in list" :key="index" :title="showDoList(item)" />
       </van-list>
     </div>
   </div>
@@ -34,10 +34,14 @@ import {
 import {
   useRoute
 } from 'vue-router';
+import dateUtil from "../../utils/dateUtil";
+import { useI18n } from "vue-i18n";
+
 
 
 export default {
   setup() {
+    const { t } = useI18n();
     const route = useRoute();
     const deviceId = route.query.deviceId;
     const deviceDetal = ref(null);
@@ -78,14 +82,22 @@ export default {
         adminId: user.id
       });
       if (data.code) {
-        list.value = data.data.map((item) => {
-          return item.productName;
-        });
+        // list.value = data.data.map((item) => {
+        //   return item.productName;
+        // });
+        list.value = data.data;
         finished.value = true;
       } else {
         showFailToast(data.message);
       }
     };
+    const showDoList = (item) => {
+      if (!item) {
+        return "";
+      }
+      const currentDate = dateUtil.formateDate(new Date(item.modifyDate), "yyyy/MM/dd hh:mm:ss");
+      return t('device.goods') + item.productName + t('device.doTime') + currentDate + t('device.byDeice') + item.clientId.slice(-6);
+    }
 
     return {
       list,
@@ -93,6 +105,7 @@ export default {
       loading,
       finished,
       selectSugarListFun,
+      showDoList
     };
   },
   components: {

src/views/home/index.vue

@@ -120,6 +120,12 @@
         <van-image src="https://fastly.jsdelivr.net/npm/@vant/assets/apple-3.jpeg" />
       </div>
     </van-dialog> -->
+    <!-- <van-dialog v-model:show="showAlarm" title="以下机器报警，请及时处理！">
+      <div v-for="(item, index) in alarmList" :key="index" style="padding: 20px 20px;"> 
+        <div>设备：{{ item. clientId }}</div>
+        <div>报警内容：{{ item. alarmContent }}</div>
+      </div>
+    </van-dialog> -->
   </div>
 </template>
 
@@ -139,6 +145,7 @@ import {
   Api_getNotice,
   Api_postMachineNum,
   Api_getUpdateNotice,
+  getIsAlarm,
 } from "../../service/home";
 import dateUtil from "../../utils/dateUtil";
 import { useI18n } from "vue-i18n";
@@ -379,8 +386,11 @@ export default {
       }
     };
     const pushToolList = ref([]);
+    // 是否有报警
+    const showAlarm = ref(false);
+    const alarmList = ref([]);
     // 页面初始化
-    onMounted(() => {
+    onMounted(async() => {
       // 加载样式
       styleUrl('home');
       if (localStorage.getItem("loginSys")) {
@@ -411,7 +421,19 @@ export default {
       getNotice();
       // 获取设备情况
       getMachineNum();
-
+      if (user.type > 1) {
+        // 查询设备是否有报警
+        const queryParams = {
+          adminId: user.id,
+          todayDate: dateUtil.formateDate(new Date(), "yyyy-MM-dd"), // 当天时间
+        };
+        const { data } = await getIsAlarm(queryParams);
+        if(data.data.length > 0) {
+          showAlarm.value = true;
+          alarmList.value = data.data;
+          console.log("alarmList", alarmList.value)
+        }
+      }
     });
 
     const menuList = [];
@@ -606,7 +628,9 @@ export default {
       showDataDiv,
       currencySymbol,
       firstLogin,
-      pic1
+      pic1,
+      showAlarm,
+      alarmList,
     };
   },