From 805e8b3d67ba5490c65f04b31242435e58a6a578 Mon Sep 17 00:00:00 2001
From: likehai <likehai@inspur.com>
Date: Fri, 5 Jan 2024 18:23:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E6=9C=BA=20=20=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../numFarmMachinery/cPlotAutopilot/index.vue | 24 +++++++++------
 .../numFarmMachinery/dYawWarning/index.vue    | 11 +++----
 .../e01AgricultureAdvance/index.vue           | 30 ++++++++++---------
 .../e02AgricultureSpeed/index.vue             | 14 +++++++++
 .../e03AgricultureDirection/index.vue         | 14 +++++++++
 .../e04AgricultureWheel/index.vue             | 14 +++++++++
 6 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/cPlotAutopilot/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/cPlotAutopilot/index.vue
index 752b62e6..4d32bce9 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/cPlotAutopilot/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/cPlotAutopilot/index.vue
@@ -230,6 +230,11 @@
       <el-table-column label="作业路线" align="center" prop="fieldFour" :show-overflow-tooltip="true"/>
       <el-table-column label="行进方向" align="center" prop="fieldFive"/>
       <el-table-column label="行进速度" align="center" prop="fieldSix"/>
+      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="是否预警" align="center" prop="fieldNineteen">-->
       <!--        <template slot-scope="scope">-->
       <!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.fieldNineteen"/>-->
@@ -284,15 +289,7 @@
     <!-- 添加或修改新能源通用对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--        <el-form-item label="时间" prop="nowTimeOne">-->
-        <!--          <el-date-picker clearable-->
-        <!--                          v-model="form.nowTimeOne"-->
-        <!--                          type="date"-->
-        <!--                          value-format="yyyy-MM-dd"-->
-        <!--                          placeholder="请选择时间"-->
-        <!--          >-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
+
         <!--        <el-form-item label="时间2" prop="nowTimeTwo">-->
         <!--          <el-date-picker clearable-->
         <!--                          v-model="form.nowTimeTwo"-->
@@ -331,6 +328,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="预警时间" prop="nowTimeOne">
+          <el-date-picker clearable
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="预警内容" prop="fieldSeven">
           <el-input v-model="form.fieldSeven" placeholder="请输入预警内容"/>
         </el-form-item>
diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/dYawWarning/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/dYawWarning/index.vue
index 5c136eda..70a427d0 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/dYawWarning/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/dYawWarning/index.vue
@@ -213,11 +213,7 @@
       <!--      <el-table-column type="selection" width="55" align="center" />-->
       <!--      <el-table-column label="主键id" align="center" prop="id" />-->
       <!--      <el-table-column label="模块区分" align="center" prop="moduleType" />-->
-      <!--      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+
       <!--      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>-->
@@ -235,6 +231,11 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.fieldNineteen"/>
         </template>
       </el-table-column>
+      <el-table-column label="预警时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="预警内容" align="center" prop="fieldSeven"/>
       <el-table-column label="预警处理结果" align="center" prop="fieldEleven"/>
       <el-table-column label="备注" align="center" prop="remark"/>
diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/e01AgricultureAdvance/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/e01AgricultureAdvance/index.vue
index c4bba4d2..046aecf9 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/e01AgricultureAdvance/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/e01AgricultureAdvance/index.vue
@@ -237,11 +237,7 @@
       <!--      <el-table-column type="selection" width="55" align="center"/>-->
       <!--      <el-table-column label="主键id" align="center" prop="id"/>-->
       <!--      <el-table-column label="模块区分" align="center" prop="moduleType"/>-->
-      <!--      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
+
       <!--      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">-->
       <!--        <template slot-scope="scope">-->
       <!--          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>-->
@@ -257,6 +253,11 @@
       <el-table-column label="转向角度" align="center" prop="fieldSeven"/>
       <el-table-column label="掉头转弯" align="center" prop="fieldEleven"/>
       <el-table-column label="转弯角度" align="center" prop="fieldNine"/>
+      <el-table-column label="操作时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTen" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldEight" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />-->
@@ -306,15 +307,7 @@
     <!-- 添加或修改新能源通用对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!--        <el-form-item label="时间" prop="nowTimeOne">-->
-        <!--          <el-date-picker clearable-->
-        <!--                          v-model="form.nowTimeOne"-->
-        <!--                          type="date"-->
-        <!--                          value-format="yyyy-MM-dd"-->
-        <!--                          placeholder="请选择时间"-->
-        <!--          >-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
+
         <!--        <el-form-item label="时间2" prop="nowTimeTwo">-->
         <!--          <el-date-picker clearable-->
         <!--                          v-model="form.nowTimeTwo"-->
@@ -354,6 +347,15 @@
         <el-form-item label="转弯角度" prop="fieldNine">
           <el-input v-model="form.fieldNine" placeholder="请输入转弯角度"/>
         </el-form-item>
+        <el-form-item label="操作时间" prop="nowTimeOne">
+          <el-date-picker clearable
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
         <!--        <el-form-item label="${comment}" prop="fieldTen">-->
         <!--          <el-input v-model="form.fieldTen" placeholder="请输入${comment}"/>-->
         <!--        </el-form-item>-->
diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/e02AgricultureSpeed/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/e02AgricultureSpeed/index.vue
index 1b1d79b0..7182b1a8 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/e02AgricultureSpeed/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/e02AgricultureSpeed/index.vue
@@ -257,6 +257,11 @@
       <el-table-column label="转向角度" align="center" prop="fieldSeven"/>
       <el-table-column label="掉头转弯" align="center" prop="fieldEleven"/>
       <el-table-column label="转弯角度" align="center" prop="fieldNine"/>
+      <el-table-column label="操作时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTen" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldEight" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />-->
@@ -342,6 +347,15 @@
         <el-form-item label="行进速度" prop="fieldFive">
           <el-input v-model="form.fieldFive" placeholder="请输入行进速度"/>
         </el-form-item>
+        <el-form-item label="操作时间" prop="nowTimeOne">
+          <el-date-picker clearable
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
         <!--        <el-form-item label="转向方向" prop="fieldSix">-->
         <!--          <el-input v-model="form.fieldSix" placeholder="请输入转向方向"/>-->
         <!--        </el-form-item>-->
diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/e03AgricultureDirection/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/e03AgricultureDirection/index.vue
index f0be359e..7f929287 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/e03AgricultureDirection/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/e03AgricultureDirection/index.vue
@@ -257,6 +257,11 @@
       <el-table-column label="转向角度" align="center" prop="fieldSeven"/>
       <el-table-column label="掉头转弯" align="center" prop="fieldEleven"/>
       <el-table-column label="转弯角度" align="center" prop="fieldNine"/>
+      <el-table-column label="操作时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTen" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldEight" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />-->
@@ -348,6 +353,15 @@
         <el-form-item label="转向角度" prop="fieldSeven">
           <el-input v-model="form.fieldSeven" placeholder="请输入转向角度"/>
         </el-form-item>
+        <el-form-item label="操作时间" prop="nowTimeOne">
+          <el-date-picker clearable
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
         <!--        <el-form-item label="掉头转弯" prop="fieldEleven">-->
         <!--          <el-input v-model="form.fieldEleven" placeholder="请输入掉头转弯"/>-->
         <!--        </el-form-item>-->
diff --git a/god-ui/src/views/familyOcean/numFarmMachinery/e04AgricultureWheel/index.vue b/god-ui/src/views/familyOcean/numFarmMachinery/e04AgricultureWheel/index.vue
index aeb32427..4e5657fa 100644
--- a/god-ui/src/views/familyOcean/numFarmMachinery/e04AgricultureWheel/index.vue
+++ b/god-ui/src/views/familyOcean/numFarmMachinery/e04AgricultureWheel/index.vue
@@ -257,6 +257,11 @@
       <el-table-column label="转向角度" align="center" prop="fieldSeven"/>
       <el-table-column label="掉头转弯" align="center" prop="fieldEleven"/>
       <el-table-column label="转弯角度" align="center" prop="fieldNine"/>
+      <el-table-column label="操作时间" align="center" prop="nowTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTen" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldEight" />-->
       <!--      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />-->
@@ -354,6 +359,15 @@
         <el-form-item label="转弯角度" prop="fieldNine">
           <el-input v-model="form.fieldNine" placeholder="请输入转弯角度"/>
         </el-form-item>
+        <el-form-item label="操作时间" prop="nowTimeOne">
+          <el-date-picker clearable
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
         <!--        <el-form-item label="${comment}" prop="fieldTen">-->
         <!--          <el-input v-model="form.fieldTen" placeholder="请输入${comment}"/>-->
         <!--        </el-form-item>-->