[FEAT]:

1.将控制器协议 改为 控制器系列
2.将备注字段去除 必填校验

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

@@ -51,8 +51,7 @@
                                 :options="activatedList" emit-value map-options label="PLC点位是否启用" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
-                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注"
+                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注" />
-                                :rules="[(val) => (val && val.length > 0) || '请填写备注']" />
                         </div>
                     </div>
                 </q-form>

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

@@ -31,7 +31,7 @@
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
                             <q-select class="text-h6" outlined v-model="addOrEditFormData.protocol" :options="protocolList"
-                                emit-value map-options label="控制器协议"
+                                emit-value map-options label="控制器系列"
                                 :rules="[(val) => (val && val.length > 0) || '请选择控制器协议']" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
@@ -39,8 +39,7 @@
                                 :options="activatedList" emit-value map-options label="控制器状态" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
-                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注"
+                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注" />
-                                :rules="[(val) => (val && val.length > 0) || '请填写备注']" />
                         </div>
                     </div>
                 </q-form>
@@ -65,9 +64,12 @@ import { ref } from 'vue';
 const emit = defineEmits(['refresh']);
 
 const protocolList = ref([
-    { label: 'PLC', value: 'PLC' },
+    { label: 'S7_1200', value: 'S7_1200' },
-    { label: 'HTTP', value: 'HTTP' },
+    { label: 'S7_300', value: 'S7_300' },
-    { label: 'Socket', value: 'Socket' },
+    { label: 'S7_400', value: 'S7_400' },
+    { label: 'S7_1500', value: 'S7_1500' },
+    { label: 'S7_200Smart', value: 'S7_200Smart' },
+    { label: 'S7_200', value: 'S7_200' }
 ])
 
 const activatedList = ref([

PVDEMCSUI/src/pages/device/index.vue

@@ -133,7 +133,7 @@ const columns = ref([
         headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;',
     },
     { name: 'deviceName', align: 'center', label: '控制器名称', field: 'deviceName', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
-    { name: 'protocol', align: 'center', label: '控制器协议', field: 'protocol', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
+    { name: 'protocol', align: 'center', label: '控制器系列', field: 'protocol', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'host', align: 'center', label: '控制器主机地址', field: 'host', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'port', align: 'center', label: '控制器主机端口', field: 'port', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },
     { name: 'activated', align: 'center', label: '控制器状态', field: 'activated', headerStyle: 'background-color: #5186ec;color: white;font-weight: bold;font-size:20px;' },

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

@@ -31,8 +31,7 @@
                                 :options="activatedList" emit-value map-options label="设备启停用" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
-                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注"
+                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注" />
-                                :rules="[(val) => (val && val.length > 0) || '请填写备注']" />
                         </div>
                     </div>
                 </q-form>

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

@@ -31,8 +31,7 @@
                                 :rules="[(val) => (val && val.length > 0) || '请选择系统内置']" />
                         </div>
                         <div class="col-xl-6 col-lg-12 col-sm-12">
-                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注"
+                            <q-input class="text-h6" outlined v-model="addOrEditFormData.remark" label="备注" />
-                                :rules="[(val) => (val && val.length > 0) || '请填写备注']" />
                         </div>
                     </div>
                 </q-form>