Merge remote-tracking branch 'origin/master'

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

@@ -8,13 +8,15 @@ 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.TSafeEquipmentStandingBook;
 import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.domain.TVideoManager;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.system.domain.vo.HomepageVo;
 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 com.zehong.system.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,10 +43,18 @@ public class StatisticController
 {
     private static final Logger log = LoggerFactory.getLogger(StatisticController.class);
 
+    @Autowired
+    private ITVideoManagerService tVideoManagerService;
+    @Autowired
+    private ITSafeEquipmentStandingBookService tSafeEquipmentStandingBookService;
     @Autowired
     private ITTroubleStandingBookService tTroubleStandingBookService;
     @Autowired
     private ITHiddenDangerStandingBookService tHiddenDangerStandingBookService;
+    @Autowired
+    private ITComplainDealService tComplainDealService;
+    @Autowired
+    private ITWorkOrderService tWorkOrderService;
 
     /**
      * 燃气事故台账统计
@@ -64,4 +74,29 @@ public class StatisticController
         return AjaxResult.success(tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookStatistic());
     }
 
+    /**
+     * 首页统计
+     */
+    @GetMapping("/homepageStatistic")
+    public AjaxResult homepageStatistic()
+    {
+        HomepageVo homepageVo = new HomepageVo();
+
+        homepageVo = tComplainDealService.countTComplainDeal();
+        homepageVo.setTaskTotal(tWorkOrderService.countTWorkOrder().getTaskTotal());
+        homepageVo.setTaskFeedbackTotal(tWorkOrderService.countTWorkOrder().getTaskFeedbackTotal());
+
+        List<TVideoManager> tVideoManagerList = tVideoManagerService.selectTVideoManagerList(null);
+        List<TSafeEquipmentStandingBook> tSafeEquipmentStandingBookList = tSafeEquipmentStandingBookService.selectTSafeEquipmentStandingBookList(null);
+        List<TTroubleStandingBook> tTroubleStandingBookList = tTroubleStandingBookService.selectTTroubleStandingBookList(null);
+        List<THiddenDangerStandingBook> tHiddenDangerStandingBookList = tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookList(null);
+
+        homepageVo.setVideoTotal(tVideoManagerList.size());
+        homepageVo.setEquipmentTotal(tSafeEquipmentStandingBookList.size());
+        homepageVo.setTroubleTotal(tTroubleStandingBookList.size());
+        homepageVo.setHiddenTotal(tHiddenDangerStandingBookList.size());
+
+        return AjaxResult.success(homepageVo);
+    }
+
 }

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

+package com.zehong.system.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class HomepageVo
+{
+    // 任务总数
+    private int taskTotal;
+
+    // 任务反馈总数
+    private int taskFeedbackTotal;
+
+    // 投诉总数
+    private int complaintTotal;
+
+    // 投诉反馈总数
+    private int complaintFeedbackTotal;
+
+    // 视频监控总数
+    private int videoTotal;
+
+    // 安全装置总数
+    private int equipmentTotal;
+
+    // 事故总数
+    private int troubleTotal;
+
+    // 隐患总数
+    private int hiddenTotal;
+}

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.Objects;
 
 import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.vo.HomepageVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -31,6 +32,13 @@ public interface TComplainDealMapper
      */
     public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
 
+    /**
+     * 投诉处置统计
+     *
+     * @return 投诉处置统计
+     */
+    public HomepageVo countTComplainDeal();
+
     /**
      * 新增投诉处置
      * 

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

@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
 
 import java.util.List;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.domain.vo.HomepageVo;
 
 /**
  * 燃气任务Mapper接口
@@ -27,6 +28,13 @@ public interface TWorkOrderMapper
      */
     public List<TWorkOrder> selectTWorkOrderList(TWorkOrder tWorkOrder);
 
+    /**
+     * 燃气任务统计
+     *
+     * @return 燃气任务统计
+     */
+    public HomepageVo countTWorkOrder();
+
     /**
      * 新增燃气任务
      * 

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.system.domain.TComplainDeal;
+import com.zehong.system.domain.vo.HomepageVo;
 
 /**
  * 投诉处置Service接口
@@ -29,6 +30,13 @@ public interface ITComplainDealService
      */
     public List<TComplainDeal> selectTComplainDealList(TComplainDeal tComplainDeal);
 
+    /**
+     * 投诉处置统计
+     *
+     * @return 投诉处置统计
+     */
+    public HomepageVo countTComplainDeal();
+
     /**
      * 新增投诉处置
      * 

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

@@ -2,6 +2,7 @@ package com.zehong.system.service;
 
 import java.util.List;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.domain.vo.HomepageVo;
 
 /**
  * 燃气任务Service接口
@@ -27,6 +28,13 @@ public interface ITWorkOrderService
      */
     public List<TWorkOrder> selectTWorkOrderList(TWorkOrder tWorkOrder);
 
+    /**
+     * 燃气任务统计
+     *
+     * @return 燃气任务统计
+     */
+    public HomepageVo countTWorkOrder();
+
     /**
      * 新增燃气任务
      * 

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.vo.HomepageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TComplainDealMapper;
@@ -46,6 +47,16 @@ public class TComplainDealServiceImpl implements ITComplainDealService
         return tComplainDealMapper.selectTComplainDealList(tComplainDeal);
     }
 
+    /**
+     * 投诉处置统计
+     *
+     * @return 投诉处置统计
+     */
+    public HomepageVo countTComplainDeal()
+    {
+        return tComplainDealMapper.countTComplainDeal();
+    }
+
     /**
      * 新增投诉处置
      * 

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

@@ -5,6 +5,7 @@ import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.system.domain.TEnterpriseInfo;
 import com.zehong.system.domain.TWorkOrder;
+import com.zehong.system.domain.vo.HomepageVo;
 import com.zehong.system.mapper.TEnterpriseInfoMapper;
 import com.zehong.system.mapper.TWorkOrderMapper;
 import com.zehong.system.service.ITWorkOrderService;
@@ -52,6 +53,16 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         return tWorkOrderMapper.selectTWorkOrderList(tWorkOrder);
     }
 
+    /**
+     * 燃气任务统计
+     *
+     * @return 燃气任务统计
+     */
+    public HomepageVo countTWorkOrder()
+    {
+        return tWorkOrderMapper.countTWorkOrder();
+    }
+
     /**
      * 新增燃气任务
      * 

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

@@ -52,7 +52,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTComplainDealVo"/>
         where complain_deal_id = #{complainDealId}
     </select>
-        
+
+    <select id="countTComplainDeal" resultType="HomepageVo">
+        select COUNT(t.complain_deal_id) AS complaintTotal,
+			   SUM(CASE t.complain_status WHEN '2' THEN 1 ELSE 0 END) AS complaintFeedbackTotal
+        from (select * from t_complain_deal where is_del = '0') t
+    </select>
+
     <insert id="insertTComplainDeal" parameterType="TComplainDeal" useGeneratedKeys="true" keyProperty="complainDealId">
         insert into t_complain_deal
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTVideoManagerList" parameterType="TVideoManager" resultMap="TVideoManagerResult">
         <include refid="selectTVideoManagerVo"/>
-        <where>  
+        <where> is_del = '0'
             <if test="videoName != null  and videoName != ''"> and video_name like concat('%', #{videoName}, '%')</if>
             <if test="resourceId != null  and resourceId != ''"> and resource_id = #{resourceId}</if>
             <if test="longitude != null "> and longitude = #{longitude}</if>
@@ -37,7 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="beyondEnterpriseId != null "> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="beyondEnterpriseName != null  and beyondEnterpriseName != ''"> and beyond_enterprise_name like concat('%', #{beyondEnterpriseName}, '%')</if>
-            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
         </where>
     </select>

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

@@ -100,6 +100,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTWorkOrderVo"/>
         where workOrder.work_id = #{workId}
     </select>
+
+    <select id="countTWorkOrder" resultType="HomepageVo">
+        select COUNT(t.work_id) AS taskTotal,
+			   SUM(CASE t.work_status WHEN '2' THEN 1 ELSE 0 END) AS taskFeedbackTotal
+        from (select * from t_work_order where is_del = '0') t
+    </select>
         
     <insert id="insertTWorkOrder" parameterType="TWorkOrder" useGeneratedKeys="true" keyProperty="workId">
         insert into t_work_order

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

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

gassafetyprogress-web/src/views/operationMonitor/workOrder/index.vue

@@ -133,6 +133,7 @@
             icon="el-icon-edit"
             @click="workDetail(scope.row)"
             v-hasPermi="['system:order:edit']"
+            key="detail"
           >详情</el-button>
           <el-button v-if="scope.row.workStatus == '0' || scope.row.workStatus == '1'" key="edit"
             size="mini"
@@ -147,6 +148,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:order:remove']"
+            key="detele"
           >删除</el-button>
           <el-button v-if=" (('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == null))) && scope.row.workStatus == '0'"
                      size="mini"
@@ -154,6 +156,7 @@
                      icon="el-icon-edit"
                      @click="workIssue(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="work"
           >任务下发</el-button>
           <el-button v-if=" 'inpector'== roleType && scope.row.workStatus == '0'"
                      size="mini"
@@ -161,6 +164,7 @@
                      icon="el-icon-edit"
                      @click="takingOrder(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="recieve"
           >接单</el-button>
           <el-button v-if="'zhengfu'!= roleType && (scope.row.workStatus == '0' || scope.row.workStatus == '1')"
                      size="mini"
@@ -168,6 +172,7 @@
                      icon="el-icon-edit"
                      @click="feedbookWork(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="feedbook"
           >反馈</el-button>
           <el-button v-if="'zhengfu'!= roleType && scope.row.workStatus == '2'"
                      size="mini"
@@ -175,6 +180,7 @@
                      icon="el-icon-edit"
                      @click="sortWork(scope.row)"
                      v-hasPermi="['system:order:edit']"
+                     key="sort"
           >归档</el-button>
         </template>
       </el-table-column>
@@ -268,15 +274,18 @@
       <el-form-item label="整改方案" prop="rectificationPlan" v-show="form.workType=='3' && isDetail && (form.workStatus =='2' || form.workStatus =='3')">
          <el-input v-model="form.rectificationPlan" type="textarea" placeholder="请输入整改方案" :disabled="isDetail"/>
        </el-form-item>
-      <el-form-item label="反馈图片" prop="iconUrl" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')">
-        <MyFileUpload
+      <el-form-item label="反馈图片" prop="iconUrl" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3') && form.iconUrl !='' && form.iconUrl != null">
+        <!--<MyFileUpload
           listType="picture-card"
           @resFun="getFileInfo"
           @remove="listRemove"
           :fileArr="fileList"
           :readOnly= "isDetail"
         />
-        <el-input v-show="false" disabled v-model="form.iconUrl"></el-input>
+        <el-input v-show="false" disabled v-model="form.iconUrl"></el-input>-->
+        <div style="width: 20%;">
+          <el-image :src="form.iconUrl" :preview-src-list="[form.iconUrl]" style="width: auto;height: auto;" :z-index= "3000"></el-image>
+        </div>
       </el-form-item>
        <el-form-item label="反馈信息" prop="rectificationResult" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')">
          <el-input v-model="form.rectificationResult" type="textarea" placeholder="请输入整改结果" :disabled="isDetail"/>
@@ -431,7 +440,6 @@ export default {
       // 导出遮罩层
       exportLoading: false,
       detailDialogVisible: false,
-      workForm: {},
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -771,7 +779,7 @@ export default {
         this.workForm.workAssignMan = row.workAssignMan;
       }*/
       //this.workForm = row;
-      this.workForm.workStatus = '1';
+      //this.workForm.workStatus = '1';
       this.workOpen = true;
       this.getEnterpriseLists();
       this.getInspectionUserList(row.workAssignEnterproseId);