无效告警详情

ruoyi-ui/src/views/picture/command-dispatch/index.vue

@@ -590,7 +590,7 @@
                     <el-form-item label="处警时间" prop="handleTime">
                       {{ parseTime(form.handleTime)||'/' }}
                     </el-form-item>
-                    <el-form-item label="分类事件名称" prop="classificationEventName">
+                    <el-form-item label="事件分类" prop="classificationEventName">
                       {{ form.classificationEventName||'/' }}
                     </el-form-item>
                     <el-form-item label="事件等级" prop="eventGradeName">

ruoyi-ui/src/views/system/management/emergency-command/info/index.vue

@@ -529,7 +529,7 @@
               >修改
               </el-button>
               <el-button
-                v-if="type==1||type==2 &&scope.row.statusName !='无效告警'"
+                v-if="type==1||type==2 "
                 v-hasPermi="['emergencycommand:info:edit']"
                 size="mini"
                 type="text"
@@ -626,7 +626,7 @@
           </template>
           <template v-if="type == 2">
             <el-tabs v-model="activeName" @tab-click="getPoliceInformation">
-              <el-tab-pane label="警情信息" v-if="rowStatus<=5" name="first">
+              <el-tab-pane label="警情信息" v-if="rowStatus<=5||rowStatus==6" name="first">
                 <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                   <el-form-item label="告警编号" prop="alarmCode">
                     {{ form.alarmCode ||'/'}}
@@ -663,7 +663,7 @@
                   </el-form-item>
                 </el-form>
               </el-tab-pane>
-              <el-tab-pane label="接警信息" v-if="rowStatus<=5" name="second">
+              <el-tab-pane label="接警信息" v-if="rowStatus<=5||rowStatus==6" name="second">
                 <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                   <el-form-item label="接警时间" prop="acceptTime">
                     {{ parseTime(form.acceptTime) ||'/'}}
@@ -679,12 +679,12 @@
                   </el-form-item>
                 </el-form>
               </el-tab-pane>
-              <el-tab-pane label="处警信息" v-if="rowStatus>=3" name="third">
+              <el-tab-pane label="处警信息" v-if="rowStatus>=3&&rowStatus!=6" name="third">
                 <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                   <el-form-item label="处警时间" prop="handleTime">
                     {{ parseTime(form.handleTime) }}
                   </el-form-item>
-                  <el-form-item label="分类事件名称" prop="classificationEventName">
+                  <el-form-item label="事件分类" prop="classificationEventName">
                     {{ form.classificationEventName||'/' }}
                   </el-form-item>
                   <el-form-item label="事件等级" prop="eventGradeName">
@@ -705,7 +705,7 @@
                   </el-form-item>
                 </el-form>
               </el-tab-pane>
-              <el-tab-pane label="结警信息" v-if="rowStatus>=4" name="fourth">
+              <el-tab-pane label="结警信息" v-if="rowStatus>=4&&rowStatus!=6" name="fourth">
                 <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                   <el-form-item label="结警时间" prop="endTime">
                     {{ parseTime(form.endTime) ||'/'}}

ruoyi-ui/src/views/system/management/institutional-organization/scheduling-person/index.vue

@@ -243,7 +243,12 @@ export default {
       formatDate: null,
       deptId: null,
       userOptions: [],
-      listSchedulingOptions: [],
+      listSchedulingOptions: [
+        {
+          id:'',
+          name:'休息'
+        }
+      ],
 
       totalData: [],
 
@@ -468,7 +473,6 @@ export default {
       this.title = "添加人员排班信息 ";
       listScheduling(this.queryParam).then(response => {
         this.listSchedulingOptions = response.rows
-        console.log(this.listSchedulingOptions)
       })
     },
     /** 修改按钮操作 */
@@ -615,7 +619,9 @@ export default {
     //班次下拉
     listScheduling() {
       listScheduling(this.queryParam).then(response => {
-        this.listSchedulingOptions = response.rows
+        this.listSchedulingOptions=this.listSchedulingOptions.concat(response.rows)
+        console.log(this.listSchedulingOptions)
+
       })
     }