重点项目调度页面修改

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -329,7 +329,7 @@ public class SubInfoController extends BaseController {
                 //重点项目对外展示页面
                 return new ModelAndView("/vmodules/subject/subInfo/tz/major_out.jsp");
             case "yearSum":
-                //年度固定资产项目库 - 新建项目
+                //重点项目调度  -  投产项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/year_sum.jsp");
             case "yearNew":
                 //年度固定资产项目库 - 新建项目

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend_sum.jsp

@@ -345,7 +345,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>
@@ -353,7 +353,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>
@@ -361,15 +361,7 @@
                             </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.beginRate}}</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>
@@ -377,17 +369,18 @@
                             </div>
                         </label>
                     </div>
+
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-                        <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" class="second_line">
                         <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>
@@ -772,77 +765,6 @@
             methods: {
                 init: function () {
                     this.winH = document.body.clientHeight;
-                  /*  layui.laydate.render({
-                        elem: '#startTime',
-                        theme: layDateTheme,
-                        range: '~'
-                    });
-                    var nowdate = new Date();
-                    nowdate.setMonth(nowdate.getMonth() + 1);
-                    var y = nowdate.getFullYear();
-                    var m = nowdate.getMonth() + 1;
-                    var d = nowdate.getDate();
-                    var formatwdate = y + '-' + m + '-' + d;
-                    layui.laydate.render({
-                        elem: '#dateConfirm',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    layui.laydate.render({
-                        elem: '#openDate',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    /!*   $("#month").val(new Date().getMonth() + 1);*!/
-                    var xmlx = [];
-                    <c:forEach items="${XMLX}" var="xm">
-                    xmlx.push({value: "${xm.code}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.kind = layui.xmSelect.render({
-                        el: "#kind",
-                        language: 'zn',
-                        data: xmlx
-                    });
-                    var indusKindData = [];
-                    <c:forEach items="${HYFL}" var="xm">
-                    indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.indusKind = layui.xmSelect.render({
-                        el: "#indusKind",
-                        language: 'zn',
-                        data: indusKindData
-                    });
-                    layui.laydate.render({
-                        elem: '#year',
-                        type: 'year',
-                        theme: layDateTheme,
-                        btns: ['now', 'confirm'],
-                        value: ${curYear}
-                    });
-                    var params = window.localStorage.getItem(this.cacheName);
-                    if (params) {
-                        layui.form.val("searchForm", JSON.parse(params));
-                    }
-                    if (${ isHydw }) {
-                        this.light = layui.xmSelect.render({
-                            el: "#light",
-                            language: 'zn',
-                            data: [
-                                /!*       {value: '0', name: '绿灯'},*!/
-                                {value: '1', name: '黄灯'},
-                                {value: '2', name: '红灯'}
-                            ]
-                        })
-                    }
-                    ;
-                    document.getElementById("exportId", function () {
-                        self.showExport = true;
-                        console.log('移入了')
-                    })
-                    document.getElementById("exportId", function () {
-                        self.showExport = false;
-                        console.log('移出了')
-                    })*/
                     var self = this;
                     layui.upload.render({
                         elem: '#importExc'
@@ -982,25 +904,6 @@
                     var   param =${params};
                     param = Object.assign(param, ${sumParams});
                     return param;
-                  /*  var param = layui.form.getValue("searchForm");
-                    if (param.rangeDate) {
-                        param.beginDate = param.rangeDate.split(" ~ ")[0];
-                        param.endDate = param.rangeDate.split(" ~ ")[1];
-                        param.rangeDate = null;
-                    } else if (param.year) {
-                        param.beginDate = param.year + "-01-01";
-                        param.endDate = param.year + "-12-31";
-                    }
-                    if (this.light) {
-                        param.light = this.light.getValue("valueStr");
-                    }
-                    if (this.indusKind) {
-                        param.indusKind = this.indusKind.getValue("valueStr");
-                    }
-                    delete (param.select)
-                    param.queryTimeType = "0"
-                    param.kind = this.kind.getValue("value").sort().join(",");
-                    return param;*/
                 },
                 getData: function () {
                     var self = this;
@@ -1012,55 +915,16 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllZj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         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;
                         }
                     });
                 },

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new_sum.jsp

@@ -353,66 +353,33 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            开工数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.kgTotal}}</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 class="layui-progress-bar"></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.zhl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar"></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;margin-bottom: 3px" class="second_line">
-                        <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" class="second_line">
                         <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>
@@ -619,22 +586,6 @@
         <span style="font-size:16px;font-weigh:500 !important;color: #FF9600">{{d.abc||''}}</span>
         {{#} }}
     </script>
-    <script type="text/html" id="amt">
-
-        {{# var computedPer = function(total, now){
-        return (total == 0) ? 0 : parseInt(now * 100 / total +0.5);
-        };
-        }}
-        <span title="">
-        <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
-    </span>
-    </script>
 
     <script type="text/html" id="leaderInfo">
         <span title="">
@@ -797,77 +748,6 @@
             methods: {
                 init: function () {
                     this.winH = document.body.clientHeight;
-                  /*  layui.laydate.render({
-                        elem: '#startTime',
-                        theme: layDateTheme,
-                        range: '~'
-                    });
-                    var nowdate = new Date();
-                    nowdate.setMonth(nowdate.getMonth() + 1);
-                    var y = nowdate.getFullYear();
-                    var m = nowdate.getMonth() + 1;
-                    var d = nowdate.getDate();
-                    var formatwdate = y + '-' + m + '-' + d;
-                    layui.laydate.render({
-                        elem: '#dateConfirm',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    layui.laydate.render({
-                        elem: '#openDate',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    /!*   $("#month").val(new Date().getMonth() + 1);*!/
-                    var xmlx = [];
-                    <c:forEach items="${XMLX}" var="xm">
-                    xmlx.push({value: "${xm.code}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.kind = layui.xmSelect.render({
-                        el: "#kind",
-                        language: 'zn',
-                        data: xmlx
-                    });
-                    var indusKindData = [];
-                    <c:forEach items="${HYFL}" var="xm">
-                    indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.indusKind = layui.xmSelect.render({
-                        el: "#indusKind",
-                        language: 'zn',
-                        data: indusKindData
-                    });
-                    layui.laydate.render({
-                        elem: '#year',
-                        type: 'year',
-                        theme: layDateTheme,
-                        btns: ['now', 'confirm'],
-                        value: ${curYear}
-                    });
-                    var params = window.localStorage.getItem(this.cacheName);
-                    if (params) {
-                        layui.form.val("searchForm", JSON.parse(params));
-                    }
-                    if (${ isHydw }) {
-                        this.light = layui.xmSelect.render({
-                            el: "#light",
-                            language: 'zn',
-                            data: [
-                                /!*       {value: '0', name: '绿灯'},*!/
-                                {value: '1', name: '黄灯'},
-                                {value: '2', name: '红灯'}
-                            ]
-                        })
-                    }
-                    ;
-                    document.getElementById("exportId", function () {
-                        self.showExport = true;
-                        console.log('移入了')
-                    })
-                    document.getElementById("exportId", function () {
-                        self.showExport = false;
-                        console.log('移出了')
-                    })*/
                     var self = this;
                     layui.upload.render({
                         elem: '#importExc'
@@ -1037,55 +917,16 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllXj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         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;
                         }
                     });
                 },
@@ -1142,7 +983,7 @@
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                             {field: 'subjectId', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
                             {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250},
                             {field: 'beginDate', title: '预计开工时间', minWidth: 200},
                             {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum_sum.jsp

@@ -345,7 +345,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>
@@ -353,66 +353,15 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            已入规<span class="lanse-first">{{beginRate.rgTotal}}</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>
-                            <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>
@@ -420,7 +369,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>
@@ -428,7 +377,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>
@@ -437,21 +386,16 @@
                         </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-
-                        <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" class="second_line">
                         <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>
@@ -466,19 +410,6 @@
                     </div>
                     <div class="sanjiao"></div>
                     <div class="export-item" v-if="showExport" style="right: 5px;top:-30px">
-                        <%--                        <button type="button" class="" @click="exportExcel">--%>
-                        <%--                            项目汇总--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportExcelByIndusKind">按所属行业--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportSchedulingExcel">项目调度表--%>
-                        <%--                        </button>--%>
-                        <%--                        <!-- <button type="button" class="" @click="exportExcel2">项目明细导出</button> -->--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportMoreExcel">自定义--%>
-                        <%--                        </button>--%>
                         <button type="button" class=""
                                 @click="exportProject">项目汇总
                         </button>
@@ -658,22 +589,6 @@
         <span style="font-size:16px;font-weigh:500 !important;color: #FF9600">{{d.abc||''}}</span>
         {{#} }}
     </script>
-    <script type="text/html" id="amt">
-
-        {{# var computedPer = function(total, now){
-        return (total == 0) ? 0 : parseInt(now * 100 / total +0.5);
-        };
-        }}
-        <span title="">
-        <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
-    </span>
-    </script>
 
     <script type="text/html" id="leaderInfo">
         <span title="">
@@ -1078,55 +993,16 @@
                     param.subCat = '2';
                     param.subYear = this.getSearchParams().year;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllTc", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         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;
                         }
                     });
                 },
@@ -1192,14 +1068,12 @@
                                 width: 100,
                                 templet: '#offsetLight'
                             },
-                            {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'amtTotal', title: '投资金额', minWidth: 250},
                             {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
                             {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
                             {field: 'statusName', title: '项目进度', width: 60},
                             {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
                             {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,