推料轨迹详情

src/views/statisticalAnalysis/pushingplan/index.vue

@@ -55,23 +55,36 @@
           prop="remark"
         />
         <el-table-column
-          label="开始时间"
+          label="计划开始时间"
           min-width="100px"
           align="center"
           prop="startdate"
         />
         <el-table-column
-          label="结束时间"
+          label="实际开始时间"
+          min-width="100px"
+          align="center"
+          prop="startdate"
+        />
+        <el-table-column
+          label="偏差分钟数"
+          min-width="100px"
+          align="center"
+          prop="dates"
+        />
+        <el-table-column
+          label="实际结束时间"
           min-width="100px"
           align="center"
           prop="enddate"
         />
         <el-table-column
-          label="运行时间"
+          label="实际时长(分钟)"
           min-width="100px"
           align="center"
-          prop="date"
+          prop="dates"
         />
+
         <el-table-column
           label="运行轨迹"
           align="center"
@@ -144,33 +157,31 @@
         <div class="run-box">
           <div ref="map" class="map-container"></div>
           <div class="run-box-rg">
-            <h3>运动轨迹详情</h3>
-            <div>
-              <span>推料车:</span>{{1}}
-            </div>
+            <h3>推料计划详情</h3>
             <div>
-              <span>推料车:</span>{{1}}
+              <span>推料车:</span>{{runDate?.tname || '暂无'}}
             </div>
             <div>
-              <span>计划开始时间:</span>{{1}}
+              <span>备注:</span>{{runDate?.remark || '暂无'}}
             </div>
             <div>
-              <span>实际开始时间:</span>{{1}}
+              <span>计划开始时间:</span>{{runDate?.startdate || '暂无'}}
             </div>
             <div>
-              <span>实际结束时间:</span>{{1}}
+              <span>实际开始时间:</span>{{runDate?.startdate || '暂无'}}
             </div>
             <div>
-              <span>实际时长:</span>{{1}}
+              <span>偏差分钟数:</span>{{runDate?.dates || '暂无'}}
             </div>
             <div>
-              <span>偏差分钟数:</span>{{1}}
+              <span>实际结束时间:</span>{{runDate?.enddate || '暂无'}}
             </div>
             <div>
-              <span>备注:</span>{{1}}
+              <span>实际时长:</span>{{runDate?.dates || '暂无'}} 分钟
             </div>
+
             <div>
-              <span>计划推料顺序(栏舍):</span>{{1}}
+              <span>推料栏舍顺序:</span>{{ runDate?.dates || '暂无' }}
             </div>
           </div>
         </div>
@@ -214,6 +225,7 @@ export default {
   name: 'Pushingplan',
   data() {
     return {
+      runDate:{},
       currentPage: 1,
       table: {
         offset: 1,
@@ -269,9 +281,19 @@ export default {
   created() {
     this.getButtons()
     this.getList()
+    var totalTimeInMinutes = this.timeStringToMinutes('12:20:27');
+     console.log(totalTimeInMinutes);
   },
 
   methods: {
+    // 点击查看的时候获取 推车的数据并去获取推料的原计划
+    timeStringToMinutes(timeString) {
+    var timeParts = timeString.split(':');
+    var hours = parseInt(timeParts[0]);
+    var minutes = parseInt(timeParts[1]);
+    var seconds = parseInt(timeParts[2]);
+    return (hours * 60 + minutes + seconds / 60).toFixed(2) ;
+},
     // 分页
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
@@ -314,9 +336,13 @@ export default {
         data.parammaps.enddate = ''
       }
       postJson(url, data).then((response) => {
-        console.log('table数据', response.data.list)
         if (response.data.list !== null) {
-          this.list = response.data.list
+          let arr = JSON.parse(JSON.stringify(response.data.list))
+          arr.forEach((item)=>{
+             item.dates = this.timeStringToMinutes(item.date) || item.date;
+          })
+          this.list = arr
+
         } else {
           this.list = []
         }
@@ -337,7 +363,9 @@ export default {
       this.getList()
     },
     handleRunning_trajectory(row) {
-      console.log('点击了运行轨迹')
+      this.runDate = row;
+      console.log('点击了运行轨迹',this.runDate );
+
       this.run.dialogStatus = 'run'
       this.run.dialogFormVisible = true
       this.run.temp = Object.assign({}, row)
@@ -463,28 +491,34 @@ export default {
 </script>
 <style lang="scss" scoped>
 .run-box{
-  border:1px solid red;
   display: flex;
   justify-content: space-between;
   height: 600px;
 }
 .run-box-rg{
   flex: 1;
-  border:1px solid green;
   padding-left: 20px;
   min-width:300px;
   font-size:16px;
-  .run-box-rg span{
+}
+.run-box-rg div>span{
     font-size: 16px!important;
+    padding-right: 8px;
+    display: inline-block;
+    width: 120px;
+    text-align:right;
+    margin-bottom: 5px;
   }
   .run-box-rg>div{
-    margin: 15px 0;
+    margin: 8px 0;
   }
-}
+
 
 .map-container {
   height: 600px;
   width: 840px;
+  border-right:1px dotted #eee;
+  padding:0 10px;
 }
 .search {
   clear: both;