无线点阵屏调试多语言及其他优化

languages/en.js

@@ -930,7 +930,8 @@ module.exports = {
     channelImHistoryStoreDays: 'The number of days that channel messages are retained',
     recordEnabled: 'Turn on the audio and video recording function',
     recordAble: 'Turn on the audio and video recording function',
-    screenLight: 'Turn on screen bright and triggers the function'
+    screenLight: 'Turn on screen bright and triggers the function',
+    boolAllDoorStatus: 'Enable all doorstep call displays'
   },
   role: {
     roleName: 'Role name',
@@ -1262,5 +1263,24 @@ module.exports = {
     titleRequire:'Screen title cannot be empty',
     createTitle:'New information board custom screen',
     editTitle:'Edit information board custom screen'
+  },
+  s433Led: {
+    s433Led: "433LED",
+    model: 'model',
+    inspectionTime: "Inspection Time",
+    screenGinseng: 'Screen ginseng',
+    customData: "Custom Data",
+    duBug: "duBug",
+    clearDisplay: "Clear display",
+    helloWord: 'Hello World',
+    batchTx: 'Bulk Send',
+    wait: 'Waiting to be sent',
+    waitingForReturn: 'waiting for return',
+    return: 'Complete the process',
+    failInSend: 'fail in send',
+    returnTimeout: 'Return timeout',
+    send: 'send',
+    noOnline: 'The conversion box is not online',
+    add433Box: 'Please add a 433 conversion box first'
   }
 }

languages/es.js

@@ -931,7 +931,8 @@ module.exports = {
     channelImHistoryStoreDays: 'El número de días que se retienen los mensajes del canal',
     recordEnabled: 'Active la función de grabación de audio y video',
     recordAble: 'Active la función de grabación de audio y video',
-    screenLight: 'Enciende la pantalla y activa la función'
+    screenLight: 'Enciende la pantalla y activa la función',
+    boolAllDoorStatus: 'Activar la visualización de llamadas en todas las puertas'
   },
   role: {
     roleName: 'Nombre de la función',
@@ -1263,5 +1264,24 @@ module.exports = {
     titleRequire:'El título de la pantalla no puede estar vacío',
     createTitle:'Nueva pantalla personalizada de la Junta de información',
     editTitle:'Editar la pantalla personalizada del tablero de información'
+  },
+  s433Led: {
+    s433Led: "433LED",
+    model: 'Modelo',
+    inspectionTime: "Tiempo de Inspección",
+    screenGinseng: 'Ginseng de pantalla',
+    customData: "Datos personalizados",
+    duBug: "Dubuge",
+    clearDisplay: "Mostrar claramente",
+    helloWord: 'Hola, mundo',
+    batchTx: 'Envío por lotes',
+    wait: 'Esperando el envío',
+    waitingForReturn: 'Esperando el regreso',
+    return: 'Completar el proceso',
+    failInSend: 'Falló el envío',
+    returnTimeout: 'Tiempo de retorno',
+    send: 'Correo',
+    noOnline: 'La Caja de conversión no está en línea',
+    add433Box: 'Por favor, agregue primero un cuadro de conversión 433'
   }
 }

languages/zh-CN.js

@@ -930,7 +930,8 @@ module.exports = {
     channelImHistoryStoreDays: '频道留言保留天数',
     recordEnabled: '开启录音录像功能',
     recordAble: '开启录音录像功能',
-    screenLight: '开启按钮亮屏并触发功能'
+    screenLight: '开启按钮亮屏并触发功能',
+    boolAllDoorStatus: '开启所有门口机呼显示'
   },
   role: {
     roleName: '角色名称',
@@ -1265,5 +1266,24 @@ module.exports = {
     titleRequire:'屏幕标题不能为空',
     createTitle:'新增看板自定义屏',
     editTitle:'编辑自定义看板屏'
+  },
+  s433Led: {
+    s433Led: "无线点阵屏",
+    model: '模式',
+    inspectionTime: "校验时间",
+    screenGinseng: '屏参',
+    customData: "自定义数据",
+    duBug: "调试",
+    clearDisplay: "清空显示",
+    helloWord: '你好世界',
+    batchTx: '批量发送',
+    wait: '等待发送',
+    waitingForReturn: '发送成功等待返回',
+    return: '已返回完成流程',
+    failInSend: '发送失败',
+    returnTimeout: '返回超时',
+    send: '发送',
+    noOnline: '该转换盒不在线',
+    add433Box: '请先添加433转换盒'
   }
 }

package.json

@@ -93,7 +93,8 @@
     "serve-static": "1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
-    "vue-template-compiler": "2.6.10"
+    "vue-template-compiler": "2.6.10",
+    "exports-loader": "^1.1.0"
   },
   "browserslist": [
     "> 1%",

src/router/index.js

@@ -602,7 +602,7 @@ export const partRoutes = [
         path: 'index',
         component: () => import('@/views/calling-setting/index'),
         name: 'CallingSetting',
-        meta: { title: i18n.t('tab.partSetting'), icon: 'el-icon-s-tools', noCache: true }
+        meta: { title: i18n.t('tab.partSetting'), icon: 'el-icon-s-tools', noCache: true } // 机构设置
       }
     ]
   },

src/views/ncs-device/components/deviceManager.vue

@@ -987,7 +987,8 @@
                     priority: 1,
                     code: 'C' + parseInt(Math.random() * 100000),
                     model: 'M' + parseInt(Math.random() * 100000),
-                    status: 1
+                    status: 1,
+                    name: ''
                 }
                 this.sosDeviceSetting = {
                     type: 0,

src/views/ncs-led/ledManager.vue

@@ -1,26 +1,26 @@
 <template>
   <div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane name="s433" label="无线点阵屏"></el-tab-pane>
-      <el-tab-pane name="led" label="LED点阵屏"></el-tab-pane>
+      <el-tab-pane name="s433" :label="$t('s433Led.s433Led')"></el-tab-pane>
+      <el-tab-pane name="led" :label="$t('deviceType.LED_SCREEN')"></el-tab-pane>
     </el-tabs>
     <div v-if="activeName === 's433'">
       <el-form ref="myForm" :rules="rules" label-width="90px" :model="s433FormModel">
         <el-row>
-          <el-form-item label="模式">
+          <el-form-item :label="$t('s433Led.model')">
             <el-radio-group v-model="s433FormModel.type" size="mini" prop="unit">
-              <el-radio :label="4">校验时间</el-radio>
-              <el-radio :label="0">屏参</el-radio>
-              <el-radio :label="1">自定义数据</el-radio>
-              <el-radio :label="2">调试</el-radio>
-              <el-radio :label="3">清空显示</el-radio>
+              <el-radio :label="4">{{ $t('s433Led.inspectionTime') }}</el-radio>
+              <el-radio :label="0">{{ $t('s433Led.screenGinseng') }}</el-radio>
+              <el-radio :label="1">{{ $t('s433Led.customData') }}</el-radio>
+              <el-radio :label="2">{{ $t('s433Led.duBug')}}</el-radio>
+              <el-radio :label="3">{{ $t('s433Led.clearDisplay') }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-row>
         <el-row v-if="s433FormModel.type === 0">
           <el-col :span="8">
             <el-form-item :label="this.$t('deviceManage.ledResolutionRatio')" prop="ledStyle">
-              <el-input v-model="s433FormModel.ledStyle" clearable placeholder="128*32" />
+              <el-input v-model="s433FormModel.ledStyle" clearable placeholder="128*32" :maxlength="20" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -31,8 +31,8 @@
         </el-row>
         <el-row v-else-if="s433FormModel.type === 1">
           <el-col :span="12">
-            <el-form-item label="自定义数据">
-              <el-input v-model="s433FormModel.title" placeholder="你好世界" :maxlength="50"/>
+            <el-form-item label="$t('s433Led.customData')">
+              <el-input v-model="s433FormModel.title" :placeholder="$t('s433Led.helloWord')" :maxlength="20"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -47,7 +47,7 @@
             </el-option>
           </el-select>
 <!--          <el-button :disabled="multipleSelection.length === 0 && s433FormModel.boxMac != null" type="primary" @click="clickSend(4)">校验时间</el-button>-->
-          <el-button :disabled="multipleSelection.length === 0 && s433FormModel.boxMac != null" type="success" @click="sendChange">批量发送</el-button>
+          <el-button :disabled="multipleSelection.length === 0 && s433FormModel.boxMac != null" type="success" @click="sendChange">{{ $t('s433Led.batchTx') }}</el-button>
 <!--          <el-button :disabled="s433FormModel.boxMac != null" type="info" @click="clickSend">清空所有显示</el-button>-->
         </div>
         <el-table :data="s433DeviceList" id="myTableId" stripe border style="width: 100%" ref="refTable"
@@ -59,17 +59,17 @@
           <el-table-column prop="receive_time" label="流程耗时" width="130" align="center"/>
           <el-table-column prop="state" label="状态" width="140" align="center">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.state === 0" type="warning" disable-transitions>等待发送</el-tag>
-              <el-tag v-if="scope.row.state === 1" type="primary" disable-transitions>发送成功等待返回</el-tag>
-              <el-tag v-if="scope.row.state === 2" type="success" disable-transitions>已返回完成流程</el-tag>
-              <el-tag v-if="scope.row.state === -1" type="danger" disable-transitions>发送失败</el-tag>
-              <el-tag v-if="scope.row.state === -2" type="danger" disable-transitions>返回超时</el-tag>
+              <el-tag v-if="scope.row.state === 0" type="warning" disable-transitions>{{ $t('s433Led.wait') }}</el-tag>
+              <el-tag v-if="scope.row.state === 1" type="primary" disable-transitions>{{ $t('s433Led.waitingForReturn') }}</el-tag>
+              <el-tag v-if="scope.row.state === 2" type="success" disable-transitions>{{ $t('s433Led.return') }}</el-tag>
+              <el-tag v-if="scope.row.state === -1" type="danger" disable-transitions>{{ $t('s433Led.failInSend') }}</el-tag>
+              <el-tag v-if="scope.row.state === -2" type="danger" disable-transitions>{{ $t('s433Led.returnTimeout') }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column style="text-align: left;" label="操作" width="120" fixed="right">
+          <el-table-column style="text-align: left;" :label=" $t('action.handle')" width="120" fixed="right">
             <template slot-scope="scope">
               <el-button type="success" size="mini" @click="handlerEdit(scope.$index, scope.row)">
-                发送
+                {{ $t('s433Led.send') }}
               </el-button>
             </template>
           </el-table-column>
@@ -162,7 +162,7 @@ export default {
         type: 4,
         ledStyle: '128*32',
         ledSize: 16,
-        title: '你好世界',
+        title: this.$t('s433Led.helloWord'),
         boxMac: null,
         macs: null,
         partId: this.$store.getters.partId
@@ -200,7 +200,7 @@ export default {
       const data = JSON.parse(e.data)
       console.log('收到消息：', data)
       if (data.status === -1) {
-        this.$message.error('该转换盒不在线！')
+        this.$message.error(this.$t('s433Led.noOnline'))
         return
       }
       const index = this.s433DeviceList.findIndex(p => p.eth_mac.toLowerCase() === data.mac.toLowerCase())
@@ -305,7 +305,7 @@ export default {
         if (this.boxList.length > 0) {
           this.s433FormModel.boxMac = this.boxList[0].eth_mac
         } else {
-          this.$message.info('请先添加433转换盒！')
+          this.$message.info(this.$t('s433Led.add433Box'))
         }
       })
     },

src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -335,6 +335,11 @@
                 <el-checkbox v-model="formmodel.screen_light" :true-label="1" :false-label="0">{{ this.$t('partInfo.screenLight') }}</el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.boolAllDoorStatus')">
+                <el-checkbox v-model="formmodel.bool_all_door_status" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
 
 
@@ -692,7 +697,8 @@ export default {
                 two_color_door_light_valid: 0,
                 customize_hospital_call_first: 0,
                 customize_hospital_call_second: 0,
-                customize_hospital_call_third: 0
+                customize_hospital_call_third: 0,
+                bool_all_door_status: 0
               }
             }
           } else {