Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-27 9166b7b4bdb84bfe499078dd68add5c3e462411f

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

@@ -13,6 +13,10 @@
   .content {
      width: 100%;
      background-color: rgba(0,0,0,0.01) !important;
      padding:10px;
   }
   body{
      padding: 10px;
   }
   [v-cloak]{
      display: none;
@@ -79,6 +83,15 @@
      margin-top: 12px;
      cursor: pointer;
   }
   .ilblock{
      border-left: 1px solid #e3e5e7;
      padding: 0 40px;
      align-content: center;
   }
   .ilblock span{
      display: block;
      line-height: 30px;
   }

</style>
</head>
@@ -88,29 +101,34 @@
      <el-row style="height: 127px;">
         <el-col :span="6">
            <el-card class="box-card">
               <div style="flex:4;">
               <div style="flex:4;padding-right: 20px;" >
                  <div>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;">场地数量</span>
                     <li class="el-icon-s-promotion" style="font-size: 18px;float: right;color: grey">
                     <li class="el-icon-s-promotion" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #409eff;"></li>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">场地数量</span>
                  </div>
                  <div>
                  <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">34个
                  <div style="text-align: center;">
                  <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">34
                  </span>
                  </div>
               </div>

               <div style="flex:6;">
               <div style="flex:6;" class="ilblock">
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     协调中   {{indexDataCount.projectStatus0}}
                     <li class="el-icon-caret-bottom" style="color: #f56c6c">
                     协调中
                     <span style="float: right">
                        {{indexDataCount.projectStatus0}}
                     </span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     待开工    {{indexDataCount.projectStatus1}}
                      <li class="el-icon-caret-bottom" style="color: #e6a23c">
                     待开工
                     <span style="float: right">{{indexDataCount.projectStatus1}}</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #e6a23c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     进行中     {{indexDataCount.projectStatus2}}
                     <li class="el-icon-caret-top" style="color: #409eff">
                     进行中
                     <span style="float: right">{{indexDataCount.projectStatus2}}</span>
<!--                     <li class="el-icon-caret-top" style="color: #409eff">-->
                  </span>

               </div>
@@ -119,25 +137,25 @@

         <el-col :span="6">
            <el-card class="box-card">
               <div style="flex:4;">
               <div style="flex:4;padding-right: 20px;">
                  <div>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;">钻孔进尺</span>
                     <li class="el-icon-coin" style="font-size: 18px;float: right;color: grey">
                     <li class="el-icon-coin" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #085abe"></li>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">钻孔进尺</span>
                  </div>
                  <div>
                  <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">647个
                  <div style="text-align: center">
                  <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">647
                  </span>
                  </div>
               </div>

               <div style="flex:6;">
               <div style="flex:6;" class="ilblock">
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     总进尺 {{indexDataCount.footageCount}}m
                     <li class="el-icon-caret-bottom" style="color: #f56c6c">
                     总进尺 <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,.65);font-size: 15px;">
                     已完成   {{indexDataCount.footageCplCount}}m
                      <li class="el-icon-caret-bottom" style="color: #409eff">
                     已完成   <span style="float: right">{{indexDataCount.footageCplCount}}m</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
               </div>
            </el-card>
@@ -145,58 +163,58 @@

         <el-col :span="6">
            <el-card class="box-card">
               <div style="flex:4;">
               <div style="flex:4;padding-right: 20px;">
                  <div>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;">实时监控</span>
                     <li class="el-icon-video-camera" style="font-size: 18px;float: right;color: grey">
                     <li class="el-icon-video-camera" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #11d713"></li>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">实时监控</span>
                  </div>
                  <div>
                  <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">68个
                  <div style="text-align: center">
                  <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px">68
                  </span>
                  </div>
               </div>

               <div style="flex:6;">
               <div style="flex:6;" class="ilblock">
                  <div>
                     
                  </div>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     已安装  0
                     <li class="el-icon-caret-bottom" style="color: #f56c6c">
                     已安装  <span style="float: right">0</span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     未安装   68
                      <li class="el-icon-caret-bottom" style="color: #409eff">
                     未安装   <span style="float: right">68</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
               </div>
            </el-card>
         </el-col>
         <el-col :span="6">
            <el-card class="box-card">
               <div style="flex:4;">
               <div style="flex:4;padding-right: 20px;">
                  <div>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;">资料文件</span>
                     <li class="el-icon-s-order" style="font-size: 18px;float: right;color: grey">
                     <li class="el-icon-s-order" style="font-size: 18px;margin-right: 5px;margin-left: -5px;color: #917ed0"></li>
                     <span style="color:rgba(0,0,0,.65);font-size: 15px;font-weight: bold;">资料文件</span>
                  </div>
                  <div>
                  <span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">
                     {{indexDataCount.fileCount}}件
                  <div style="text-align: center">
                  <span style="color:#000;font-size: 30px;word-break: break-all;line-height: 70px;">
                     {{indexDataCount.fileCount}}
                  </span>
                  </div>
               </div>

               <div style="flex:6;">
               <div style="flex:6;" class="ilblock">
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     施工资料  0
                     <li class="el-icon-caret-bottom" style="color: #f56c6c">
                     施工资料  <span style="float: right">0</span>
<!--                     <li class="el-icon-caret-bottom" style="color: #f56c6c">-->
                  </span>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     安全资料   0
                      <li class="el-icon-caret-bottom" style="color: #409eff">
                     安全资料   <span style="float: right">0</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
                  <span style="color:rgba(0,0,0,.65);font-size: 15px;">
                     质量资料   0
                      <li class="el-icon-caret-bottom" style="color: #409eff">
                     质量资料   <span style="float: right">0</span>
<!--                      <li class="el-icon-caret-bottom" style="color: #409eff">-->
                  </span>
               </div>

@@ -206,9 +224,15 @@
      <el-row>
         <el-col :span="16">
            <el-card class="box-card">
               <div style="height: 200px;">
               <div>
                  <h3>材料统计</h3>

                  <el-col :span="10" style="height: 200px;">
                  </el-col>
                  <el-col :span="14" style="height: 200px;">
                  </el-col>
               </div>

            </el-card>

            <el-card class="box-card" style="margin-top: 4px;">
@@ -287,12 +311,21 @@
      totalProcess();
      stationProcess();
      indexCount();
      tubLogs();
   })
   function viewStation(station) {
      var lng = station.lng;
      var lat = station.lat;
      map.centerAndZoom(new T.LngLat(lng, lat), 13);
      // $.modal.openTab("场地导航",ctx+"/geo/project/navigate?ids="+id);
   }

   function tubLogs() {
      let url = ctx + "/system/tubLogData";
      $.ajaxSettings.async = false;
      $.get(url,{},function(res){
         vm.tubLogData = res.tubLogData;
      })
      $.ajaxSettings.async = false;
   }

   function indexCount() {
@@ -320,6 +353,7 @@
         return {
            stationProcessData: [],
            indexDataCount :"",
            tubLogData:[],
         };
      },
      methods: {