update mes报警标准加列

src/api/mes/vulcAlarmStandard/types.ts

@@ -1,6 +1,6 @@
 export interface VulcAlarmStandardVO {
   /**
-   * 报警项目ID
+   * 报警标准ID
    */
   alarmStandardId: string | number;
 
@@ -54,11 +54,26 @@ export interface VulcAlarmStandardVO {
    */
   remark: string;
 
+  /**
+   * 数据类型
+   */
+  dataType: string;
+
+  /**
+   * 地址
+   */
+  pointAddress: string;
+
+  /**
+   * 频率（毫秒）
+   */
+  stepTime: number;
+
 }
 
 export interface VulcAlarmStandardForm extends BaseEntity {
   /**
-   * 报警项目ID
+   * 报警标准ID
    */
   alarmStandardId?: string | number;
 
@@ -112,12 +127,27 @@ export interface VulcAlarmStandardForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 数据类型
+   */
+  dataType?: string;
+
+  /**
+   * 地址
+   */
+  pointAddress?: string;
+
+  /**
+   * 频率（毫秒）
+   */
+  stepTime?: number;
+
 }
 
 export interface VulcAlarmStandardQuery extends PageQuery {
 
   /**
-   * 报警项目ID
+   * 报警标准ID
    */
   alarmStandardId?: string | number;
 
@@ -166,10 +196,25 @@ export interface VulcAlarmStandardQuery extends PageQuery {
    */
   activeFlag?: string;
 
-    /**
+  /**
-     * 日期范围参数
+   * 数据类型
-     */
+   */
-    params?: any;
+  dataType?: string;
+
+  /**
+   * 地址
+   */
+  pointAddress?: string;
+
+  /**
+   * 频率（毫秒）
+   */
+  stepTime?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
 
 

src/views/mes/vulcAlarmStandard/index.vue

@@ -88,6 +88,13 @@
                          width='120' />
         <el-table-column label='最大值(Mpa/℃)' align='center' prop='maxValue' v-if='columns[8].visible' width='120' />
         <el-table-column label='最小值(Mpa/℃)' align='center' prop='minValue' v-if='columns[9].visible' width='120' />
+        <el-table-column label="数据类型" align="center" prop="dataType" v-if="columns[19].visible">
+          <template #default="scope">
+            <dict-tag :options="machine_data_type" :value="scope.row.dataType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="地址" align="center" prop="pointAddress" v-if="columns[20].visible"/>
+        <el-table-column label="频率（毫秒）" align="center" prop="stepTime" v-if="columns[21].visible"  width='120' />
         <el-table-column label='控制标识' align='center' prop='activeFlag' v-if='columns[10].visible'>
           <template #default='scope'>
             <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
@@ -152,6 +159,22 @@
         <el-form-item label='最小值(Mpa/℃)' prop='minValue'>
           <el-input v-model='form.minValue' placeholder='请输入最小值(Mpa/℃)' />
         </el-form-item>
+        <el-form-item label="数据类型" prop="dataType">
+          <el-select v-model="form.dataType" placeholder="请选择数据类型">
+            <el-option
+              v-for="dict in machine_data_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="地址" prop="pointAddress">
+          <el-input v-model="form.pointAddress" placeholder="请输入地址" />
+        </el-form-item>
+        <el-form-item label="频率（毫秒）" prop="stepTime">
+          <el-input v-model="form.stepTime" placeholder="请输入频率（毫秒）" />
+        </el-form-item>
         <el-form-item label='控制标识' prop='activeFlag'>
           <el-radio-group v-model='form.activeFlag'>
             <el-radio
@@ -190,7 +213,7 @@ import { getProdVulcAlarmItemsList } from '@/api/mes/vulcAlarmItems';
 import { getProdTechnologyStepInfoList } from '@/api/mes/technologyStepInfo';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+const { active_flag, machine_data_type } = toRefs<any>(proxy?.useDict('active_flag', 'machine_data_type'));
 
 const vulcAlarmStandardList = ref<VulcAlarmStandardVO[]>([]);
 const buttonLoading = ref(false);
@@ -243,7 +266,10 @@ const columns = ref<FieldOption[]>([
   { key: 15, label: `更新人`, visible: false },
   { key: 16, label: `更新时间`, visible: false },
   { key: 17, label: `删除标志`, visible: false },
-  { key: 18, label: `工艺名称`, visible: true }
+  { key: 18, label: `工艺名称`, visible: true },
+  { key: 19, label: `数据类型`, visible: true },
+  { key: 20, label: `地址`, visible: true },
+  { key: 21, label: `频率（毫秒）`, visible: true },
 ]);
 
 const initFormData: VulcAlarmStandardForm = {