heyang

src/views/comprehensive/message/warningNotice/index.vue

@@ -3,6 +3,16 @@
     <div class="warningNotice-page" v-if="pageType == 1">
       <div class="title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" label-width="80px">
+          <el-form-item label="学院" prop="deptId" label-width="45px">
+            <el-select v-model="queryParams.collegeId" placeholder="请选择学院" style="width:200px;">
+              <el-option
+                v-for="dict in deptOptions"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="预警类型" prop="deptId" label-width="100px">
             <el-select v-model="queryParams.warningType" clearable placeholder="全部" style="width:150px;">
               <el-option
@@ -84,7 +94,7 @@
           <el-table-column label="实验室"  align="center" prop="subName" show-overflow-tooltip width="230"/>
           <el-table-column label="处理状态" align="center" prop="start" show-overflow-tooltip width="134">
             <template slot-scope="scope">
-              <span v-if="scope.row.warningType==3">{{scope.row.start?'已处理':'待处理'}}</span>
+              <span v-if="scope.row.warningType==3">{{scope.row.dispose==0?'待处理':'已处理'}}</span>
               <span v-else>-</span>
             </template>
           </el-table-column>
@@ -119,6 +129,7 @@
   import algorithmForewarning from './algorithmForewarning.vue'
   import sourceOfDangerForewarning from './sourceOfDangerForewarning.vue'
   import infoPage from './infoPage.vue'
+  import { listDepartments } from '@/api/system/dept'
   export default {
     name: 'index',
     components: {
@@ -143,6 +154,7 @@
         tableList:[],
         total:0,
         pageData:{},
+        deptOptions: [],
         //返回按钮
         outButtonData:{
           type:false,
@@ -164,8 +176,15 @@
     },
     mounted(){
         this.getList()
+        this.getDeptList()
     },
     methods:{
+      /** 查询学院列表 */
+      getDeptList() {
+        listDepartments().then(response => {
+          this.$set(this, 'deptOptions', response.data)
+        });
+      },
       outButton(){
         this.$router.push({
           path: "/emergencyManagement/newPerformEvacuation",

src/views/hazardManagement/gasBottleManage/inventoryInformation/index.vue

@@ -60,7 +60,7 @@
           </el-table-column>
           <el-table-column label="有效期" prop="validPeriod" width="249" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.validPeriod,'{y}-{m}-{d} {h}:{i}') }}</span>
+              <span>{{ parseTime(scope.row.validPeriod,'{y}-{m}-{d}') }}</span>
             </template>
           </el-table-column>
         </el-table>