Merge branch 'main' of http://39.98.89.94:3000/xiaoguo75131/PVDEMCS

PVDEMCSUI/src/api/device/model/device.ts

@@ -11,7 +11,7 @@ export class DeivceEntity {
   deviceCode!: string; // 控制器编号
   deviceName!: string; // 控制器名称
   activated!: boolean; // 控制器状态,1：启用，0：停用
-  protocol!: string; // 控制器协议:PLC,HTTP,Socket
+  protocol!: string; // 控制器类型
   host!: string; // 控制器主机地址
   port!: number; // 控制器主机端口
   remark!: string; // 备注

PVDEMCSUI/src/pages/device/components/devicePointDialog.vue

@@ -165,7 +165,7 @@ const deviceInfo = ref();
 const equipmentTypeList = ref([
     { label: 'Ionbond', value: 'Ionbond' },
     { label: 'Balzers', value: 'Balzers' },
-    { label: 'Cemecon', value: 'Cemecon' },
+    { label: 'CemeCon', value: 'CemeCon' },
 ])
 const activatedList = ref([
     { label: '停用', value: false },

PVDEMCSUI/src/pages/device/components/equipmentDialog.vue

@@ -89,7 +89,7 @@ const emit = defineEmits(['returnEquipment']);
 const equipmentTypeList = ref([
     { label: 'Ionbond', value: 'Ionbond' },
     { label: 'Balzers', value: 'Balzers' },
-    { label: 'Cemecon', value: 'Cemecon' },
+    { label: 'CemeCon', value: 'CemeCon' },
 ])
 const activatedList = ref([
     { label: '停用', value: false },

PVDEMCSUI/src/pages/equipment/components/addOrEditDialog.vue

@@ -58,7 +58,7 @@ const emit = defineEmits(['refresh']);
 const equipmentTypeList = ref([
     { label: 'Ionbond', value: 'Ionbond' },
     { label: 'Balzers', value: 'Balzers' },
-    { label: 'Cemecon', value: 'Cemecon' },
+    { label: 'CemeCon', value: 'CemeCon' },
 ])
 
 const activatedList = ref([

PVDEMCSUI/src/pages/equipment/index.vue

@@ -106,7 +106,7 @@ import helper from 'src/Utils/helper';
 const equipmentTypeList = ref([
     { label: 'Ionbond', value: 'Ionbond' },
     { label: 'Balzers', value: 'Balzers' },
-    { label: 'Cemecon', value: 'Cemecon' },
+    { label: 'CemeCon', value: 'CemeCon' },
 ])
 const activatedList = ref([
     { label: '停用', value: false },