运营监管修改

src/apis/yyjg.js

@@ -32,7 +32,10 @@ export function GetZxjc() {
   return request({
       url: '/DigitalTwin/businessManage/GetTodayDeclareBoatState',
       method: "post",
-      data: {},
+      data: {
+        pageIndex: 1,
+        pageSize: 10
+      }
   })
 }
 

src/views/yyjg/Index.vue

@@ -46,13 +46,13 @@
                   <span>{{ item.state }}</span>
                 </div>
                 <span v-if="item.startWorkTime!=='--'">
-                  {{ useDateFormat(item.startWorkTime, 'MM/DD HH:mm').value + ' - ' + useDateFormat(item.gpsTime, 'MM/DD HH:mm').value }}
+                  {{ item.startWorkTime + ' - ' + item.endWorkTime }}
                 </span>
                 <span v-else>--</span>
                 <div>
                   <div>
                     <span>货物: </span>
-                    <span>{{ item.cargoName }}</span>
+                    <span :title="item.cargoName">{{ item.cargoName }}</span>
                   </div>
                   <div>
                     <span>申报量(吨): </span>
@@ -144,7 +144,18 @@ export default {
   function getData_zysb() {
     GetZysb().then(res => {
       listData_zysb.data.forEach(i => {
-        i.count = res.data[i.fieldName]
+        if(i.fieldName==='ton') {
+          let valLen = Math.round(+res.data['ton']).toString().length
+          if(valLen<5) {
+            i.count = +res.data['ton'].toFixed(2)
+            i.unit = '吨'
+          } else {
+            i.count = (+res.data['ton']/10000).toFixed(2)
+            i.unit = '万吨'
+          }
+        } else {
+          i.count = res.data[i.fieldName]
+        }
       })
       chartData_entThroughput5.data = res.data.topList.sort((a,b) => b.ton - a.ton)
       setEntThroughput5(document.getElementById('chart-top5'), chartData_entThroughput5.data)
@@ -166,7 +177,7 @@ export default {
 
   function getData_zxjc() {
     GetZxjc().then(res => {
-      listData_zxjc.data = res.data.Rows
+      listData_zxjc.data = res.data.Rows.sort((a,b) => b.startWorkTime - a.startWorkTime)
       setTimeout(() => {
         getData_zxjc()
       }, 10000);
@@ -174,8 +185,8 @@ export default {
   }
 
   const listData_zxjc = reactive({data: [
-    { shipName: '--', state: '--', startWorkTime: '--', gpsTime: '--', cargoName: '--', declareTon: 0 },
-    { shipName: '--', state: '--', startWorkTime: '--', gpsTime: '--', cargoName: '--', declareTon: 0 }
+    { shipName: '--', state: '--', startWorkTime: '--', endWorkTime: '--', cargoName: '--', declareTon: 0 },
+    { shipName: '--', state: '--', startWorkTime: '--', endWorkTime: '--', cargoName: '--', declareTon: 0 }
   ]})
 
   const listData_zxjc_len = computed(() => {
@@ -437,12 +448,21 @@ export default {
           display: flex;
           justify-content: space-between;
           align-items: center;
+          &>div {
+            display: flex;
+            align-items: center;
+          }
           div>span:nth-child(1) {
             font-size: 14px;
             font-weight: 400;
             color: #FFFFFF;
           }
           div:nth-child(1)>span:nth-child(2) {
+            display: inline-block;
+            max-width: 57px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
             font-size: 14px;
             color: #66E6FF;
           }
@@ -456,8 +476,8 @@ export default {
     }
     ::v-deep {
       .el-carousel__indicator--horizontal {
-        margin: 0 2px;
-        padding: 8px 3px;
+        margin: 0 4px;
+        padding: 8px 4px;
       }
       .el-carousel__indicator button {
         width: 5px;