xiugai1

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址r
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -2660,13 +2660,24 @@ export default {
           this.taskAllNum = res.data.data[0].taskAllNum
           console.log(this.noticedata)
           console.log(this.taskAllNum)
-          if (this.taskAllNum != null) {
-            if (this.taskAllNum == 0) {
-              console.log('进入了标记为0')
-              this.badgeshow = true
-            } else {
-              console.log('进入了标记不为0')
-              this.badgeshow = false
+          if (this.taskAllNum !=null){
+            if (this.taskAllNum==0){
+              console.log("进入了标记为0")
+              this.badgeshow=true
+            }else{
+              console.log("进入了标记不为0")
+              this.badgeshow=false
+              if(this.$store.state.index==1){
+                let data={
+                  noticetitle:this.noticedata[0].noticetitle,
+                  noticecontent:this.noticedata[0].noticecontent,
+                  insertusername:this.noticedata[0].insertusername,
+                  inserttime:this.noticedata[0].inserttime,
+                  noticeid:this.noticedata[0].noticeId
+                }
+                this.noticedata1=data
+                this.centerDialogVisible=true;
+              }
             }
           } else {
             console.log('进入了标记值为null的值')

src/store/index/index.js

@@ -11,6 +11,7 @@
 import login from './login.js';
 
 const state = {
+  status1:0
 }
 
 const getters = {

src/views/TMS/components/importedMine/addWagonloadCopy.vue

@@ -58,6 +58,7 @@
     <div
       class="table item left"
       style="height:300px;
+        width:800px;
         float:left;
         overflow:auto"
     >
@@ -66,7 +67,7 @@
           @row-click="rowClick"
           :data="tableData"
           :row-style="{height:'40px'}"
-          style="width: 100%;font-size: 18px">
+          style="font-size: 18px">
         <el-table-column
           type="selection"
           width="40px">
@@ -119,7 +120,7 @@
             margin-left:10px;
            float:right;"
     >
-      <div class="form">
+      <div class="form__addWagonLoad">
         <div class="form_box_addWagonLoad" style="">
           <el-form>
             <div class="preview-group">
@@ -793,12 +794,9 @@ export default {
       height: 0.0625rem;
     }
   }
-  .form {
-    display: flex;
+  .form__addWagonLoad {
     .form_box_addWagonLoad {
       width: 340px;
-      margin-left: 30px;
-      margin-right: 20px;
       .el-form {
         .preview-group {
           .el-form-item {

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -31,6 +31,7 @@
 import tableItem from "./tableItem";
 import FileSaver from "file-saver";
 import XLSXStyle from 'xlsx-style'
+import { isNumber } from '../../ADMINISTRATORS/app';
 export default {
   name: "TableView",
   components: {
@@ -205,6 +206,11 @@ export default {
         //这里遍历单元格给单元格对象设置属性,s为控制样式的属性
         Object.keys(table_book.Sheets.Sheet1).forEach((key) => {
           if (key.indexOf('!') < 0 && rangeList.indexOf(this.getCol(key)) >= 0 && filterList.indexOf(key)< 0) {
+            //更改格式
+            if(isNumber(table_book.Sheets.Sheet1[key].v)){
+              table_book.Sheets.Sheet1[key].v=parseFloat(table_book.Sheets.Sheet1[key].v).toFixed(2);
+              console.log(key+":",table_book.Sheets.Sheet1[key].v);
+            }
             table_book.Sheets.Sheet1[key].s = {
               font:{
                 name:"宋体",
@@ -404,6 +410,49 @@ export default {
       this.axios.post("/api/v1/tms/selectAllShipDynamaics").then(res => {
         if (res.data.code == "200") {
           this.tableData = res.data.data;
+          console.log("this.tableData:",this.tableData);
+          this.tableData.forEach(item=>{
+            try {
+              item.tonnage=item.tonnage.toFixed(2);
+            } catch (error) {
+              
+            }
+            try {
+              if(item.capacityNumber1 || item.capacityNumber1==0){
+                item.capacityNumber1=parseFloat(item.capacityNumber1).toFixed(2); 
+              }
+            } catch (error) {
+              
+            }
+            try {
+              if(item.capacityNumber2 || item.capacityNumber2==0){
+                item.capacityNumber2=parseFloat(item.capacityNumber2).toFixed(2);
+              }
+            } catch (error) {
+              
+            }
+            try {
+              if(item.capacityNumber3 || item.capacityNumber3==0){
+                item.capacityNumber3=parseFloat(item.capacityNumber3).toFixed(2);
+              }
+            } catch (error) {
+              
+            }
+            try {
+              if(item.capacityNumber4 || item.capacityNumber4==0){
+                item.capacityNumber4=parseFloat(item.capacityNumber4).toFixed(2);
+              }
+            } catch (error) {
+              
+            }
+            try {
+              if(isNumber(item.capacity1)){
+                item.capacity1=parseFloat(item.capacity1).toFixed(2);
+              }
+            } catch (error) {
+              
+            }
+          });
           console.log(this.tableData);
         } else {
           this.$message({

src/views/statisticalReport/components/salesLogisticsStatistics/mapTest.vue

@@ -509,16 +509,16 @@ export default {
           element.runRoute[element.runRoute.length - 1].lat
         ])
         //结束标记点
-        if (element.endPoint.lon != '' && element.endPoint.lat != '') {
-          that.initMarkes(
-            20,
-            35,
-            require('@/assets/img/end.png'),
-            element.endPoint.lon,
-            element.endPoint.lat,
-            '终点'
-          )
-        }
+        // if (element.endPoint.lon != '' && element.endPoint.lat != '') {
+        //   that.initMarkes(
+        //     20,
+        //     35,
+        //     require('@/assets/img/end.png'),
+        //     element.endPoint.lon,
+        //     element.endPoint.lat,
+        //     '终点'
+        //   )
+        // }
       })
     },
     //获得结束地址
@@ -566,7 +566,7 @@ export default {
         that.initPathSimplifier()
         that.threeMarker()
         //that.initCustomMarkes(that.capacityNumber+"("+that.listPath[0].miled+")",that.listPath[0].currentPointName,that.listPath[0].currentPoint.lon,that.listPath[0].currentPoint.lat)
-        that.endline()
+        //that.endline()//预估路径
       })
     },
     initCustomMarkes(title, details, lon, lat) {