feat:"添加新闹钟"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "shenze-vue3-app",
-  "version": "1.5.904",
+  "version": "1.5.919",
   "private": true,
   "scripts": {
     "start": "vue-cli-service serve",

public/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.904",
-  "timestamp": "2025-09-04T09:19:14.384",
+  "version": "1.5.919",
+  "timestamp": "2025-09-19T09:19:54.966",
   "commitHash": "dev-build"
 }

src/assets/language/en.json

@@ -688,7 +688,14 @@
     "friday": "Fri",
     "saturday": "Sat",
     "sunday": "Sun",
-    "checkedAll": "Select All"
+    "checkedAll": "Select All",
+    "0": "Sun",
+    "1": "Mon",
+    "2": "Tue",
+    "3": "Wed",
+    "4": "Thu",
+    "5": "Fri",
+    "6": "Sat"
   },
   "discountCode": {
     "addMode": "Generation Mode",
@@ -1658,7 +1665,12 @@
     "D418": "Heating Temp",
     "D419": "Cabinet Temp Tolerance",
     "D435": "Cabinet Humidity Tolerance",
-    "D442": "Low Power Delay",
+    "D442": "Burner low power in N sec",
+    "D443": "Burner standby in N sec",
+    "D244": "Keep Warm OFF",
+    "D245": "Keep Warm ON",
+    "M511": "Stop Logic",
+    "M527": "Keep Warm Logic",
     "D444": "Base Coefficient",
     "D445": "Base Humidity",
     "D460": "Low Temp Mode",

src/assets/language/es.json

@@ -688,7 +688,14 @@
         "friday": "V",
         "saturday": "S",
         "sunday": "D",
-        "checkedAll": "Todos"
+        "checkedAll": "Todos",
+        "0": "Dom",
+        "1": "Lun",
+        "2": "Mar",
+        "3": "Mié",
+        "4": "Jue",
+        "5": "Vie",
+        "6": "Sáb"
     },
     "discountCode": {
         "addMode": "Generación",
@@ -1657,7 +1664,12 @@
         "D418": "Temp. trabajo caldera",
         "D419": "Margen temp. producción",
         "D435": "Margen humedad producción",
-        "D442": "Low-power caldera (s)",
+        "D442": "Quemador baja potencia en N seg",
+        "D443": "Quemador standby en N seg",
+        "D244": "Mantener caliente OFF",
+        "D245": "Mantener caliente ON",
+        "M511": "Lógica parada",
+        "M527": "Lógica mantener caliente",
         "D444": "Coeficiente base",
         "D445": "Humedad base",
         "D460": "Config. bajas temperaturas",

src/assets/language/fr.json

@@ -688,7 +688,14 @@
         "friday": "Ven",
         "saturday": "Sam",
         "sunday": "Dim",
-        "checkedAll": "Tout sélectionner"
+        "checkedAll": "Tout sélectionner",
+        "0": "Dim",
+        "1": "Lun",
+        "2": "Mar",
+        "3": "Mer",
+        "4": "Jeu",
+        "5": "Ven",
+        "6": "Sam"
     },
     "discountCode": {
         "addMode": "Méthode de génération",
@@ -1688,7 +1695,12 @@
         "D418": "Température de travail brûleur",
         "D419": "Tolérance température production",
         "D435": "Tolérance humidité production",
-        "D442": "Mode économie après N secondes",
+        "D442": "Brûleur basse conso. dans N sec",
+        "D443": "Brûleur veille dans N sec",
+        "D244": "Maintien chaud OFF",
+        "D245": "Maintien chaud ON",
+        "M511": "Logique arrêt",
+        "M527": "Logique maintien chaud",
         "D444": "Coefficient de base",
         "D445": "Humidité de référence",
         "D460": "Param. basse température (chauffage)",

src/assets/language/ja.json

@@ -682,7 +682,14 @@
         "friday": "金",
         "saturday": "土",
         "sunday": "日",
-        "checkedAll": "全て選択"
+        "checkedAll": "全て選択",
+        "0": "日曜",
+        "1": "月曜",
+        "2": "火曜",
+        "3": "水曜",
+        "4": "木曜",
+        "5": "金曜",
+        "6": "土曜"
     },
     "discountCode": {
         "addMode": "生成方法です",
@@ -1649,7 +1656,12 @@
         "D418": "炉頭の作業温度",
         "D419": "キャビネット内の許容糖作り温度誤差",
         "D435": "キャビネット内の許容糖作り湿度誤差",
-        "D442": "そしてN秒後に低消費電力に入ります",
+        "D442": "バーナーN秒後省電力モード",
+        "D443": "バーナーN秒後スタンバイ",
+        "D244": "保温OFF",
+        "D245": "保温ON",
+        "M511": "停止ロジック",
+        "M527": "保温ロジック",
         "D444": "基準係数",
         "D445": "基準湿度",
         "D460": "低温環境設定(炉頭の昇温)",

src/assets/language/pt.json

@@ -688,7 +688,14 @@
         "friday": "Sex",
         "saturday": "Sáb",
         "sunday": "Dom",
-        "checkedAll": "Selecionar Todos"
+        "checkedAll": "Selecionar Todos",
+        "0": "Dom",
+        "1": "Seg",
+        "2": "Ter",
+        "3": "Qua",
+        "4": "Qui",
+        "5": "Sex",
+        "6": "Sáb"
     },
     "discountCode": {
         "addMode": "Método de Geração",
@@ -1657,7 +1664,12 @@
         "D418": "Temp. Operação Bico",
         "D419": "Tolerância Temp. Produção",
         "D435": "Tolerância Umidade Produção",
-        "D442": "Modo Eco Bico (seg)",
+        "D442": "Queimador baixa potência em N seg",
+        "D443": "Queimador standby em N seg",
+        "D244": "Manter quente OFF",
+        "D245": "Manter quente ON",
+        "M511": "Lógica parada",
+        "M527": "Lógica manter quente",
         "D444": "Coef. Base",
         "D445": "Umidade Base",
         "D460": "Modo Ambiente Frio",

src/assets/language/ru.json

@@ -686,7 +686,14 @@
         "friday": "Пт",
         "saturday": "Сб",
         "sunday": "Вс",
-        "checkedAll": "Выбрать все"
+        "checkedAll": "Выбрать все",
+        "0": "Вс",
+        "1": "Пн",
+        "2": "Вт",
+        "3": "Ср",
+        "4": "Чт",
+        "5": "Пт",
+        "6": "Сб"
     },
     "discountCode": {
         "addMode": "Способ генерации",
@@ -1686,7 +1693,12 @@
         "D418": "Рабочая температура нагрева",
         "D419": "Допуск температуры",
         "D435": "Допуск влажности",
-        "D442": "Переход в эко-режим",
+        "D442": "Горелка низкая мощность через N сек",
+        "D443": "Горелка standby через N сек",
+        "D244": "Подогрев ВЫКЛ",
+        "D245": "Подогрев ВКЛ",
+        "M511": "Логика остановки",
+        "M527": "Логика подогрева",
         "D444": "Базовый коэффициент",
         "D445": "Базовая влажность",
         "D460": "Низкотемпературный режим",

src/assets/language/uk.json

@@ -688,7 +688,14 @@
         "friday": "Пт",
         "saturday": "Сб",
         "sunday": "Нд",
-        "checkedAll": "Вибрати все"
+        "checkedAll": "Вибрати все",
+        "0": "Нд", 
+        "1": "Пн",
+        "2": "Вт",
+        "3": "Ср",
+        "4": "Чт",
+        "5": "Пт",
+        "6": "Сб"
     },
     "discountCode": {
         "addMode": "Спосіб створення",
@@ -1658,7 +1665,12 @@
         "D418": "Робоча температура нагріву",
         "D419": "Допустима похибка температури",
         "D435": "Допустима похибка вологості",
-        "D442": "Перехід в енергозберігаючий режим через (сек)",
+        "D442": "Пальник низька потужність через N сек",
+        "D443": "Пальник standby через N сек",
+        "D244": "Підігрів OFF",
+        "D245": "Підігрів ON",
+        "M511": "Логіка зупинки",
+        "M527": "Логіка підігріву",
         "D444": "Базовий коефіцієнт",
         "D445": "Базова вологість",
         "D460": "Налаштування низьких температур",

src/assets/language/zh.json

@@ -693,7 +693,14 @@
     "friday": "五",
     "saturday": "六",
     "sunday": "日",
-    "checkedAll": "全选"
+    "checkedAll": "全选",
+    "0": "周日",
+    "1": "周一",
+    "2": "周二",
+    "3": "周三",
+    "4": "周四",
+    "5": "周五",
+    "6": "周六"
   },
   "discountCode": {
     "addMode": "生成方式",
@@ -1665,10 +1672,10 @@
     "D435": "柜内允许做糖湿度误差",
     "D442": "炉头N秒后进入低功耗",
     "D443": "炉头N秒后进入待机",
-    "D244": "保温ON",
-    "D245": "保温OFF",
-    "M511": "保温逻辑",
-    "M527": "停转逻辑",
+    "D244": "保温OFF",
+    "D245": "保温ON",
+    "M511": "停转逻辑",
+    "M527": "保温逻辑",
     "D444": "基准系数",
     "D445": "基准湿度",
     "D460": "低温环境设定(炉头升柜温)",

src/router/index.js

@@ -155,6 +155,13 @@ const router = createRouter({
       component: () => import("@/views/device/alarmClock.vue"),
       meta: { index: 1 },
     },
+    // 定时开关
+    {
+      path: "/newAlarmClock",
+      name: "newAlarmClock",
+      component: () => import("@/views/device/newAlarmClock.vue"),
+      meta: { index: 1 },
+    },
     // 设置闹钟
     {
       path: "/alarmClockAdd",
@@ -712,32 +719,34 @@ let retryCount = 0;
 // 路由守卫处理
 router.beforeEach(async (to, from, next) => {
   // 只在首次路由跳转时检查版本（生产环境）
-  if (!isVersionChecked && process.env.NODE_ENV === 'production') {
+  if (!isVersionChecked && process.env.NODE_ENV === "production") {
     isVersionChecked = true;
     try {
       const response = await fetch(`/shenze/version.json?t=${Date.now()}`, {
-        cache: 'no-store'
+        cache: "no-store",
       });
       const serverVersion = await response.json();
-      const localVersion = localStorage.getItem('appVersion') || '';
+      const localVersion = localStorage.getItem("appVersion") || "";
 
       if (serverVersion.version !== localVersion) {
         // 版本不一致，提示用户刷新
         if (retryCount < MAX_RETRY_COUNT) {
           retryCount++;
-          console.log(`检测到新版本(${serverVersion.version})，第${retryCount}次尝试刷新...`);
-          localStorage.setItem('appVersion', serverVersion.version);
+          console.log(
+            `检测到新版本(${serverVersion.version})，第${retryCount}次尝试刷新...`
+          );
+          localStorage.setItem("appVersion", serverVersion.version);
           window.location.reload();
           return; // 中断当前路由导航
         } else {
-          console.log('已达到最大重试次数，继续使用旧版本');
+          console.log("已达到最大重试次数，继续使用旧版本");
           retryCount = 0; // 重置计数器
         }
       } else if (!localVersion) {
-        localStorage.setItem('appVersion', serverVersion.version);
+        localStorage.setItem("appVersion", serverVersion.version);
       }
     } catch (error) {
-      console.error('版本检测失败:', error);
+      console.error("版本检测失败:", error);
       // 继续路由导航，即使版本检测失败
     }
   }

src/service/device/index.js

@@ -419,3 +419,13 @@ export function batchUpdatePrice(params) {
 export function pushGoods(params) {
   return axios.post(`/SZWL-SERVER/tEquipment/pushGoods`, params);
 }
+
+// 保存闹钟
+export function saveAlarm(params) {
+  return axios.post(`/SZWL-SERVER/alarmClock/saveOrUpdate`, params);
+}
+
+// 获取闹钟
+export function getAlarm(params) {
+  return axios.post(`/SZWL-SERVER/alarmClock/list`, params);
+}

src/views/device/deviceOper.vue

@@ -334,7 +334,7 @@
       </div>
       <!-- 修改价格 -->
       <div
-        v-if="controlList.includes('C11')"
+        v-if="controlList.includes('C11') && device.equimentType != 'SBM10'"
         class="operation-item"
         @click="modifyPriceClk()"
       >
@@ -372,7 +372,7 @@
       </div>
       <!-- 屏蔽/展示商品 -->
       <div
-        v-if="controlList.includes('C13')"
+        v-if="controlList.includes('C13') && device.equimentType != 'SBM10'"
         class="operation-item"
         @click="showGoodsClk()"
       >
@@ -614,7 +614,7 @@
         </div>
       </div>
       <!-- 商品管理 -->
-      <div v-if="user.type == 0" class="operation-item" @click="goodsManClk()">
+      <div v-if="device.equimentType == 'SBM10'" class="operation-item" @click="goodsManClk()">
         <div class="icon-wrapper">
           <img
             class="operation-icon"
@@ -644,9 +644,6 @@ import { onMounted, ref, onBeforeUnmount } from "vue";
 import {
   setFurnace,
   sleepEquipment,
-  // openDoor,
-  // Api_openDoor,
-  // deviceTuoji,
   offline,
   delOneDevice,
   updateLockStatus,
@@ -955,7 +952,17 @@ export default {
     };
     // 定时开关
     const alarmClock = () => {
-      router.push({ path: "alarmClock", query: { deviceId: device.value.id } });
+      if (user.type === 0) {
+        router.push({
+          path: "newAlarmClock",
+          query: { deviceId: device.value.id, clientId: device.value.clientId },
+        });
+      } else {
+        router.push({
+          path: "alarmClock",
+          query: { deviceId: device.value.id, clientId: device.value.clientId },
+        });
+      }
     };
     // 跳转 - 设备充值
     const recharge = () => {

src/views/device/paramsSet/paramsSetInfo.vue

@@ -296,6 +296,7 @@ export default {
         id: deviceId,
         name: item.name,
         val: item.val,
+        code: route.query.type,
       };
       showConfirmDialog({
         title: t("device.tips"),
@@ -323,6 +324,7 @@ export default {
         id: deviceId,
         name: item.name,
         val: item.val == "0" ? "1" : "0",
+        code: route.query.type,
       };
       showConfirmDialog({
         title: t("device.tips"),