sujunling vor 5 Monaten
Ursprung
Commit
10fbbed6b4

BIN
.DS_Store


+ 2 - 2
public/config.js

@@ -18,7 +18,7 @@ export const iserverConfig = {
 }
 export const getResultList = {
     coordinatedEvaluationUrl: "https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport2/data/response.json",
-    //coordinatedEvaluationUrl: "./static/response.json",
+    // coordinatedEvaluationUrl: "./static/response.json",
     analyseDataUrl: "https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport2/analyze_epc_synergy",
     problemUrl: "https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport3/data/response.json",
     
@@ -26,7 +26,7 @@ export const getResultList = {
     problemFileUrl: "https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport3/process_documents",
     sgjdmn_init: 'https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport1/static/data/testData.json',
     sgjdmn_analysis: 'https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport1/run',
-    fileUrl: 'https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport1/fileUrl',//下载
+    fileUrl: 'https://tgdcepc.ctg.com.cn:8443/gis/decisionsupport1/upload-file',//下载
     downloadUrl: '',//下载
 
     // sgjdmn_init: './static/testData.json',

+ 6 - 3
src/views/groupPage/districtPageModules/decisionSupport/constructionProgressSimulation/LeftBox.vue

@@ -32,7 +32,7 @@
             </div>
           </template>
         </div>
-        <div class="tableBox" v-if="tableData.length">
+        <div class="tableBox tableBoxL" v-if="tableData.length">
           <div class="title">【方案{{ title + 1 }}】因停工导致延期的施工工序</div>
           <el-table :data="tableData" size="mini" style="width: 100%" height="250">
             <el-table-column prop="step" label="工序" width="50"> </el-table-column>
@@ -114,8 +114,11 @@ export default {
 }
 </script>
 <style>
-.tableBox .el-table--scrollable-x .el-table__body-wrapper{
-    overflow-x: none;
+.tableBoxL .el-table--scrollable-x .el-table__body-wrapper{
+    overflow-x: hidden !important;
+}
+.tableBoxL .el-table--scrollable-x .el-table__body-wrapper::-webkit-scrollbar {
+  height: 0px !important; /* 横向滚动条的高度 */
 }
 .tableBox th.el-table__cell,
 .tableBox .el-table,

+ 28 - 13
src/views/groupPage/districtPageModules/decisionSupport/constructionProgressSimulation/RightBox.vue

@@ -22,10 +22,20 @@
         <div class="inputStopDate" v-if="planDateList.length">
           <template v-for="(item, index) in planDateList">
             <div :key="'inputStopDate_' + index" class="dateTimeDiv">
-              <div class="itemTitle" v-if="index" @click="changeTab(item, index)" :class="{ activeBut: activeName === index }">
+              <div
+                class="itemTitle"
+                v-if="index"
+                @click="changeTab(item, index)"
+                :class="{ activeBut: activeName === index }"
+              >
                 施工调整开始时间
               </div>
-              <div class="itemTitle" v-else @click="changeTab(item, index)" :class="{ activeBut: activeName === index }">
+              <div
+                class="itemTitle"
+                v-else
+                @click="changeTab(item, index)"
+                :class="{ activeBut: activeName === index }"
+              >
                 施工计划开始时间
               </div>
               <el-date-picker
@@ -49,16 +59,21 @@
                 <i class="removeDate el-icon-remove-outline" style="color: #78b6e7"></i>
               </div>
             </div>
+            <div :key="'inputStopDae_' + index" class="tableBox tableBoxRight" v-if="tableData.length && activeName === index">
+              <el-table :data="tableData" size="mini" height="550">
+                <el-table-column prop="step" label="序号" width="60"> </el-table-column>
+                <el-table-column prop="area" label="标识"> </el-table-column>
+                <el-table-column prop="total_volume" label="任务量"> </el-table-column>
+                <el-table-column prop="machine_count" label="机械数量"> </el-table-column>
+                <el-table-column prop="area_volume" label="面积体积"> </el-table-column>
+                <el-table-column prop="total_efficiency" label="总效率"> </el-table-column>
+                <el-table-column prop="machine_efficiency" label="机械效率"> </el-table-column>
+                <el-table-column prop="team_efficiency" label="团队效率"> </el-table-column>
+                <el-table-column prop="wait_time" label="等待时间"> </el-table-column>	
+              </el-table>
+            </div>
           </template>
         </div>
-        <div class="tableBox tableBoxRight" v-if="tableData.length">
-          <el-table :data="tableData" size="mini" height="250">
-            <el-table-column prop="step" label="序号" width="60"> </el-table-column>
-            <el-table-column prop="area" label="标识"> </el-table-column>
-            <el-table-column prop="total_volume" label="任务量"> </el-table-column>
-            <el-table-column prop="machine_count" label="机械数量"> </el-table-column>
-          </el-table>
-        </div>
       </div>
     </div>
   </transition>
@@ -221,7 +236,7 @@ export default {
           file: r.conversion_file
         })
       }
-      this.tableData = r.start_file; 
+      this.tableData = r.start_file
     }
   }
 }
@@ -257,8 +272,8 @@ export default {
 }
 </style>
 <style>
-.tableBox .el-table--scrollable-x .el-table__body-wrapper{
-    overflow-x: none;
+.tableBox .el-table--scrollable-x .el-table__body-wrapper {
+  overflow-x: none;
 }
 .tableBox th.el-table__cell,
 .tableBox .el-table,