提交代码

zmk

2024-10-23 3f47c88e7cb4e53b3637620794420181f47b5a5e

 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html

@@ -150,21 +150,22 @@
               </div>

               <div style="flex:6;" class="ilblock">
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     协调中
                     <span style="float: right">{{indexDataCount.projectStatus0}}</span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
<!--                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">-->
<!--                     协调中-->
<!--                     <span style="float: right">{{indexDataCount.projectStatus0}}</span>-->

                  </span>
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     待开工
                     <span style="float: right">{{indexDataCount.projectStatus1}}</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
                  </span>
<!--                  </span>-->
<!--                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">-->
<!--                     待开工-->
<!--                     <span style="float: right">{{indexDataCount.projectStatus1}}</span>-->
<!--                  </span>-->
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     进行中
                     <span style="float: right">{{indexDataCount.projectStatus2}}</span>
<!--                     <li class="el-icon-caret-top" style="color: #409eff">-->
                  </span>
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     已完成
                     <span style="float: right">{{34-indexDataCount.projectStatus2}}</span>
                  </span>

               </div>
@@ -187,11 +188,9 @@
               <div style="flex:6;" class="ilblock">
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     总进尺 <span style="float: right">{{indexDataCount.footageCount}}m</span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.87);font-size: 15px;">
                     已完成   <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
               </div>
            </el-card>
@@ -287,7 +286,7 @@
                           <div v-if="entity.status=='协调中'" class="active-red">{{entity.ranking}}</div>
                           <div v-if="entity.status=='待开工'" class="active-yellow">{{entity.ranking}}</div>
                           <div v-if="entity.status=='进行中'" class="active-blue">{{entity.ranking}}</div>

                           <div v-if="entity.status=='完工'" class="active-red">{{entity.ranking}}</div>
                        </el-col>

                        <el-col :span="7">
@@ -318,7 +317,8 @@
   <script th:src="@{/js/jquery.min.js}"></script>
   <script th:src="@{/js/bootstrap.min.js}"></script>
   <script th:src="@{/ajax/libs/flot/jquery.flot.js}"></script>
   <script th:src="@{/ajax/libs/report/echarts/echarts-all.js}"></script>
<!--   <script th:src="@{/ajax/libs/report/echarts/echarts-all.js}"></script>-->
   <script src="https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js"></script>
   <script th:src="@{/js/tdt.js}" type="text/javascript"></script>
   <script src="http://lbs.tianditu.gov.cn/js/lib/d3/d3.min.js" type="text/javascript"></script>
   <script src="http://lbs.tianditu.gov.cn/api/js4.0/opensource/openlibrary/D3SvgOverlay.js" type="text/javascript"></script>
@@ -555,9 +555,9 @@
               iconSize: new T.Point(30, 30),
               iconAnchor: new T.Point(6, 40),
            });
         }else {
         }else if (data[i].status === '3') {
            projectIcon = new T.Icon({
               iconUrl: '/bjfw/images/icon/red.png',
               iconUrl: '/bjfw/images/icon/ending.png',
               iconSize: new T.Point(30, 30),
               iconAnchor: new T.Point(6, 40),
            });