Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalGasSupController.java

@@ -6,12 +6,18 @@ import com.zehong.common.core.domain.AjaxResult;
 import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.TSupBalGasSup;
 import com.zehong.system.service.ITSupBalGasSupService;
+import com.zehong.system.service.ITTroubleStandingBookService;
+import com.zehong.web.controller.tool.TimeConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 供需平衡-气量监管Controller
@@ -37,6 +43,40 @@ public class TSupBalGasSupController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 气量监管统计
+     */
+    @GetMapping("/tSupBalGasSupStatistics")
+    public AjaxResult tSupBalGasSupStatistics()
+    {
+        List<Statistics> list=new ArrayList<>();
+        //生成近7天数据
+        List<String> sevenDate = TimeConfig.getSevenDate();
+        //查询统计日期和数量
+        List<Statistics> statistics = tSupBalGasSupService.tSupBalGasSupStatistics(sevenDate);
+
+        Map<String, List<Statistics>> collect = statistics.stream().collect(Collectors.groupingBy(e -> e.getDate()));
+        for (String s : sevenDate) {
+            List<Statistics> statistics1 = collect.get(s);
+            Statistics statisticsn=new Statistics();
+            if(statistics1!=null && statistics1.size()>0){
+                statisticsn.setCount(statistics1.get(0).getCount());
+                statisticsn.setCount1(statistics1.get(0).getCount1());
+                statisticsn.setCount2(statistics1.get(0).getCount2());
+                statisticsn.setCount3(statistics1.get(0).getCount3());
+            }else{
+                statisticsn.setCount(0);
+                statisticsn.setCount1(0);
+                statisticsn.setCount2(0);
+                statisticsn.setCount3(0);
+            }
+            statisticsn.setDate(s);
+            list.add(statisticsn);
+        }
+
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出供需平衡-气量监管列表
      */

zh-baseversion-system/src/main/java/com/zehong/system/domain/Statistics.java

@@ -12,5 +12,11 @@ public class Statistics {
 
     private int count;
 
+    private int count1;
+
+    private int count2;
+
+    private int count3;
+
     private String date;
 }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TSupBalGasSupMapper.java

@@ -2,6 +2,8 @@ package com.zehong.system.mapper;
 
 import java.util.List;
 import java.util.Map;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.TSupBalGasSup;
 
 /**
@@ -28,6 +30,8 @@ public interface TSupBalGasSupMapper
      */
     public List<TSupBalGasSup> selectTSupBalGasSupList(TSupBalGasSup tSupBalGasSup);
 
+    public List<Statistics> tSupBalGasSupStatistics(List<String> sevenDate);
+
     /**
      * 新增供需平衡-气量监管
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/ITSupBalGasSupService.java

 package com.zehong.system.service;
 
 import java.util.List;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.TSupBalGasSup;
 
 /**
@@ -27,6 +29,9 @@ public interface ITSupBalGasSupService
      */
     public List<TSupBalGasSup> selectTSupBalGasSupList(TSupBalGasSup tSupBalGasSup);
 
+    public List<Statistics> tSupBalGasSupStatistics(List<String> sevenDate);
+
+
     /**
      * 新增供需平衡-气量监管
      * 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TSupBalGasSupServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.Statistics;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TSupBalGasSupMapper;
@@ -49,6 +50,12 @@ public class TSupBalGasSupServiceImpl implements ITSupBalGasSupService
         return tSupBalGasSupMapper.selectTSupBalGasSupList(tSupBalGasSup);
     }
 
+    @Override
+    public List<Statistics> tSupBalGasSupStatistics(List<String> sevenDate)
+    {
+        return tSupBalGasSupMapper.tSupBalGasSupStatistics(sevenDate);
+    }
+
     /**
      * 新增供需平衡-气量监管
      * 

zh-baseversion-system/src/main/resources/mapper/system/TSupBalGasSupMapper.xml

@@ -58,6 +58,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''"> and en.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
         </where>
     </select>
+
+    <!--查询统计信息-->
+    <select id="tSupBalGasSupStatistics" resultType="com.zehong.system.domain.Statistics">
+        SELECT
+        SUM(f_plan_quan) as 'count',
+        SUM(f_appr_quan) as 'count1',
+        SUM(f_sup_gas_vol) as 'count2',
+        SUM(f_storage_vol) as 'count3',
+        DATE_FORMAT( f_rep_date, '%Y-%m-%d' ) AS date
+        FROM
+        t_sup_bal_gas_sup
+        WHERE
+        is_del='0'
+        and
+        DATE_FORMAT( f_rep_date, '%Y-%m-%d' ) IN
+        <foreach collection="list" item="sevenDate" separator="," open="(" close=")">
+            #{sevenDate}
+        </foreach>
+        GROUP BY
+        DATE_FORMAT( f_rep_date, '%Y-%m-%d' )
+        ORDER BY
+        DATE_FORMAT( f_rep_date, '%Y-%m-%d' ) DESC;
+    </select>
     
     <select id="selectTSupBalGasSupById" parameterType="Long" resultMap="TSupBalGasSupResult">
         <include refid="selectTSupBalGasSupVo"/>

zh-baseversion-web/src/api/bigWindow/charsData.js

@@ -24,6 +24,15 @@ export function getYHZZ(query) {
     params: query
   })
 }
+
+// 气量监管统计接口
+export function getQLJG(query) {
+  return request({
+    url: '/supplyBalance/gas/tSupBalGasSupStatistics',
+    method: 'get',
+    params: query
+  })
+}
 // 燃气用户统计接口
 export function getYHTJ(query) {
   return request({

zh-baseversion-web/src/components/bigWindow/leftBar.vue

@@ -118,7 +118,7 @@
         <div class="fong-div" style="margin-left: 3px;"></div>
         <div class="fong-div" style="margin-left: 3px;"></div> -->
         <span style="letter-spacing: 1px; color: #fff; float: right">
-          隐患分析
+          气量监管
         </span>
         <!-- <img src="../../assets/second1/ti-bg.png" alt=""> -->
         <div class="rightline3"></div>
@@ -144,7 +144,7 @@ import { selectWorkOrderNum } from "@/api/operationMonitor/order";
 // require("echarts/lib/component/title");
 // let echarts = this.$echarts;
 
-import { getSGSL, getYHZZ, getYHTJ } from "@/api/bigWindow/charsData.js";
+import { getQLJG,getSGSL, getYHZZ, getYHTJ } from "@/api/bigWindow/charsData.js";
 
 export default {
   data() {
@@ -216,7 +216,7 @@ export default {
     async getLineChats() {
       // getSGSL,getYHZZ
 
-      await getSGSL().then((res) => {
+      /*await getSGSL().then((res) => {
         console.log("aaa", res);
         this.datanow.date = res.data.map((item) => item.date).reverse();
         this.datanow.shigu1 = res.data.map((item) => item.count).reverse();
@@ -224,6 +224,14 @@ export default {
       await getYHZZ().then((res) => {
         console.log("bbb", res);
         this.datanow.shigu2 = res.data.map((item) => item.count).reverse();
+      });*/
+      await getQLJG().then((res) => {
+        console.log("CCC", res);
+        this.datanow.date = res.data.map((item) => item.date).reverse();
+        this.datanow.shigu1 = res.data.map((item) => item.count).reverse();
+        this.datanow.shigu2 = res.data.map((item) => item.count1).reverse();
+        this.datanow.shigu3 = res.data.map((item) => item.count2).reverse();
+        this.datanow.shigu4 = res.data.map((item) => item.count3).reverse();
       });
       this.drawLine(this.datanow);
     },
@@ -484,7 +492,7 @@ export default {
         },
         series: [
           {
-            name: "事故数量",
+            name: "计划量",
             data: data.shigu1,
             type: "line",
             smooth: true,
@@ -502,7 +510,7 @@ export default {
             data: data.shigu2,
             type: "line",
             smooth: true,
-            name: "隐患整治数",
+            name: "批复量",
             areaStyle: {
               normal: {
                 // 渐变填充色（线条下半部分）
@@ -513,6 +521,36 @@ export default {
               },
             },
           },
+          {
+            data: data.shigu3,
+            type: "line",
+            smooth: true,
+            name: "供气量",
+            areaStyle: {
+              normal: {
+                // 渐变填充色（线条下半部分）
+                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: "#d630dc" },
+                  { offset: 1, color: "#91cc7500" },
+                ]),
+              },
+            },
+          },
+          {
+            data: data.shigu4,
+            type: "line",
+            smooth: true,
+            name: "储存量",
+            areaStyle: {
+              normal: {
+                // 渐变填充色（线条下半部分）
+                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: "#f38e0d" },
+                  { offset: 1, color: "#91cc7500" },
+                ]),
+              },
+            },
+          },
           // {
           //   data: data.shigu3,
           //   type: "line",

zh-baseversion-web/src/layout/components/Navbar.vue

@@ -90,6 +90,13 @@ export default {
       xiaohidden:false,
       receivedList:[],
       routerPath:"",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 100,
+        status:5,
+        enterpriseId:""
+      },
     }
   },
   computed: {

zh-baseversion-web/src/views/specialist/behInfo/index.vue

@@ -203,7 +203,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      // 申报状态：1 已上报，2 未上报，3 已通过，4未通过 字典
+      // 申报状态：1 已上报，2 未上报 字典
       fRepStatusOptions: [],
       // 查询参数
       queryParams: {
@@ -232,7 +232,7 @@ export default {
   },
   created() {
     this.getList();
-    this.getDicts("t_rep_status").then(response => {
+    this.getDicts("t_expert_rep_status").then(response => {
       this.fRepStatusOptions = response.data;
     });
   },

zh-baseversion-web/src/views/specialist/info/index.vue

@@ -138,6 +138,7 @@
           icon="el-icon-download"
           size="mini"
 		      :loading="exportLoading"
+          @click="handleExport"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -379,7 +380,12 @@
 
           <el-col :span="12">
             <el-form-item label="从事专业工作年限" prop="fMajorLife">
-              <el-input v-model="form.fMajorLife" placeholder="请输入从事专业工作年限" />
+              <el-input-number 
+                  :style="{width: '320px'}"
+                  controls-position="right"
+                  :min="0"
+                  v-model="form.fMajorLife"  
+                  placeholder="请输入从事专业工作年限" />
             </el-form-item>
           </el-col>
 
@@ -528,7 +534,7 @@ export default {
       fThisProvinceFlagOptions: [],
       // 是否有效：0 有效，1 无效字典
       fValidTypeOptions: [],
-      //1 已上报，2 未上报，3 已通过，4未通过
+      //1 已上报，2 未上报
       repStatusOptions: [],
       // 查询参数
       queryParams: {
@@ -649,7 +655,7 @@ export default {
     this.getDicts("t_valid_type").then(response => {
       this.fValidTypeOptions = response.data;
     });
-    this.getDicts("t_rep_status").then(response => {
+    this.getDicts("t_expert_rep_status").then(response => {
         this.repStatusOptions = response.data;
     });
   },
@@ -691,6 +697,9 @@ export default {
       this.open = false;
       this.reset();
     },
+    filterNum(value){
+      this.form.fMajorLife = Math.abs(this.value)    //去除中文输入下的负号和 this.value是字符时00开头等乱输        
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -838,3 +847,10 @@ export default {
   }
 };
 </script>
+
+<style>
+
+.el-input-number .el-input__inner{
+  text-align: left;
+}
+</style>
\ No newline at end of file