Bladeren bron

科室设置增加串口配置

vothin 1 jaar geleden
bovenliggende
commit
77ca3551ac

File diff suppressed because it is too large
+ 1 - 1
dist/index.html


+ 14 - 1
languages/en.js

@@ -1602,6 +1602,19 @@ module.exports = {
     S433_BJMD: 'Alarm door light'
   },
   zy20240205: {
-    linuxPortraitDoor: 'Linux vertical screen doorstep machine'
+    linuxPortraitDoor: 'Linux vertical screen doorstep machine',
+    ENABLE: 'Not turned on',
+    PANEL_BUTTON: 'Panel buttons',
+    S433_BUTTON: '433 button',
+    MULTIFUNCTIONAL_BUTTON: 'Multi function button',
+    SLEEP_MATTRESS: 'Sleep mattress',
+    NFC: 'NFC functionality',
+    linuxSerial1: 'Linux serial port 1',
+    linuxSerial2: 'Linux serial port 2',
+    linuxSerial3: 'Linux serial port 3',
+    androidSerial1: 'Android serial port 1',
+    androidSerial2: 'Android serial port 2',
+    androidSerial3: 'Android serial port 3',
+    choiceSerial: 'Select serial port'
   }
 }

+ 14 - 1
languages/es.js

@@ -1602,6 +1602,19 @@ module.exports = {
     S433_BJMD: 'Luz de la puerta de alarma'
   },
   zy20240205: {
-    linuxPortraitDoor: 'Máquina de puerta de pantalla vertical de Linux'
+    linuxPortraitDoor: 'Máquina de puerta de pantalla vertical de Linux',
+    ENABLE: 'No abrir',
+    PANEL_BUTTON: 'Botón del panel',
+    S433_BUTTON: 'Botón 433',
+    MULTIFUNCTIONAL_BUTTON: 'Botón multifuncional',
+    SLEEP_MATTRESS: 'Colchón para dormir',
+    NFC: 'Función NFC',
+    linuxSerial1: 'Puerto serie de Linux 1',
+    linuxSerial2: 'Puerto serie de Linux 2',
+    linuxSerial3: 'Puerto serie de Linux 3',
+    androidSerial1: 'Puerto serie Android 1',
+    androidSerial2: 'Puerto serie Android 2',
+    androidSerial3: 'Puerto serie Android 3',
+    choiceSerial: 'Seleccionar puerto serie'
   }
 }

+ 14 - 1
languages/ru-RU.js

@@ -1602,6 +1602,19 @@ module.exports = {
     S433_BJMD: 'Сигнализация дверей'
   },
   zy20240205: {
-    linuxPortraitDoor: 'Устройство Linux с вертикальным экраном'
+    linuxPortraitDoor: 'Устройство Linux с вертикальным экраном',
+    ENABLE: 'Не открывать',
+    PANEL_BUTTON: 'Кнопка панели',
+    S433_BUTTON: 'Кнопка 433',
+    MULTIFUNCTIONAL_BUTTON: 'Многофункциональная кнопка',
+    SLEEP_MATTRESS: 'Матрас для сна',
+    NFC: 'Функции NFC',
+    linuxSerial1: 'Установка Linux 1',
+    linuxSerial2: 'Установка Linux 2',
+    linuxSerial3: 'Установка Linux 3',
+    androidSerial1: 'Андроид 1',
+    androidSerial2: 'Андроид 2',
+    androidSerial3: 'Андроид 3',
+    choiceSerial: 'Выберите последовательный порт'
   }
 }

+ 14 - 1
languages/zh-CN.js

@@ -1602,6 +1602,19 @@ module.exports = {
     S433_BJMD: '报警门灯'
   },
   zy20240205: {
-    linuxPortraitDoor: 'Linux竖屏门口机IMG'
+    linuxPortraitDoor: 'Linux竖屏门口机IMG',
+    ENABLE: '不开启',
+    PANEL_BUTTON: '面板按钮',
+    S433_BUTTON: '433按钮',
+    MULTIFUNCTIONAL_BUTTON: '多功能按钮',
+    SLEEP_MATTRESS: '睡眠床垫',
+    NFC: 'nfc功能',
+    linuxSerial1: 'linux串口1',
+    linuxSerial2: 'linux串口2',
+    linuxSerial3: 'linux串口3',
+    androidSerial1: '安卓串口1',
+    androidSerial2: '安卓串口2',
+    androidSerial3: '安卓串口3',
+    choiceSerial: '选择串口'
   }
 }

File diff suppressed because it is too large
+ 4 - 4
src/utils/domain.js


+ 13 - 0
src/utils/enum/SerialTypeEnum.js

@@ -0,0 +1,13 @@
+import createEnum from '@/utils/enum/createEnum'
+import i18n from '@/utils/i18n'
+
+export const SERIAL_TYPE = createEnum(
+  {
+    ENABLE: ['ENABLE', i18n.t('zy20240205.ENABLE')],
+    PANEL_BUTTON: ['PANEL_BUTTON', i18n.t('zy20240205.PANEL_BUTTON')],
+    S433_BUTTON: ['S433_BUTTON', i18n.t('zy20240205.S433_BUTTON')],
+    MULTIFUNCTIONAL_BUTTON: ['MULTIFUNCTIONAL_BUTTON', i18n.t('zy20240205.MULTIFUNCTIONAL_BUTTON')],
+    SLEEP_MATTRESS: ['SLEEP_MATTRESS', i18n.t('zy20240205.SLEEP_MATTRESS')],
+    NFC: ['NFC', i18n.t('zy20240205.NFC')]
+  }
+)

+ 58 - 0
src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -692,6 +692,62 @@
             </el-col>
           </el-row>
 
+          <el-row v-if="isShow">
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.linuxSerial1')" prop="linux_serial1">
+                <el-select v-model="formmodel.linux_serial1"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.linuxSerial2')" prop="linux_serial2">
+                <el-select v-model="formmodel.linux_serial2"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.linuxSerial3')" prop="linux_serial3">
+                <el-select v-model="formmodel.linux_serial3"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.androidSerial1')" prop="android_serial1">
+                <el-select v-model="formmodel.android_serial1"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.androidSerial2')" prop="android_serial2">
+                <el-select v-model="formmodel.android_serial2"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('zy20240205.androidSerial3')" prop="android_serial3">
+                <el-select v-model="formmodel.android_serial3"
+                           :placeholder="this.$t('zy20240205.choiceSerial')">
+                  <el-option v-for="(item,index) in serialType" :key="index" :label="item.key" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.iotProductId')">
@@ -764,6 +820,7 @@ import * as API_SystemConfig from '@/api/ncs_systemconfig'
 import * as API_Device from '@/api/ncs_device'
 import * as API_Excel from "@/api/ncs_excel";
 import moment from  'moment'
+import {SERIAL_TYPE} from "@/utils/enum/SerialTypeEnum";
 const serverUrl = domain.serverUrl
 const DeviceUrl = domain.DeviceUrl
 export default {
@@ -798,6 +855,7 @@ export default {
       imageUrl: '',
       excelUploadUrl: DeviceUrl + '/ncs/excel/upload/' + this.partId,
       excelUploadDemo: serverUrl + '/upload/excel/demo/excel_demo.xlsx',
+      serialType: SERIAL_TYPE.getKeyValueList(),
     }
   },
   async mounted() {