修改雷达状态

src/utils/tool.js

@@ -85,6 +85,51 @@ const correctDeviation = (e) => {
     }
 }
 
-export {
-    calcRectangleFromPoints, getLocalPositionRelativeToP4, getDeviationValue, correctDeviation
+const parseTime = (time, pattern) => {
+    if (arguments.length === 0 || !time) {
+        return null;
+    }
+    const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}';
+    let date;
+    if (typeof time === 'object') {
+        date = time;
+    } else {
+        if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
+            time = parseInt(time);
+        } else if (typeof time === 'string') {
+            time = time
+                .replace(new RegExp(/-/gm), '/')
+                .replace('T', ' ')
+                .replace(new RegExp(/\.[\d]{3}/gm), '');
+        }
+        if (typeof time === 'number' && time.toString().length === 10) {
+            time = time * 1000;
+        }
+        date = new Date(time);
+    }
+    let formatObj;
+    formatObj = {
+        y: date.getFullYear(),
+        m: date.getMonth() + 1,
+        d: date.getDate(),
+        h: date.getHours(),
+        i: date.getMinutes(),
+        s: date.getSeconds(),
+        a: date.getDay()
+    };
+    return format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+        let value = formatObj[key];
+        // Note: getDay() returns 0 on Sunday
+        if (key === 'a') {
+            return ['日', '一', '二', '三', '四', '五', '六'][value];
+        }
+        if (result.length > 0 && value < 10) {
+            value = '0' + value;
+        }
+        return value || 0;
+    });
+}
+
+export {
+    calcRectangleFromPoints, getLocalPositionRelativeToP4, getDeviationValue, correctDeviation,parseTime
 }

src/views/index.vue

@@ -676,7 +676,7 @@
         </el-form-item>
         <el-form-item label="处理信息描述" label-width="120px">
           <el-input
-              v-model="dialog1Form.text"
+              v-model="dialog1Form.description"
               style="width: 100%"
               :rows="2"
               type="textarea"
@@ -744,7 +744,7 @@
         </el-form-item>
         <el-form-item label="处理信息描述" label-width="120px">
           <el-input
-              v-model="dialog2Form.text"
+              v-model="dialog2Form.description"
               style="width: 100%"
               :rows="2"
               type="textarea"
@@ -813,7 +813,7 @@
         </el-form-item>
         <el-form-item label="处理信息描述" label-width="120px">
           <el-input
-              v-model="dialog3Form.text"
+              v-model="dialog3Form.description"
               style="width: 100%"
               :rows="2"
               type="textarea"
@@ -1002,7 +1002,7 @@ import {
   calcRectangleFromPoints,
   getLocalPositionRelativeToP4,
   getDeviationValue,
-  correctDeviation
+  correctDeviation, parseTime
 } from '@/utils/tool'
 
 const date1 = ref([])
@@ -1248,7 +1248,11 @@ const processData = (data) => {
 const setTable1Data = (e) => {
   let fodInfo = e.DarDatas.filter(v => v.Lon !== 0 && v.Lat !== 0)
   tableData1.value = [...tableData1.value, ...fodInfo.map((v, k) => {
-    return {...v, index: tableData1.value.length + k}
+    return {
+      ...v,
+      time:parseTime(v.time),
+      index: tableData1.value.length + k
+    }
   })]
 }
 
@@ -1400,7 +1404,8 @@ const openHandleObstacleDialog2 = (e) => {
     longitude: e.row.lon,
     latitude: e.row.lat,
     strength: e.row.strength,
-    fileList: []
+    fileList: [],
+    description:''
   }
 }
 // 删除固定物
@@ -1558,7 +1563,8 @@ const openHandleObstacleDialog = (e) => {
     longitude: e.row.Lon,
     latitude: e.row.Lat,
     strength: e.row.Strength,
-    fileList: []
+    fileList: [],
+    description:''
   }
 }
 // 确定处理
@@ -1779,7 +1785,8 @@ const openHandleObstacleDialog1 = (e) => {
     longitude: e.row.Lon,
     latitude: e.row.Lat,
     strength: e.row.Strength,
-    fileList: []
+    fileList: [],
+    description:''
   }
 }
 // 确定处理