Parcourir la source

重点库页面调整

Wayne il y a 4 mois
Parent
commit
8419e17577

+ 3 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -11,6 +11,7 @@ import com.rtrh.projects.modules.projects.po.SubInfo;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.export.*;
+import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
@@ -73,4 +74,6 @@ public interface SubInfoMapper {
     List<MoneyMap> selectYearMoney(@Param("subIdList") List<String> subIdList, @Param("year") String year);
 
     List<SubInfoFixTcDetail> exportFixTcDetailExcel(@Param("stateFix") String stateFix,@Param("year") String year);
+
+    List<SubFixGetBeginRateVo> subFixGetBeginRate(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds);
 }

+ 36 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -522,4 +522,40 @@
           AND sub_fix.cat = #{stateFix}
           AND sub_fix.year = #{year}
     </select>
+    <select id="subFixGetBeginRate" resultType="com.rtrh.projects.vo.projects.SubFixGetBeginRateVo">
+        SELECT
+        sub_info.id AS id,
+        sub_info.status AS status,
+        sub_info.subject_id AS subjectId,
+        sub_info.indus_kind AS indusKind,
+        sub_info.is_rg AS isRg,
+        sub_info.abc AS abc
+        FROM sub_fix
+        LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id
+        WHERE
+        sub_fix.cat = #{queryVO.stateFix}
+        AND sub_fix.year = #{queryVO.year}
+        AND sub_info.logic_delete_flag = 0
+        <if test="queryVO.subName != null and queryVO.subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{queryVO.subName}, '%')
+        </if>
+        <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
+            AND sub_info.subject_id = #{queryVO.subjectId}
+        </if>
+        <if test="queryVO.indusKind != null and queryVO.indusKind != ''">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryVO.sbdw != null and queryVO.sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{queryVO.sbdw}, '%')
+        </if>
+        <if test="queryVO.startAmt != null and queryVO.startAmt != ''">
+            AND sub_info.amt_total &gt;= #{queryVO.startAmt}
+        </if>
+        <if test="queryVO.endAmt != null and queryVO.endAmt != ''">
+            AND sub_info.amt_total &lt;= #{queryVO.endAmt}
+        </if>
+    </select>
 </mapper>

+ 8 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoQueryService.java

@@ -13,6 +13,7 @@ import com.rtrh.projects.modules.projects.vo.export.ExportQueryVO;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoExportVO;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
 import com.rtrh.projects.modules.system.vo.LoginUserVO;
+import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import com.rtrh.projects.vo.statics.OtherQueryVO;
 import com.rtrh.projects.vo.statics.ProjectQueryVO;
 
@@ -335,4 +336,11 @@ public interface SubInfoQueryService {
 	Page queryPage(Page page, LoginUserVO loginUser, SubInfoQueryTzVO queryVO);
 
 	StatisticsVO queryStatistics(SubInfoQueryTzVO queryVO, LoginUserVO loginUser);
+
+	/**
+	 * 查询重点库项目的开工率等数据
+	 * @param
+	 * @return
+	 */
+    List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds);
 }

+ 6 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -28,6 +28,7 @@ import com.rtrh.projects.modules.system.po.JUnit;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.TSysTableService;
 import com.rtrh.projects.modules.utils.DateUtils;
+import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import com.rtrh.projects.vo.statics.OtherQueryVO;
 import com.rtrh.projects.vo.statics.ProjectQueryVO;
 import org.apache.commons.lang3.StringUtils;
@@ -312,6 +313,11 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                 .setHyflData(hyflList);
     }
 
+    @Override
+    public List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds) {
+        return subInfoMapper.subFixGetBeginRate(queryVO,indusKinds);
+    }
+
     @Override
     public Page pageAll(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
         StringBuffer sql = new StringBuffer();

+ 219 - 0
projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -1,7 +1,9 @@
 package com.rtrh.projects.web.controller.subject.api;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.github.pagehelper.PageInfo;
 import com.rtrh.common.util.StringUtil;
@@ -9,14 +11,20 @@ import com.rtrh.projects.modules.projects.dao.SubCompletedPicDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.po.SubCompletedPic;
+import com.rtrh.projects.modules.projects.po.SubIndu;
 import com.rtrh.projects.modules.projects.po.SubSource;
 import com.rtrh.projects.modules.projects.vo.StatisticsVO;
 import com.rtrh.projects.modules.projects.vo.SubFixCbVo;
 import com.rtrh.projects.modules.projects.vo.SubSourceVO;
 import com.rtrh.projects.modules.system.enums.SysTableKind;
 import com.rtrh.projects.modules.system.po.TSystable;
+import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.system.service.TSysTableService;
+import com.rtrh.projects.vo.projects.SubFixBeginVo;
+import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
+import com.rtrh.projects.vo.projects.SubFixTotalVo;
 import com.rtrh.projects.web.log.Log;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +62,9 @@ public class SubInfoQueryApiController extends BaseController {
     @Autowired
     private TSysTableService tSysTableService;
 
+    @Autowired
+    private ISubInduService subInduService;
+
     /**
      * 项目台账
      *
@@ -583,6 +594,214 @@ public class SubInfoQueryApiController extends BaseController {
         return message;
     }
 
+    /**
+     * 重点项目库获取行业分类,项目总数等数据
+     *
+     * @return
+     */
+    @PostMapping("subFixGetBeginRate")
+    public Message subFixGetBeginRate(@RequestBody SubInfoQueryTzVO queryVO) {
+        Message message = new Message();
+
+        //查询出行业分类
+        List<SubIndu> subInduList = subInduService.queryTreeALl();
+        //保存行业code
+        List<String> indusKinds = new ArrayList<>();
+        //判断搜索条件中是否有行业分类条件
+        if (StringUtils.isNotBlank(queryVO.getIndusKinds())) {
+            //在subInduList中找到code=queryVO.getIndusKinds()的数据
+            SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(queryVO.getIndusKinds())).findFirst().orElse(null);
+
+            if (subIndu != null){
+                //判断这个行业是不是上级行业
+                if (StringUtils.isBlank(subIndu.getLastId())){
+                    // 这个行业是上级行业,需要找到所有下级行业的code
+                    indusKinds = subInduList.stream().filter(item -> item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                }else {
+                    indusKinds.add(subIndu.getCode());
+                }
+            }
+        }
+
+        //获取项目地点
+        List<TSystable> jsddList = Optional.ofNullable(
+                tSysTableService.getByKind(SysTableKind.JSDD)
+        ).orElse(Collections.emptyList());
+        //将项目地点转换为map,key=code,value=title
+        Map<String, String> jsddMap = jsddList.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
+
+        //查询出该库符合条件的数据
+        List<SubFixGetBeginRateVo>  subFixGetBeginRateVoList  = subInfoQueryService.subFixGetBeginRate(queryVO,indusKinds);
+
+        //最终需要返回的数据
+        SubFixBeginVo subFixBeginVo = new SubFixBeginVo();
+        if (subFixGetBeginRateVoList != null){
+
+            int aType = 0;  //a类项目
+            int bType = 0;  //b类项目
+            int cType = 0;  //c类项目
+            int dType = 0;  //d类项目
+            int kgTotal = 0;    //开工数量
+            int xjNumber = 0;   //新建数量
+            int zjNumber = 0;   //在建数量
+            int tcNumber = 0;   //投产数量
+            int rgNumber = 0;   //入轨数量
+
+            for (SubFixGetBeginRateVo subFixGetBeginRateVo : subFixGetBeginRateVoList) {
+                if (StringUtils.isNotBlank(subFixGetBeginRateVo.getAbc())){
+                    if (subFixGetBeginRateVo.getAbc().equals("a")){
+                        aType++;
+                    }else if (subFixGetBeginRateVo.getAbc().equals("b")){
+                        bType++;
+                    }else if (subFixGetBeginRateVo.getAbc().equals("c")){
+                        cType++;
+                    }else if (subFixGetBeginRateVo.getAbc().equals("d")){
+                        dType++;
+                    }
+                }
+
+                if (StringUtils.isNotBlank(subFixGetBeginRateVo.getStatus())){
+                    if (subFixGetBeginRateVo.getStatus().equals("3") || subFixGetBeginRateVo.getStatus().equals("9")){
+                        kgTotal++;
+                    }
+
+                    //2=新建
+                    if (subFixGetBeginRateVo.getStatus().equals("2")){
+                        xjNumber++;
+                    }
+
+                    //3=在建
+                    if (subFixGetBeginRateVo.getStatus().equals("3")){
+                        zjNumber++;
+                    }
+
+                    //9=投产
+                    if (subFixGetBeginRateVo.getStatus().equals("9")){
+                        tcNumber++;
+                    }
+                }
+
+                if (subFixGetBeginRateVo.getIsRg() != null && subFixGetBeginRateVo.getIsRg() == 1){
+                    rgNumber++;
+                }
+
+                if (StringUtils.isBlank(subFixGetBeginRateVo.getSubjectId())){
+                    subFixGetBeginRateVo.setSubjectId("未知地点");
+                }else {
+                    if (StringUtils.isNotBlank(jsddMap.get(subFixGetBeginRateVo.getSubjectId()))){
+                        subFixGetBeginRateVo.setSubjectId(jsddMap.get(subFixGetBeginRateVo.getSubjectId()));
+                    }else {
+                        subFixGetBeginRateVo.setSubjectId("未知地点");
+                    }
+                }
+
+                if (StringUtils.isBlank(subFixGetBeginRateVo.getIndusKind())){
+                    subFixGetBeginRateVo.setIndusKind("未知行业");
+                }else {
+                    //找到对应的行业数据
+                    SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(subFixGetBeginRateVo.getIndusKind())).findFirst().orElse(null);
+                    if (subIndu != null){
+                        if (StringUtils.isBlank(subIndu.getParentTitle())){
+                            subFixGetBeginRateVo.setIndusKind(subIndu.getTitle());
+                        }else {
+                            subFixGetBeginRateVo.setIndusKind(subIndu.getParentTitle());
+                        }
+                    }else {
+                        subFixGetBeginRateVo.setIndusKind("未知行业");
+                    }
+                }
+            }
+
+            subFixBeginVo.setTotal(subFixGetBeginRateVoList.size());
+            subFixBeginVo.setATotal(aType);
+            subFixBeginVo.setBTotal(bType);
+            subFixBeginVo.setCTotal(cType);
+            subFixBeginVo.setDTotal(dType);
+            subFixBeginVo.setKgTotal(kgTotal);
+            subFixBeginVo.setRgTotal(rgNumber);
+
+            int number = xjNumber+zjNumber+tcNumber;
+            if (number != 0) {
+                subFixBeginVo.setZhl(new BigDecimal(xjNumber+zjNumber).divide(new BigDecimal(number), 2, RoundingMode.HALF_UP));
+                subFixBeginVo.setKfgl(subFixBeginVo.getZhl());
+                subFixBeginVo.setRgl(new BigDecimal(rgNumber).divide(new BigDecimal(number), 2, RoundingMode.HALF_UP));
+                subFixBeginVo.setTcl(new BigDecimal(tcNumber).divide(new BigDecimal(number), 2, RoundingMode.HALF_UP));
+            }else{
+                subFixBeginVo.setZhl(new BigDecimal(0));
+                subFixBeginVo.setKfgl(new BigDecimal(0));
+                subFixBeginVo.setRgl(new BigDecimal(0));
+                subFixBeginVo.setTcl(new BigDecimal(0));
+            }
+
+            //对subFixGetBeginRateVoList按照项目地点进行分组
+            Map<String, List<SubFixGetBeginRateVo>> subjectIdDataMap = subFixGetBeginRateVoList.stream().collect(Collectors.groupingBy(SubFixGetBeginRateVo::getSubjectId));
+            List<SubFixTotalVo> subjectIdList = new ArrayList<>();
+            //遍历subFixGetBeginRateVoMap,将key和value的size放入subjectIdList
+            subjectIdDataMap.forEach((key, value) -> {
+                SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
+                subFixTotalVo.setCode(key);
+                subFixTotalVo.setTitle(key);
+                subFixTotalVo.setTotal(value.size());
+                subjectIdList.add(subFixTotalVo);
+            });
+
+            //遍历subjectIdList,将对应code设置为对应的地点名称的code
+            subjectIdList.forEach(item -> {
+                //找到jsddList中与title匹配的title数据
+                Optional<TSystable> first = jsddList.stream().filter(item1 -> item1.getTitle().equals(item.getTitle())).findFirst();
+                if (first.isPresent()){
+                    item.setCode(first.get().getCode());
+                }else {
+                    item.setCode("");
+                }
+            });
+
+
+            //对subFixGetBeginRateVoList按照行业进行分组
+            Map<String, List<SubFixGetBeginRateVo>> industKindDataMap = subFixGetBeginRateVoList.stream().collect(Collectors.groupingBy(SubFixGetBeginRateVo::getIndusKind));
+            List<SubFixTotalVo> indusKindList = new ArrayList<>();
+            //遍历subFixGetBeginRateVoMap,将key和value的size放入industKindMap
+            industKindDataMap.forEach((key, value) -> {
+                SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
+                subFixTotalVo.setCode(key);
+                subFixTotalVo.setTitle(key);
+                subFixTotalVo.setTotal(value.size());
+                indusKindList.add(subFixTotalVo);
+            });
+
+            //遍历indusKindList,将对应code设置为对应的地点名称的code
+            indusKindList.forEach(item -> {
+                //找到jsddList中与title匹配的title数据
+                Optional<SubIndu> first = subInduList.stream().filter(item1 -> item1.getTitle().equals(item.getCode())).findFirst();
+                if (first.isPresent()){
+                    item.setCode(first.get().getCode());
+                }else {
+                    item.setCode("");
+                }
+            });
+
+            subFixBeginVo.setSubjectIdList(subjectIdList);
+            subFixBeginVo.setIndusKindList(indusKindList);
+
+        }else {
+            subFixBeginVo.setTotal(0);
+            subFixBeginVo.setATotal(0);
+            subFixBeginVo.setBTotal(0);
+            subFixBeginVo.setCTotal(0);
+            subFixBeginVo.setDTotal(0);
+            subFixBeginVo.setKgTotal(0);
+            subFixBeginVo.setZhl(new BigDecimal(0));
+            subFixBeginVo.setKfgl(new BigDecimal(0));
+            subFixBeginVo.setRgl(new BigDecimal(0));
+            subFixBeginVo.setTcl(new BigDecimal(0));
+            subFixBeginVo.setSubjectIdList(new ArrayList<>());
+            subFixBeginVo.setIndusKindList(new ArrayList<>());
+        }
+
+        message.setData(subFixBeginVo);
+        return message;
+    }
+
     /**
      * 开工率
      *

+ 12 - 139
projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -164,23 +164,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers ">偏离度</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="offsetMin" name="offsetMin"
-                                                   placeholder="请输入最小偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMin}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="offsetMax" name="offsetMax"
-                                                   placeholder="请输入最大偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMax}">
-                                        </div>
-                                    </div>
-                                </div>
-
 
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
                                     <div class="layui-form-item">
@@ -253,7 +236,7 @@
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
-                            建项目总数<span class="lanse-first">{{beginRate.total}}</span>
+                            建项目总数<span class="lanse-first">{{beginRate.total}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -261,7 +244,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            已开工<span class="lanse-first">{{beginRate.kgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -269,97 +252,26 @@
                             </div>
                         </label>
                         <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
+                            开(复)工率<span class="lanse-first">{{beginRate.kfgl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
-                        <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
                     </div>
-                    <div style="display: flex;margin-bottom: 3px">
 
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                    <div style="display: flex;margin-bottom: 3px">
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -971,49 +883,10 @@
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },

+ 10 - 96
projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -163,38 +163,6 @@
                                         </div>
                                     </div>
                                 </div>
-
-                                <%--                   <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                                       <div class="layui-form-item">
-                                                           <label class="layui-form-label label-longers required">资金来源</label>
-                                                           <div class="layui-input-block">
-                                                               <select name="zjly" lay-search="">
-                                                                   <option value="">请选择</option>
-                                                                   <c:forEach items="${ZJLY }" var="zj">
-                                                                       <option value="${zj.id }">${zj.title }</option>
-                                                                   </c:forEach>
-                                                               </select>
-                                                           </div>
-                                                       </div>
-                                                   </div>--%>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers ">偏离度</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="offsetMin" name="offsetMin"
-                                                   placeholder="请输入最小偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMin}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="offsetMax" name="offsetMax"
-                                                   placeholder="请输入最大偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMax}">
-                                        </div>
-                                    </div>
-                                </div>
-
-
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers required">年份</label>
@@ -273,18 +241,8 @@
                                 </div>
                             </div>
                         </label>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
                         <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
+                            开工数<span class="lanse-first">{{beginRate.kgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -292,7 +250,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
+                            转换率<span class="lanse-first">{{beginRate.zhl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -301,21 +259,16 @@
                         </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -913,49 +866,10 @@
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },

+ 14 - 94
projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -247,7 +247,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            A类项目数<span class="lanse-first">{{beginRate.atotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -255,90 +255,50 @@
                             </div>
                         </label>
                         <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
+                            B类项目数<span class="lanse-first">{{beginRate.btotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
                         <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
+                            C类项目数<span class="lanse-first">{{beginRate.ctotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
                         <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
+                            D类项目数<span class="lanse-first">{{beginRate.dtotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
+                            其它项目数<span class="lanse-first">{{beginRate.total - beginRate.atotal - beginRate.btotal - beginRate.ctotal - beginRate.dtotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
 
                     <div style="margin-bottom: 3px">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
 
@@ -953,49 +913,9 @@
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },

+ 14 - 126
projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -163,23 +163,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers ">偏离度</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="offsetMin" name="offsetMin"
-                                                   placeholder="请输入最小偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMin}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="offsetMax" name="offsetMax"
-                                                   placeholder="请输入最大偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMax}">
-                                        </div>
-                                    </div>
-                                </div>
-
 
                                 <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
                                     <div class="layui-form-item">
@@ -252,7 +235,7 @@
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
-                            续建项目总数<span class="lanse-first">{{beginRate.total}}</span>
+                            投产项目总数<span class="lanse-first">{{beginRate.total}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -260,66 +243,15 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
-                        <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
+                            已入规<span class="lanse-first">{{beginRate.rgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
+                                    <div class="layui-progress-bar"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
+                            未入规<span class="lanse-first">{{beginRate.total - beginRate.rgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -327,7 +259,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
+                            入规率<span class="lanse-first">{{beginRate.rgl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -335,7 +267,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
+                            投产率<span class="lanse-first">{{beginRate.tcl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -344,21 +276,16 @@
                         </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -968,49 +895,10 @@
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },