1、无线点阵屏优化；

2、病危标识开发；
3、其他优化

languages/en.js

@@ -735,7 +735,8 @@ module.exports = {
     inputOptionName: 'Please enter the name of the nursing item',
     optionColor: 'Care lamp color',
     colorRgb: 'Color ID',
-    basic: 'Basic Nursing Information'
+    basic: 'Basic Nursing Information',
+    boolCritical: 'Critical Illness Identification'
   },
   board: {
     boardSet: 'Set information board',
@@ -1285,6 +1286,7 @@ module.exports = {
     returnTimeout: 'Return timeout',
     send: 'send',
     noOnline: 'The conversion box is not online',
-    add433Box: 'Please add a 433 conversion box first'
+    add433Box: 'Please add a 433 conversion box first',
+    volumeControl: 'volume control'
   }
 }

languages/es.js

@@ -736,7 +736,8 @@ module.exports = {
     inputOptionName: 'Ingrese el nombre del artículo de enfermería',
     optionColor: 'Color de la lámpara de cuidado',
     colorRgb: 'Identificación de color',
-    basic: 'Información Básica de Enfermería'
+    basic: 'Información Básica de Enfermería',
+    boolCritical: 'Identificación de enfermedades importantes'
   },
   board: {
     boardSet: 'Establecer tablero de información',
@@ -1286,6 +1287,7 @@ module.exports = {
     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'
+    add433Box: 'Por favor, agregue primero un cuadro de conversión 433',
+    volumeControl: 'Control de volumen'
   }
 }

languages/zh-CN.js

@@ -737,7 +737,8 @@ module.exports = {
     inputOptionName: '请输入护理项名称',
     optionColor: '护理灯颜色',
     colorRgb: '颜色标识',
-    basic: '基本护理信息'
+    basic: '基本护理信息',
+    boolCritical: '病危标识'
   },
   board: {
     boardSet: '设置看板',
@@ -1289,6 +1290,7 @@ module.exports = {
     returnTimeout: '返回超时',
     send: '发送',
     noOnline: '该转换盒不在线',
-    add433Box: '请先添加433转换盒'
+    add433Box: '请先添加433转换盒',
+    volumeControl: '音量调节'
   }
 }

src/router/index.js

@@ -556,7 +556,7 @@ export const partRoutes = [
         path: '/interaction-chain/index',
         component: () => import('@/views/interaction-chain/index'),
         name: 'interactionChain',
-        meta: { title: i18n.t('tab.interactionChain'), icon: 'squence', noCache: true }
+        meta: { title: i18n.t('tab.interactionChain'), icon: 'squence', noCache: true } // 交互接收顺序
       },
       {
         path: '/countdonw/index',

src/views/customer/myMap.vue

@@ -65,9 +65,9 @@ name: "wyMap",
 
     },
     clickMap(e) {
-      console.log('点击的经纬度：' + e.Bg.lng + ', ' + e.Bg.lat)
-      this.myCenter.lng = e.Bg.lng
-      this.myCenter.lat = e.Bg.lat
+      console.log('点击的经纬度：' + e.point.lng + ', ' + e.point.lat)
+      this.myCenter.lng = e.point.lng
+      this.myCenter.lat = e.point.lat
       this.isShow = true
       let _this = this
       this.$confirm('确定要选择这个地方吗', this.$t('action.waring'), {
@@ -75,7 +75,7 @@ name: "wyMap",
         cancelButtonText: this.$t('action.cancel'),
         type: 'warning'
       }).then(() => {
-        const lngLat = e.Bg.lng + ',' + e.Bg.lat
+        const lngLat = e.point.lng + ',' + e.point.lat
         _this.$emit('childFn', lngLat);
       })
     },
@@ -88,4 +88,4 @@ name: "wyMap",
   width: 100%;
   height: 600px;
 }
-</style>
+</style>

src/views/interaction-chain/index.vue

@@ -76,7 +76,7 @@
                         </el-col>
 
                     </el-row>
-                    <el-row>
+                    <el-row v-if="formmodel.bool_whilst === 0">
                         <el-col :span="24">
                             <h3>{{this.$t('interactionChain.sketchMap')}}</h3>
                             <el-steps  finish-status="success">
@@ -450,7 +450,11 @@
             },
 
             chainFormatter(params){
+              if (params.data.bool_whilst === 1) {
                 return params.value.replaceAll(',','<i class="el-icon-right"></i>')
+              } else {
+                return params.value;
+              }
             },
             firstRoleFormatter(params) {
                 console.log('para', params)

src/views/ncs-485/index.vue

@@ -39,8 +39,6 @@
           </el-button>
         </el-button-group>
 
-
-
       </div>
       <div>
         <el-input v-model="searchDeviceStr" placeholder="输入搜索" clearable @change="clickSearch" style="width: 350px;margin-bottom: 5px">

src/views/ncs-led/ledManager.vue

@@ -28,10 +28,15 @@
               <el-input-number v-model="s433FormModel.ledSize" controls-position="right" :min="0" :max="60" />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('s433Led.volumeControl')">
+              <el-input-number v-model="s433FormModel.volume" :min="1" :max="10"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row v-else-if="s433FormModel.type === 1">
           <el-col :span="12">
-            <el-form-item label="$t('s433Led.customData')">
+            <el-form-item :label="$t('s433Led.customData')">
               <el-input v-model="s433FormModel.title" :placeholder="$t('s433Led.helloWord')" :maxlength="20"/>
             </el-form-item>
           </el-col>
@@ -165,7 +170,8 @@ export default {
         title: this.$t('s433Led.helloWord'),
         boxMac: null,
         macs: null,
-        partId: this.$store.getters.partId
+        partId: this.$store.getters.partId,
+        volume: 5
       },
       boolDestroy: false
     }

src/views/ncs-nurse-config/index.vue

@@ -126,6 +126,9 @@
         <el-form-item  prop="basic">
           <el-checkbox v-model="addForm.basic">{{this.$t('nurseConfig.basic')}}</el-checkbox>
         </el-form-item>
+        <el-form-item>
+          <el-checkbox v-model="addForm.bool_critical">{{this.$t('nurseConfig.boolCritical')}}</el-checkbox>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="addFormVisible = false">{{ this.$t('action.cancel') }}</el-button>