报警处理优化

src/views/module_tpm/messageAlarm/MessageAlarmList.vue

@@ -172,12 +172,12 @@
           {
             title:'设备',
             align:"center",
-            dataIndex: 'equipmentid'
+            dataIndex: 'equipmentid_dictText'
           },
           {
             title:'报警类型',
             align:"center",
-            dataIndex: 'alarmtype'
+            dataIndex: 'alarmtype_dictText'
           },
           {
             title:'报警描述',
@@ -195,7 +195,7 @@
           {
             title:'报警等级',
             align:"center",
-            dataIndex: 'alarmlevel'
+            dataIndex: 'alarmlevel_dictText'
           },
           // {
           //   title:'消息码',
@@ -230,7 +230,7 @@
           {
             title:'处理状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dictText'
           },
           // {
           //   title:'处理日期',

src/views/module_tpm/messageAlarm/modules/MessageAlarmForm.vue

@@ -4,11 +4,11 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+            <a-form-model-item label="报警描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注" disabled ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="设备id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
               <a-input v-model="model.equipmentid" placeholder="请输入设备id"  ></a-input>
             </a-form-model-item>
@@ -57,28 +57,36 @@
             <a-form-model-item label="阈值最大值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vmax">
               <a-input-number v-model="model.vmax" placeholder="请输入阈值最大值" style="width: 100%" />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
-            <a-form-model-item label="状态：0 报警，1误报 ， 2 处理中，3已处理" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input-number v-model="model.status" placeholder="请输入状态：0 报警，1误报 ， 2 处理中，3已处理" style="width: 100%" />
+            <a-form-model-item label="处理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleuser">
+              <j-dict-select-tag v-model="model.handleuser" placeholder="请选择处理人" dictCode="sys_user,realname,id"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="处理日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handletime">
-              <j-date placeholder="请选择处理日期" v-model="model.handletime"  style="width: 100%" />
+              <j-date placeholder="请选择处理日期" showTime dateFormat="YYYY-MM-DD HH:mm:ss" v-model="model.handletime"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="处理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleuser">
-              <a-input v-model="model.handleuser" placeholder="请输入处理人"  ></a-input>
+            <a-form-model-item label="处理状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <!-- <a-input-number v-model="model.status" placeholder="请输入状态：0待处理，1处理中，2已处理" style="width: 100%" /> -->
+              <a-radio-group v-model="model.status">
+                <a-radio :value="1">
+                  处理中
+                </a-radio>
+                <a-radio :value="2">
+                  已处理
+                </a-radio>
+              </a-radio-group>
             </a-form-model-item>
-          </a-col>
+          </a-col> 
           <a-col :span="24">
             <a-form-model-item label="处理信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleremark">
-              <a-input v-model="model.handleremark" placeholder="请输入处理信息"  ></a-input>
+              <a-textarea v-model="model.handleremark" placeholder="请输入处理信息" :auto-size="{ minRows: 2, maxRows: 3 }"></a-textarea>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="url">
               <a-input v-model="model.url" placeholder="请输入图片地址"  ></a-input>
             </a-form-model-item>
@@ -122,7 +130,7 @@
             <a-form-model-item label="所属年月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearmonth">
               <a-input v-model="model.yearmonth" placeholder="请输入所属年月"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
         </a-row>
       </a-form-model>
     </j-form-container>