重点页面修改

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

@@ -93,7 +93,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            A类项目数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.atotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -101,32 +101,31 @@
                             </div>
                         </label>
                         <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
+                            B类项目数<span class="lanse-first" style="color: #E0534E">{{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" style="color: #ff0d56">{{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">
+                            D类项目数<span class="lanse-first">{{beginRate.dtotal}}</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.total - beginRate.atotal - beginRate.btotal - beginRate.ctotal - beginRate.dtotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
@@ -134,17 +133,19 @@
                             </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>
@@ -492,77 +493,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'
@@ -700,55 +630,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/subFixGetAllCb", 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) {
                             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;
                         }
                     });
                 },