feat：“添加冰淇淋SI320机型”

src/assets/language/en.json

@@ -367,6 +367,7 @@
     "clickSearch": "Click search",
     "spunSugar": "Cotton candy",
     "popcorn": "Pop corn",
+    "iceCream": "Ice cream",
     "sz": "Sunzee",
     "sc": "Sevencloud",
     "startUp": "Start up",

src/assets/language/zh.json

@@ -368,6 +368,7 @@
     "clickSearch": "点击搜索",
     "spunSugar": "棉花糖",
     "popcorn": "爆米花",
+    "iceCream": "冰淇淋",    
     "sz": "申泽",
     "sc": "七云",
     "startUp": "开机",

src/views/device/deviceOper.vue

@@ -19,8 +19,8 @@
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/restart.png" />
         </div>
-        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.restart") }}</div>
-        <div v-else class="operText">{{ $t("device.restartFurnaceHead") }}</div>
+        <div v-if="device.machineType === '0' || device.machineType === null" class="operText">{{ $t("device.restartFurnaceHead") }}</div>
+        <div v-else class="operText">{{ $t("device.restart") }}</div>
       </div>
       <!-- 睡眠 -->
       <div class="operItem" @click="sleepEquipmentFun()">
@@ -35,16 +35,16 @@
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
         </div>
-        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.openDevice") }}</div>
-        <div v-else class="operText">{{ $t("device.openFurnHead") }}</div>
+        <div v-if="device.machineType === '0' || device.machineType === null" class="operText">{{ $t("device.openFurnHead") }}</div>
+        <div v-else class="operText">{{ $t("device.openDevice") }}</div>
       </div>
       <!-- 关闭炉头/设备 -->
       <div class="operItem" @click="openOffFurnace(0)">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
         </div>
-        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.closeDevice") }}</div>
-        <div v-else class="operText">{{ $t("device.closeFurnHead") }}</div>
+        <div v-if="device.machineType === '0' || device.machineType === null" class="operText">{{ $t("device.closeFurnHead") }}</div>
+        <div v-else class="operText">{{ $t("device.closeDevice") }}</div>
       </div>
       <!--     <div class="operItem" @click="openDoorFun()">
               <div class="operIcon">
@@ -64,21 +64,22 @@
         <div class="operText">{{ $t("device.remoteDoorOpening") }}</div>
       </div>
       <!-- 远程做糖 -->
-      <div class="operItem" @click="doSugar()">
+      <div class="operItem" @click="doSugar()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/doSugar.png" />
         </div>
-        <div v-if="device.machineType === '1'" class="operText">{{ $t("device.remoteProduction") }}</div>
-        <div v-else class="operText">{{ $t("device.remoteSugarMaking") }}</div>
+        <div v-if="device.machineType === '0' || device.machineType === null" class="operText">{{ $t("device.remoteSugarMaking") }}</div>
+        <div v-else class="operText">{{ $t("device.remoteProduction") }}</div>
       </div>
       <!-- 定时开关 -->
-      <div class="operItem" @click="alarmClock()">
+      <div class="operItem" @click="alarmClock()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/alarmClock.png" />
         </div>
         <div class="operText">{{ $t("device.timeSwitch") }}</div>
       </div>
-      <div class="operItem" @click="modulation()">
+      <!-- 音量调节 -->
+      <div class="operItem" @click="modulation()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/modulation.png" />
         </div>
@@ -90,7 +91,7 @@
         </div>
         <div class="operText">{{ $t("device.equipmentRecharge") }}</div>
       </div> -->
-      <div class="operItem" @click="paramSetPush()">
+      <div class="operItem" @click="paramSetPush()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/paramsSet.png" />
         </div>
@@ -115,7 +116,7 @@
         <div class="operText">{{ $t("device.modifyPrice") }}</div>
       </div>
       <!-- 物料监控 -->
-      <div class="operItem" @click="materialMonitorClk()">
+      <div class="operItem" @click="materialMonitorClk()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <!-- <img v-if="materialIcon === '0'" class="operImg" src="../../assets/device/operIcon/materialMonitor.png" />
           <img v-else class="operImg" src="../../assets/device/operIcon/materialMonitorOff.png" /> -->
@@ -125,7 +126,7 @@
         <!-- <div class="operText">{{ materialTitle }}</div> -->
       </div>
       <!-- 屏蔽/展示商品 -->
-      <div class="operItem" @click="showGoodsClk()">
+      <div class="operItem" @click="showGoodsClk()" v-if="device.equimentType != 'SI320'">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/showGoods.png" />
         </div>

src/views/device/deviceSearch.vue

@@ -148,6 +148,10 @@ export default {
       {
         text: t('device.popcorn'),
         value: '1',
+      },
+      {
+        text: t('device.iceCream'),
+        value: '2',
       }
     ]); // 设备类型级联选项
     const companyTypeOptions = ref([
@@ -192,6 +196,10 @@ export default {
       {
         text: 'P30',
         value: 'P30',
+      },
+      {
+        text: 'SI320',
+        value: 'SI320',
       }
     ]); // 设备机型级联选项
     const equimentTypeFinish = ({ selectedOptions }) => {

src/views/device/index.vue

@@ -171,7 +171,7 @@
                       item.cabinetHd
                     }}{{ $t("device.humidity") }}</van-col>
                   </van-row>
-                  <van-row class="layer5 o-pt-7 kBordBott" justify="space-between" v-else>
+                  <van-row class="layer5 o-pt-7 kBordBott" justify="space-between" v-if="item.machineType == '1'">
                     <van-col class="word5" style="margin-bottom: 12px;">{{ $t("device.stirringTemperature") }}：{{
                       item.stirTm
                     }}{{ $t("device.degree") }}</van-col>
@@ -221,7 +221,9 @@
                   <span class="info1 o-ptb-7 kBordBott">{{ $t("device.lastRefreshTime") }}：{{
                     showDateTime(item.lastUpdateTime)
                   }}</span>
-                  <span class="info2 o-ptb-7 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
+                  <!-- 音量 -->
+                  <span v-if="item.machineType != '2'" class="info2 o-ptb-7 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
+                  <!-- 报警内容 -->
                   <div class="l-flex-RC o-ptb-7">
                     <span class="info3 kBordBott">{{ $t("device.alarmContent") }}：</span>
                     <div class="info4 l-flex-RC">