update dms设备模型图片上传、报警规则联动页面优化

src/api/dms/deviceMode/types.ts

@@ -52,6 +52,8 @@ export interface DeviceModeForm extends BaseEntity {
    */
   remark?: string;
 
+  ossId?: string | number;
+
 }
 
 export interface DeviceModeQuery extends PageQuery {

src/components/ImageUpload/index.vue

@@ -196,7 +196,8 @@ const uploadedSuccessfully = () => {
     fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
-    emit('update:modelValue', listToString(fileList.value));
+    // emit('update:modelValue', listToString(fileList.value));
+    emit('update:modelValue', fileList.value);
     proxy?.$modal.closeLoading();
   }
 };

src/views/dms/alarmRuleLink/index.vue

@@ -5,40 +5,24 @@
       <div v-show='showSearch' class='mb-[10px]'>
         <el-card shadow='hover'>
           <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
-            <el-form-item label='报警规则关联ID，主键' prop='ruleLinkId'>
-              <el-input v-model='queryParams.ruleLinkId' placeholder='请输入报警规则关联ID，主键' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='报警规则类型(1=设备报警规则,2=离线报警规则)' prop='alarmRuleType'>
-              <el-select v-model='queryParams.alarmRuleType' placeholder='请选择报警规则类型(1=设备报警规则,2=离线报警规则)' clearable>
-                <el-option v-for='dict in dms_alarm_rule_type' :key='dict.value' :label='dict.label'
-                           :value='dict.value' />
-              </el-select>
-            </el-form-item>
-            <el-form-item label='报警规则ID，关联hw_alarm_rule的alarm_rule_id' prop='alarmRuleId'>
-              <el-input v-model='queryParams.alarmRuleId' placeholder='请输入报警规则ID，关联hw_alarm_rule的alarm_rule_id'
-                        clearable @keyup.enter='handleQuery' />
-            </el-form-item>
+            <!--            <el-form-item label='报警规则类型' prop='alarmRuleType'>-->
+            <!--              <el-select v-model='queryParams.alarmRuleType' placeholder='请选择报警规则类型' clearable>-->
+            <!--                <el-option v-for='dict in dms_alarm_rule_type' :key='dict.value' :label='dict.label'-->
+            <!--                           :value='dict.value' />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
             <el-form-item label='联动类型' prop='linkType'>
               <el-select v-model='queryParams.linkType' placeholder='请选择联动类型' clearable>
                 <el-option v-for='dict in dms_link_type' :key='dict.value' :label='dict.label' :value='dict.value' />
               </el-select>
             </el-form-item>
-            <el-form-item label='联动设备，关联表hw_device字段device_id' prop='linkDeviceId'>
-              <el-input v-model='queryParams.linkDeviceId' placeholder='请输入联动设备，关联表hw_device字段device_id' clearable
+            <el-form-item label='联动设备' prop='linkDeviceId'>
+              <el-input v-model='queryParams.linkDeviceId' placeholder='请输入联动设备' clearable
                         @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label='联动设备功能，关联表hw_device_mode_function字段mode_function_id' prop='linkDeviceFunctionId'>
+            <el-form-item label='联动设备功能' prop='linkDeviceFunctionId' label-width='100px'>
               <el-input v-model='queryParams.linkDeviceFunctionId'
-                        placeholder='请输入联动设备功能，关联表hw_device_mode_function字段mode_function_id' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='标识符' prop='linkDeviceFunctionIdentifier'>
-              <el-input v-model='queryParams.linkDeviceFunctionIdentifier' placeholder='请输入标识符' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='联动设备服务的参数值，json格式保存' prop='linkDeviceFunctionData'>
-              <el-input v-model='queryParams.linkDeviceFunctionData' placeholder='请输入联动设备服务的参数值，json格式保存' clearable
+                        placeholder='请输入联动设备功能' clearable
                         @keyup.enter='handleQuery' />
             </el-form-item>
             <el-form-item>
@@ -79,26 +63,26 @@
 
       <el-table v-loading='loading' :data='alarmRuleLinkList' @selection-change='handleSelectionChange'>
         <el-table-column type='selection' width='55' align='center' />
-        <el-table-column label='报警规则关联ID，主键' align='center' prop='ruleLinkId' v-if='columns[0].visible' />
-        <el-table-column label='报警规则类型(1=设备报警规则,2=离线报警规则)' align='center' prop='alarmRuleType'
+        <el-table-column label='报警规则关联ID' align='center' prop='ruleLinkId' v-if='columns[0].visible' />
+        <el-table-column label='报警规则类型' align='center' prop='alarmRuleType'
                          v-if='columns[1].visible'>
           <template #default='scope'>
             <dict-tag :options='dms_alarm_rule_type' :value='scope.row.alarmRuleType' />
           </template>
         </el-table-column>
-        <el-table-column label='报警规则ID，关联hw_alarm_rule的alarm_rule_id' align='center' prop='alarmRuleId'
+        <el-table-column label='报警规则ID' align='center' prop='alarmRuleId'
                          v-if='columns[2].visible' />
         <el-table-column label='联动类型' align='center' prop='linkType' v-if='columns[3].visible'>
           <template #default='scope'>
             <dict-tag :options='dms_link_type' :value='scope.row.linkType' />
           </template>
         </el-table-column>
-        <el-table-column label='联动设备，关联表hw_device字段device_id' align='center' prop='linkDeviceId'
+        <el-table-column label='联动设备' align='center' prop='linkDeviceId'
                          v-if='columns[4].visible' />
-        <el-table-column label='联动设备功能，关联表hw_device_mode_function字段mode_function_id' align='center'
+        <el-table-column label='联动设备功能' align='center'
                          prop='linkDeviceFunctionId' v-if='columns[5].visible' />
         <el-table-column label='标识符' align='center' prop='linkDeviceFunctionIdentifier' v-if='columns[6].visible' />
-        <el-table-column label='联动设备服务的参数值，json格式保存' align='center' prop='linkDeviceFunctionData'
+        <el-table-column label='联动设备服务参数(json)' align='center' prop='linkDeviceFunctionData'
                          v-if='columns[7].visible' />
         <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
           <template #default='scope'>
@@ -119,11 +103,8 @@
     </el-card>
     <!-- 添加或修改报警规则联动信息对话框 -->
     <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
-      <el-form ref='alarmRuleLinkFormRef' :model='form' :rules='rules' label-width='80px'>
-        <el-form-item label='报警规则关联ID，主键' prop='ruleLinkId'>
-          <el-input v-model='form.ruleLinkId' placeholder='请输入报警规则关联ID，主键' />
-        </el-form-item>
-        <el-form-item label='报警规则类型(1=设备报警规则,2=离线报警规则)' prop='alarmRuleType'>
+      <el-form ref='alarmRuleLinkFormRef' :model='form' :rules='rules' label-width='130px'>
+        <el-form-item label='报警规则类型' prop='alarmRuleType'>
           <el-radio-group v-model='form.alarmRuleType'>
             <el-radio
               v-for='dict in dms_alarm_rule_type'
@@ -133,8 +114,15 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label='报警规则ID，关联hw_alarm_rule的alarm_rule_id' prop='alarmRuleId'>
-          <el-input v-model='form.alarmRuleId' placeholder='请输入报警规则ID，关联hw_alarm_rule的alarm_rule_id' />
+        <el-form-item label='报警规则' prop='alarmRuleId'>
+          <el-select v-model='form.alarmRuleId' placeholder='请选择报警规则'>
+            <el-option
+              v-for='item in alarmRuleList'
+              :key='item.alarmRuleId'
+              :label='item.alarmRuleName'
+              :value='item.alarmRuleId'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='联动类型' prop='linkType'>
           <el-radio-group v-model='form.linkType'>
@@ -146,18 +134,31 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label='联动设备，关联表hw_device字段device_id' prop='linkDeviceId'>
-          <el-input v-model='form.linkDeviceId' placeholder='请输入联动设备，关联表hw_device字段device_id' />
+        <el-form-item label='联动设备' prop='linkDeviceId'>
+          <el-select v-model='form.linkDeviceId' placeholder='请选择联动设备' clearable>
+            <el-option
+              v-for='item in deviceList'
+              :key='item.machineId'
+              :label='item.machineName'
+              :value='item.machineId'
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label='联动设备功能，关联表hw_device_mode_function字段mode_function_id' prop='linkDeviceFunctionId'>
-          <el-input v-model='form.linkDeviceFunctionId'
-                    placeholder='请输入联动设备功能，关联表hw_device_mode_function字段mode_function_id' />
+        <el-form-item label='联动设备功能' prop='linkDeviceFunctionId'>
+          <el-select v-model='form.linkDeviceFunctionId' placeholder='请选择设备模型'>
+            <el-option
+              v-for='item in deviceModeList'
+              :key='item.deviceModeId'
+              :label='item.deviceModeName'
+              :value='item.deviceModeId'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='标识符' prop='linkDeviceFunctionIdentifier'>
           <el-input v-model='form.linkDeviceFunctionIdentifier' placeholder='请输入标识符' />
         </el-form-item>
-        <el-form-item label='联动设备服务的参数值，json格式保存' prop='linkDeviceFunctionData'>
-          <el-input v-model='form.linkDeviceFunctionData' placeholder='请输入联动设备服务的参数值，json格式保存' />
+        <el-form-item label='联动设备服务参数' prop='linkDeviceFunctionData'>
+          <el-input v-model='form.linkDeviceFunctionData' type='textarea' placeholder='请输入联动设备服务参数(json)' />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -179,6 +180,10 @@ import {
   updateAlarmRuleLink
 } from '@/api/dms/alarmRuleLink';
 import { AlarmRuleLinkVO, AlarmRuleLinkQuery, AlarmRuleLinkForm } from '@/api/dms/alarmRuleLink/types';
+import { getBaseAlarmRuleList } from '@/api/dms/alarmRule';
+import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
+import { getDmsBaseDeviceFilesList } from '@/api/dms/dmsBaseDeviceFiles';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { dms_link_type, dms_alarm_rule_type } = toRefs<any>(proxy?.useDict('dms_link_type', 'dms_alarm_rule_type'));
@@ -200,16 +205,37 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+/** 获取报警规则下拉框 */
+const alarmRuleList = ref([]);
+const getBaseAlarmRuleListSelect = async () => {
+  let res = await getBaseAlarmRuleList(null);
+  alarmRuleList.value = res.data;
+};
+
+/** 获取设备模型下拉框 */
+const deviceModeList = ref([]);
+const getDmsDeviceModeListSelect = async () => {
+  let res = await getDmsDeviceModeList(null);
+  deviceModeList.value = res.data;
+};
+
+/** 获取设备列表 */
+const deviceList = ref([]);
+const getDeviceListSelect = async () => {
+  let res = await getProdBaseMachineInfoList(null);
+  deviceList.value = res.data;
+};
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `报警规则关联ID，主键`, visible: true },
-  { key: 1, label: `报警规则类型(1=设备报警规则,2=离线报警规则)`, visible: true },
-  { key: 2, label: `报警规则ID，关联hw_alarm_rule的alarm_rule_id`, visible: true },
+  { key: 0, label: `报警规则关联ID`, visible: false },
+  { key: 1, label: `报警规则类型`, visible: true },
+  { key: 2, label: `报警规则ID`, visible: true },
   { key: 3, label: `联动类型`, visible: true },
-  { key: 4, label: `联动设备，关联表hw_device字段device_id`, visible: true },
-  { key: 5, label: `联动设备功能，关联表hw_device_mode_function字段mode_function_id`, visible: true },
+  { key: 4, label: `联动设备`, visible: true },
+  { key: 5, label: `联动设备功能`, visible: true },
   { key: 6, label: `标识符`, visible: true },
-  { key: 7, label: `联动设备服务的参数值，json格式保存`, visible: true }
+  { key: 7, label: `联动设备服务参数(json)`, visible: true }
 ]);
 
 const initFormData: AlarmRuleLinkForm = {
@@ -239,16 +265,16 @@ const data = reactive<PageData<AlarmRuleLinkForm, AlarmRuleLinkQuery>>({
   },
   rules: {
     alarmRuleType: [
-      { required: true, message: '报警规则类型(1=设备报警规则,2=离线报警规则)不能为空', trigger: 'change' }
+      { required: true, message: '报警规则类型不能为空', trigger: 'change' }
     ],
     alarmRuleId: [
-      { required: true, message: '报警规则ID，关联hw_alarm_rule的alarm_rule_id不能为空', trigger: 'blur' }
+      { required: true, message: '报警规则ID不能为空', trigger: 'blur' }
     ],
     linkType: [
       { required: true, message: '联动类型不能为空', trigger: 'change' }
     ],
     linkDeviceId: [
-      { required: true, message: '联动设备，关联表hw_device字段device_id不能为空', trigger: 'blur' }
+      { required: true, message: '联动设备不能为空', trigger: 'blur' }
     ]
   }
 });
@@ -346,6 +372,9 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getBaseAlarmRuleListSelect();
+  getDmsDeviceModeListSelect();
+  getDeviceListSelect();
   getList();
 });
 </script>

src/views/dms/deviceMode/index.vue

@@ -55,7 +55,18 @@
         <el-table-column type='selection' width='55' align='center' />
         <el-table-column label='设备模型ID' align='center' prop='deviceModeId' v-if='columns[0].visible' />
         <el-table-column label='设备模型名称' align='center' prop='deviceModeName' v-if='columns[1].visible' />
-        <el-table-column label='设备模型图片地址' align='center' prop='deviceModePic' v-if='columns[4].visible' />
+        <el-table-column label='设备模型图片' align='center' prop='deviceModePic' v-if='columns[4].visible'>
+          <template #default='scope'>
+            <ImagePreview
+              v-if='checkFileSuffix(scope.row.deviceModePic)'
+              :width='100'
+              :height='100'
+              :src='scope.row.deviceModePic'
+              :preview-src-list='[scope.row.deviceModePic]'
+            />
+            <span v-else v-text='scope.row.deviceModePic' />
+          </template>
+        </el-table-column>
         <el-table-column label='场景描述' align='center' prop='remark' v-if='columns[5].visible' />
         <el-table-column label='设备模型状态' align='center' prop='deviceModeStatus' v-if='columns[3].visible'>
           <template #default='scope'>
@@ -94,8 +105,8 @@
         <!--            </el-radio>-->
         <!--          </el-radio-group>-->
         <!--        </el-form-item>-->
-        <el-form-item label='设备模型图片地址' prop='deviceModePic'>
-          <el-input v-model='form.deviceModePic' placeholder='请输入设备模型图片地址' />
+        <el-form-item label='设备模型图片' prop='ossId'>
+          <imageUpload v-model='form.file' />
         </el-form-item>
         <el-form-item label='场景描述' prop='remark'>
           <el-input v-model='form.remark' placeholder='请输入场景描述' />
@@ -114,6 +125,8 @@
 <script setup name='DeviceMode' lang='ts'>
 import { listDeviceMode, getDeviceMode, delDeviceMode, addDeviceMode, updateDeviceMode } from '@/api/dms/deviceMode';
 import { DeviceModeVO, DeviceModeQuery, DeviceModeForm } from '@/api/dms/deviceMode/types';
+import imageUpload from '@/components/ImageUpload/index.vue';
+import ImagePreview from '@/components/ImagePreview/index.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { dms_device_mode_status } = toRefs<any>(proxy?.useDict('dms_device_mode_status'));
@@ -141,7 +154,7 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `设备模型名称`, visible: true },
   { key: 2, label: `租户编号`, visible: true },
   { key: 3, label: `设备模型状态`, visible: true },
-  { key: 4, label: `设备模型图片地址`, visible: true },
+  { key: 4, label: `设备模型图片`, visible: true },
   { key: 5, label: `场景描述`, visible: true },
   { key: 6, label: `创建部门`, visible: false },
   { key: 7, label: `创建人`, visible: false },
@@ -155,6 +168,7 @@ const initFormData: DeviceModeForm = {
   deviceModeName: undefined,
   deviceModeStatus: '1',
   deviceModePic: undefined,
+  ossId: undefined,
   remark: undefined
 };
 const data = reactive<PageData<DeviceModeForm, DeviceModeQuery>>({
@@ -186,6 +200,14 @@ const getList = async () => {
   loading.value = false;
 };
 
+/** 检查文件后缀是否为图片 */
+function checkFileSuffix(fileSuffix: string | string[]) {
+  if (!fileSuffix) return false;
+  const arr = ['.png', '.jpg', '.jpeg', '.gif'];
+  const suffix = typeof fileSuffix === 'string' ? fileSuffix.toLowerCase() : '';
+  return arr.some(item => suffix.endsWith(item));
+}
+
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -233,6 +255,14 @@ const handleUpdate = async (row?: DeviceModeVO) => {
     return;
   }
   const res = await getDeviceMode(_deviceModeId);
+  if (res.data.ossId != null && res.data.ossId != '') {
+    const ossIdArray = res.data.ossId.split(',');
+    const urlArray = res.data.deviceModePic.split(',');
+    res.data.file = ossIdArray.map((ossId, index) => ({
+      ossId: ossId.trim(),
+      url: urlArray[index] ? urlArray[index].trim() : ''
+    }));
+  }
   Object.assign(form.value, res.data);
   dialog.visible = true;
   dialog.title = '修改设备模型';
@@ -243,6 +273,13 @@ const submitForm = () => {
   deviceModeFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
+      if (form.value.file != null && form.value.file != '') {
+        form.value.ossId = form.value.file.map(e => e.ossId).join(',');
+        form.value.deviceModePic = form.value.file.map(e => e.url).join(',');
+      } else if (form.value.file == '') {
+        form.value.ossId = '';
+        form.value.deviceModePic = '';
+      }
       if (form.value.deviceModeId) {
         await updateDeviceMode(form.value).finally(() => buttonLoading.value = false);
       } else {

src/views/mes/samplePrescription/index.vue

@@ -325,7 +325,6 @@ const resetQuery = () => {
 
 /** 新增物料按钮操作 */
 const handleMaterialAdd = () => {
-  isInsert.value = 0;
   materialOpen.value = true;
 };
 /** 下载按钮操作 */
@@ -351,6 +350,7 @@ const handleSelectionChange = (selection: SamplePrescriptionVO[]) => {
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
+  isInsert.value = 0;
   dialog.visible = true;
   dialog.title = '添加示方书维护';
 };