Browse Source

Merge branch 'develop' into feature/2024-12-04-ning

wuyunfeng 6 months ago
parent
commit
f213082097

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


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


+ 2 - 1
src/utils/enum/DeviceButtonTypeEnum.js

@@ -7,6 +7,7 @@ export const DEVICE_BUTTON_TYPE = createEnum(
     VOICE: ['VOICE', i18n.t('tcpType.VOICE')],
     EVENT: ['EVENT', i18n.t('tcpType.EVENT')],
     REINFORCE: ['REINFORCE', i18n.t('tcpType.REINFORCE')],
-    NURSING: ['NURSING', i18n.t('tcpType.SIDE')]
+    NURSING: ['NURSING', i18n.t('tcpType.SIDE')],
+    BLUE_CODE: ['BLUE_CODE', 'Blue Code']
   }
 )

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

@@ -816,6 +816,7 @@
                   <el-option v-else-if="item.type === deviceButtonType.EVENT" v-for="(keyItem, keyIndex) in deviceButtonEventTransfer" :key="keyIndex" :label="keyItem.key" :value="keyItem.value"/>
                   <el-option v-else-if="item.type === deviceButtonType.REINFORCE" v-for="(keyItem, keyIndex) in deviceButtonReinforceTransfer" :key="keyIndex" :label="keyItem.key" :value="keyItem.value"/>
                   <el-option v-else-if="item.type === deviceButtonType.NURSING" v-for="(keyItem, keyIndex) in deviceButtonNursingTransfer" :key="keyIndex" :label="keyItem.key" :value="keyItem.value"/>
+                  <el-option v-else-if="item.type === deviceButtonType.BLUE_CODE" v-for="(keyItem, keyIndex) in deviceButtonBlueCodeTransfer" :key="keyIndex" :label="keyItem.key" :value="keyItem.value"/>
                 </el-select>
               </el-col>
               <el-col :span="3" style="margin: auto">
@@ -949,6 +950,9 @@ export default {
         { key : this.$t('zy20240611.MINUTE60'), value : 60 },
         { key : this.$t('zy20240611.MINUTE90'), value : 90 },
         { key : this.$t('zy20240611.MINUTE120'), value : 120 }
+      ],
+      deviceButtonBlueCodeTransfer: [
+        { key : 'Blue Code', value : 'BLUE_CODE' }
       ]
     }
   },