Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

 package com.zehong.web.controller.complainDeal;
 
 import java.util.List;
+
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.framework.web.service.SysLoginService;
+import com.zehong.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +24,8 @@ import com.zehong.system.service.ITComplainDealService;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.common.core.page.TableDataInfo;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 投诉处置Controller
  * 
@@ -32,14 +38,20 @@ public class TComplainDealController extends BaseController
 {
     @Autowired
     private ITComplainDealService tComplainDealService;
+    @Autowired
+    private TokenService tokenService;
 
     /**
      * 查询投诉处置列表
      */
     @PreAuthorize("@ss.hasPermi('complainDeal:complainDeal:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TComplainDeal tComplainDeal)
+    public TableDataInfo list(TComplainDeal tComplainDeal, HttpServletRequest request)
     {
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        if(loginUser.getUser().getDeptId()!=-2){
+            tComplainDeal.setComplainAssignEnterproseId(loginUser.getUser().getDeptId());
+        }
         startPage();
         List<TComplainDeal> list = tComplainDealService.selectTComplainDealList(tComplainDeal);
         return getDataTable(list);
@@ -100,4 +112,12 @@ public class TComplainDealController extends BaseController
     {
         return toAjax(tComplainDealService.deleteTComplainDealByIds(complainDealIds));
     }
+
+
+    @GetMapping("/getuserList/{enterproseId}")
+    public AjaxResult selectUserByenterproseId(@PathVariable("enterproseId") String enterproseId)
+    {
+        return AjaxResult.success(tComplainDealService.selectUserByenterproseId(enterproseId));
+    }
+
 }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/statistic/StatisticController.java

+package com.zehong.web.controller.statistic;
+
+import com.zehong.common.config.GassafetyProgressConfig;
+import com.zehong.common.constant.Constants;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.common.utils.file.FileUploadUtils;
+import com.zehong.common.utils.file.FileUtils;
+import com.zehong.framework.config.ServerConfig;
+import com.zehong.system.domain.THiddenDangerStandingBook;
+import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
+import com.zehong.system.domain.vo.TTroubleStandingBookVo;
+import com.zehong.system.service.ITHiddenDangerStandingBookService;
+import com.zehong.system.service.ITTroubleStandingBookService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 统计分析
+ * 
+ * @author zehong
+ */
+@RestController
+@RequestMapping("/statistic")
+public class StatisticController
+{
+    private static final Logger log = LoggerFactory.getLogger(StatisticController.class);
+
+    @Autowired
+    private ITTroubleStandingBookService tTroubleStandingBookService;
+    @Autowired
+    private ITHiddenDangerStandingBookService tHiddenDangerStandingBookService;
+
+    /**
+     * 燃气事故台账统计
+     */
+    @GetMapping("/troubleStatistic")
+    public AjaxResult troubleStatistic()
+    {
+        return AjaxResult.success(tTroubleStandingBookService.selectTTroubleStandingBookStatistic());
+    }
+
+    /**
+     * 隐患整治台账统计
+     */
+    @GetMapping("/hiddenStatistic")
+    public AjaxResult hiddenStatistic()
+    {
+        return AjaxResult.success(tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookStatistic());
+    }
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

@@ -47,12 +47,12 @@ public class TComplainDeal extends BaseEntity
     private Long complainAssignEnterproseId;
 
     /** 指派人 */
-    @Excel(name = "指派人")
-    private String complainAssignManId;
+    @Excel(name = "指派人id")
+    private Long complainAssignManId;
 
     /** 指派人id */
-    @Excel(name = "指派人id")
-    private Long complainAssignMan;
+    @Excel(name = "指派人")
+    private String complainAssignMan;
 
     /** 任务状态：1.派发中 2.反馈 3.归档 */
     @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
@@ -138,21 +138,21 @@ public class TComplainDeal extends BaseEntity
     {
         return complainAssignEnterproseId;
     }
-    public void setComplainAssignManId(String complainAssignManId) 
+    public void setComplainAssignManId(Long complainAssignManId)
     {
         this.complainAssignManId = complainAssignManId;
     }
 
-    public String getComplainAssignManId() 
+    public Long getComplainAssignManId()
     {
         return complainAssignManId;
     }
-    public void setComplainAssignMan(Long complainAssignMan) 
+    public void setComplainAssignMan(String complainAssignMan)
     {
         this.complainAssignMan = complainAssignMan;
     }
 
-    public Long getComplainAssignMan() 
+    public String getComplainAssignMan()
     {
         return complainAssignMan;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/THiddenDangerStandingBookVo.java

+package com.zehong.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class THiddenDangerStandingBookVo
+{
+    // 隐患总数
+    private int hiddenTotal;
+
+    // 一级隐患总数
+    private int oneLevelTotal;
+
+    // 二级隐患总数
+    private int twoLevelTotal;
+
+    // 三级隐患总数
+    private int threeLevelTotal;
+
+    // 已完成总数
+    private int completedTotal;
+
+    // 未完成总数
+    private int incompleteTotal;
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/TTroubleStandingBookVo.java

+package com.zehong.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class TTroubleStandingBookVo
+{
+    // 事故总数
+    private int troubleTotal;
+
+    // 受伤总数
+    private int injuryTotal;
+
+    // 死亡总数
+    private int deathTotal;
+
+    // 事故处理办结率
+    private String completionRate;
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TComplainDealMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import com.zehong.system.domain.TComplainDeal;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 投诉处置Mapper接口
@@ -58,4 +62,11 @@ public interface TComplainDealMapper
      * @return 结果
      */
     public int deleteTComplainDealByIds(Long[] complainDealIds);
+
+    /**
+     * 查询公司下用户
+     * @param enterproseId
+     * @return
+     */
+    public List<Map<String,Object>> selectUserByenterproseId(@Param("enterproseId")String enterproseId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/THiddenDangerStandingBookMapper.java

@@ -3,6 +3,7 @@ package com.zehong.system.mapper;
 import java.util.List;
 import com.zehong.system.domain.THiddenDangerStandingBook;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
 
 /**
  * 隐患整治台账Mapper接口
@@ -28,6 +29,13 @@ public interface THiddenDangerStandingBookMapper
      */
     public List<THiddenDangerStandingBook> selectTHiddenDangerStandingBookList(THiddenDangerStandingBookForm tHiddenDangerStandingBook);
 
+    /**
+     *  隐患台账统计
+     *
+     * @return 隐患整治台账集合
+     */
+    public THiddenDangerStandingBookVo selectTHiddenDangerStandingBookStatistic();
+
     /**
      * 新增隐患整治台账
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TTroubleStandingBookMapper.java

@@ -3,6 +3,7 @@ package com.zehong.system.mapper;
 import java.util.List;
 import com.zehong.system.domain.TTroubleStandingBook;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.system.domain.vo.TTroubleStandingBookVo;
 
 /**
  * 事故台账Mapper接口
@@ -28,6 +29,13 @@ public interface TTroubleStandingBookMapper
      */
     public List<TTroubleStandingBook> selectTTroubleStandingBookList(TTroubleStandingBookForm tTroubleStandingBook);
 
+    /**
+     * 事故台账统计
+     *
+     * @return 事故台账统计
+     */
+    public TTroubleStandingBookVo selectTTroubleStandingBookStatistic();
+
     /**
      * 新增事故台账
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITComplainDealService.java

 package com.zehong.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.system.domain.TComplainDeal;
 
 /**
@@ -58,4 +60,6 @@ public interface ITComplainDealService
      * @return 结果
      */
     public int deleteTComplainDealById(Long complainDealId);
+
+    public List<Map<String,Object>> selectUserByenterproseId(String enterproseId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITHiddenDangerStandingBookService.java

@@ -3,6 +3,7 @@ package com.zehong.system.service;
 import java.util.List;
 import com.zehong.system.domain.THiddenDangerStandingBook;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
 
 /**
  * 隐患整治台账Service接口
@@ -28,6 +29,13 @@ public interface ITHiddenDangerStandingBookService
      */
     public List<THiddenDangerStandingBook> selectTHiddenDangerStandingBookList(THiddenDangerStandingBookForm tHiddenDangerStandingBook);
 
+    /**
+     *  隐患台账统计
+     *
+     * @return 隐患整治台账集合
+     */
+    public THiddenDangerStandingBookVo selectTHiddenDangerStandingBookStatistic();
+
     /**
      * 新增隐患整治台账
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITTroubleStandingBookService.java

@@ -3,6 +3,7 @@ package com.zehong.system.service;
 import java.util.List;
 import com.zehong.system.domain.TTroubleStandingBook;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.system.domain.vo.TTroubleStandingBookVo;
 
 /**
  * 事故台账Service接口
@@ -28,6 +29,13 @@ public interface ITTroubleStandingBookService
      */
     public List<TTroubleStandingBook> selectTTroubleStandingBookList(TTroubleStandingBookForm tTroubleStandingBook);
 
+    /**
+     * 事故台账统计
+     *
+     * @return 事故台账统计
+     */
+    public TTroubleStandingBookVo selectTTroubleStandingBookStatistic();
+
     /**
      * 新增事故台账
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TComplainDealServiceImpl.java

 package com.zehong.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zehong.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -93,4 +95,8 @@ public class TComplainDealServiceImpl implements ITComplainDealService
     {
         return tComplainDealMapper.deleteTComplainDealById(complainDealId);
     }
+    @Override
+    public  List<Map<String,Object>> selectUserByenterproseId(String enterproseId){
+        return tComplainDealMapper.selectUserByenterproseId(enterproseId);
+    }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/THiddenDangerStandingBookServiceImpl.java

@@ -3,6 +3,7 @@ package com.zehong.system.service.impl;
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.THiddenDangerStandingBookMapper;
@@ -45,6 +46,16 @@ public class THiddenDangerStandingBookServiceImpl implements ITHiddenDangerStand
         return tHiddenDangerStandingBookMapper.selectTHiddenDangerStandingBookList(tHiddenDangerStandingBook);
     }
 
+    /**
+     *  隐患台账统计
+     *
+     * @return 隐患整治台账集合
+     */
+    public THiddenDangerStandingBookVo selectTHiddenDangerStandingBookStatistic()
+    {
+        return tHiddenDangerStandingBookMapper.selectTHiddenDangerStandingBookStatistic();
+    }
+
     /**
      * 新增隐患整治台账
      * 

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTroubleStandingBookServiceImpl.java

@@ -3,6 +3,7 @@ package com.zehong.system.service.impl;
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.system.domain.vo.TTroubleStandingBookVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TTroubleStandingBookMapper;
@@ -45,6 +46,17 @@ public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookSer
         return tTroubleStandingBookMapper.selectTTroubleStandingBookList(tTroubleStandingBook);
     }
 
+    /**
+     * 事故台账统计
+     *
+     * @return 事故台账统计
+     */
+    @Override
+    public TTroubleStandingBookVo selectTTroubleStandingBookStatistic()
+    {
+        return tTroubleStandingBookMapper.selectTTroubleStandingBookStatistic();
+    }
+
     /**
      * 新增事故台账
      * 

gassafetyprogress-system/src/main/resources/mapper/system/TComplainDealMapper.xml

@@ -124,4 +124,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{complainDealId}
         </foreach>
     </delete>
+    <select id="selectUserByenterproseId" resultType="java.util.HashMap">
+        SELECT user_id as id ,nick_name as nickName FROM sys_user
+        WHERE del_flag!=2 and  dept_id = #{enterproseId}
+    </select>
 </mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/THiddenDangerStandingBookMapper.xml

@@ -38,6 +38,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hiddenFindDateStart != null "> and hidden_find_date &gt;= #{hiddenFindDateStart}</if>
             <if test="hiddenFindDateEnd != null "> and hidden_find_date &lt;= #{hiddenFindDateEnd}</if>
         </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectTHiddenDangerStandingBookStatistic" resultType="THiddenDangerStandingBookVo">
+        select COUNT(t.hidden_id) AS hiddenTotal,
+               SUM(CASE t.hidden_type WHEN '1' THEN 1 ELSE 0 END) AS oneLevelTotal,
+			   SUM(CASE t.hidden_type WHEN '2' THEN 1 ELSE 0 END) AS twoLevelTotal,
+			   SUM(CASE t.hidden_type WHEN '3' THEN 1 ELSE 0 END) AS threeLevelTotal,
+			   SUM(CASE t.remediation WHEN '1' THEN 1 ELSE 0 END) AS completedTotal,
+			   SUM(CASE t.remediation WHEN '2' THEN 1 ELSE 0 END) AS incompleteTotal
+        from (select * from t_hidden_danger_standing_book where is_del = '0') t
     </select>
     
     <select id="selectTHiddenDangerStandingBookById" parameterType="Long" resultMap="THiddenDangerStandingBookResult">

gassafetyprogress-system/src/main/resources/mapper/system/TSafeEquipmentStandingBookMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="installTimeStart != null "> and install_time &gt;= #{installTimeStart}</if>
             <if test="installTimeEnd != null "> and install_time &lt;= #{installTimeEnd}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTSafeEquipmentStandingBookById" parameterType="Long" resultMap="TSafeEquipmentStandingBookResult">

gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml

@@ -44,6 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dealDateStart != null "> and deal_date &gt;= #{dealDateStart}</if>
             <if test="dealDateEnd != null "> and deal_date &lt;= #{dealDateEnd}</if>
         </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectTTroubleStandingBookStatistic" resultType="TTroubleStandingBookVo">
+        select COUNT(t.trouble_id) AS troubleTotal,
+			 SUM(t.injury_num) AS injutyTotal,
+			 SUM(t.death_num) AS deathTotal,
+			 ROUND(SUM(CASE t.is_deal WHEN '1' THEN 1 ELSE 0 END)/COUNT(t.trouble_id)*100, 1) AS completionRate
+        from (select * from t_trouble_standing_book where is_del = '0') t
     </select>
     
     <select id="selectTTroubleStandingBookById" parameterType="Long" resultMap="TTroubleStandingBookResult">

gassafetyprogress-web/src/api/complainDeal/complainDeal.js

@@ -51,3 +51,10 @@ export function exportComplainDeal(query) {
     params: query
   })
 }
+
+export function getUserList(cId) {
+  return request({
+    url: '/complainDeal/getuserList/' + cId,
+    method: 'get'
+  })
+}

gassafetyprogress-web/src/api/statistic/statisticAnalysis.js

+import request from '@/utils/request'
+
+// 燃气事故台账统计
+export function troubleStatistic(query) {
+  return request({
+    url: '/statistic/troubleStatistic',
+    method: 'get',
+    params: query
+  })
+}
+
+// 隐患整治台账统计
+export function hiddenStatistic(query) {
+  return request({
+    url: '/statistic/hiddenStatistic',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/views/system/eventInfo/index.vue

@@ -66,28 +66,6 @@
           v-hasPermi="['system:eventInfo:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:eventInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:eventInfo:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -103,7 +81,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="eventInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column type="selection" width="55" align="center" />-->
       <!--<el-table-column label="事件id" align="center" prop="eventId" />-->
       <el-table-column label="事件名称" align="center" prop="eventTitle" />
       <el-table-column label="所属企业" align="center" prop="beyondEnterpriseName" />
@@ -116,9 +94,21 @@
         </template>
       </el-table-column>
       <el-table-column label="报案人" align="center" prop="reportPerson" />
-      <el-table-column label="事件处置信息" align="center" prop="eventDeal" />
-      <el-table-column label="事件评估信息" align="center" prop="eventAssessment" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="附件" align="center" prop="iconUrl" width="150px">
+        <template slot-scope="scope">
+          <span
+            class="dbtn"
+            @click="checkFile(scope.row.iconUrl)"
+            v-if="scope.row.iconUrl != null && scope.row.iconUrl!=''"
+          >
+            <i class="el-icon el-icon-view"></i>查看/下载
+          </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="事件处置信息" align="center" prop="eventDeal" />-->
+      <!--<el-table-column label="事件评估信息" align="center" prop="eventAssessment" />-->
+      <!--<el-table-column label="备注" align="center" prop="remarks" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -134,7 +124,6 @@
             icon="el-icon-document-copy"
             @click="handleDtail(scope.row)"
           >详情</el-button>
-          <el-button
           <el-button
             size="mini"
             type="text"
@@ -216,10 +205,10 @@
               </el-form-item>
             </div>
           </div>
-          <el-form-item label="事件处置信息" prop="eventDeal" style="width: 60%">
+          <el-form-item label="事件处置信息" prop="eventDeal" style="width: 95%">
             <el-input v-model="form.eventDeal" type="textarea" placeholder="请输入事件处置信息" :disabled="readonly"/>
           </el-form-item>
-          <el-form-item label="事件评估信息" prop="eventAssessment" style="width: 60%">
+          <el-form-item label="事件评估信息" prop="eventAssessment" style="width: 95%">
             <el-input v-model="form.eventAssessment" type="textarea" placeholder="请输入事件评估信息" :disabled="readonly"/>
           </el-form-item>
           <el-form-item label="事件附件" prop="iconUrl" :style="display" >
@@ -237,7 +226,7 @@
               <span
                 class="dbtn"
                 @click="checkFile(form.iconUrl)"
-              v-if="form.iconUrl != ''"
+                v-if="form.iconUrl!=null && form.iconUrl != ''"
               >
                 <i class="el-icon el-icon-view"></i>查看/下载
               </span>
@@ -382,7 +371,7 @@ export default {
       let obj = {};
       obj = this.enterpriseList.find((item)=>{
         return item.enterpriseId === value;
-    });
+    ``});
       this.form.beyondEnterpriseName = obj.enterpriseName;
       this.form.beyondEnterpriseId = value;
     },

gassafetyprogress-web/src/views/system/planInfo/index.vue

@@ -57,28 +57,28 @@
           v-hasPermi="['system:planInfo:add']"
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:planInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:planInfo:remove']"
-        >删除</el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="success"-->
+          <!--plain-->
+          <!--icon="el-icon-edit"-->
+          <!--size="mini"-->
+          <!--:disabled="single"-->
+          <!--@click="handleUpdate"-->
+          <!--v-hasPermi="['system:planInfo:edit']"-->
+        <!--&gt;修改</el-button>-->
+      <!--</el-col>-->
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="danger"-->
+          <!--plain-->
+          <!--icon="el-icon-delete"-->
+          <!--size="mini"-->
+          <!--:disabled="multiple"-->
+          <!--@click="handleDelete"-->
+          <!--v-hasPermi="['system:planInfo:remove']"-->
+        <!--&gt;删除</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -94,7 +94,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="planInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!--<el-table-column type="selection" width="25" align="center" />-->
       <!--<el-table-column label="预案id" align="center" prop="planId" />-->
       <el-table-column label="预案标题" align="center" prop="planTitle" />
       <el-table-column label="所属企业名称" align="center" prop="beyondEnterpriseName" />
@@ -102,12 +102,12 @@
       <el-table-column label="预案等级" align="center" prop="planLevel"  :formatter="planLevelFormat"/>
       <!--<el-table-column label="应急方案" align="center" prop="planContents" />-->
       <el-table-column label="应急设备及车辆" align="center" prop="planEquipment" />
-      <el-table-column label="方案附件" align="center" prop="dealPlanUrl" width="150px">
+      <el-table-column label="方案附件" align="center" prop="iconUrl" width="150px">
         <template slot-scope="scope">
           <span
             class="dbtn"
             @click="checkFile(scope.row.iconUrl)"
-            v-if="scope.row.iconUrl != ''"
+            v-if="scope.row.iconUrl != null && scope.row.iconUrl!=''"
           >
             <i class="el-icon el-icon-view"></i>查看/下载
           </span>
@@ -216,7 +216,7 @@
               <span
                 class="dbtn"
                 @click="checkFile(form.iconUrl)"
-                v-if="form.iconUrl != ''"
+                v-if="form.iconUrl!=null && form.iconUrl != ''"
               >
                 <i class="el-icon el-icon-view"></i>查看/下载
               </span>
@@ -346,7 +346,6 @@ export default {
       });
     },
     qiyechang(value){
-      console.log(value)
       let obj = {};
        obj = this.enterpriseList.find((item)=>{
              return item.enterpriseId === value;
@@ -475,11 +474,8 @@ export default {
         this.title = "修改应急预案";
         if(this.form.iconUrl!=null||this.form.iconUrl==""){
           this.fileList = [{name: 'file', url:uploadfile}];
-          this.$nextTick(()=>{
-            document.getElementsByClassName("el-upload--picture-card")[0].style.display="none"
-          document.getElementById("yesbutton").style.display="" ;
-        })
         }
+        document.getElementById("yesbutton").style.display="" ;
         document.getElementById("fujian").style.display=""
         document.getElementById("fujianxia").style.display="none"
       });