From 9fd156a5b7c0f02b4e9e1c2637b7d3237a2fccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 13 Oct 2022 16:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F(=E5=88=86=E9=83=A8=E5=88=86=E9=A1=B9)=EF=BC=9A?=
 =?UTF-8?q?=E5=AD=90=E9=A1=B9=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoManage/videoConfig.vue               |  7 +++++--
 .../scheduleManage/projectNodeManage.vue      | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue
index 1e6c678a..0c44543b 100644
--- a/src/views/equipmentCenter/videoManage/videoConfig.vue
+++ b/src/views/equipmentCenter/videoManage/videoConfig.vue
@@ -62,7 +62,7 @@
                     <div>
                         <el-button
                                 type="primary"
-                                @click="Popup.newVideo=true"
+                                @click="addVideoBtn"
                                 size="medium"
                         >{{$t('message.videoManage.dialog_newVideo.operation.add')}}
                         <!-- {{$t('message.videoManage.add')}}{{$t('message.videoManage.video')}} -->
@@ -835,7 +835,6 @@
             this.getProjectVideoConfigList();
             this.getAccountList()
             this.getVideoGroup()
-            this.getAll()
         },
         components: {cameraList,cameraListLc},
         methods: {
@@ -844,6 +843,10 @@
                 this.nvrDevice = true
                 this.getvideoNvrList()
             },
+            addVideoBtn(){
+                this.Popup.newVideo=true
+                this.getAll()
+            },
             getAll(){
                 getAllNvrApi({projectSn : this.projectSn}).then((res)=>{
                     this.nvrList  = res.result.map((item,index)=>{
diff --git a/src/views/projectFront/scheduleManage/projectNodeManage.vue b/src/views/projectFront/scheduleManage/projectNodeManage.vue
index 78d76f86..3affb789 100644
--- a/src/views/projectFront/scheduleManage/projectNodeManage.vue
+++ b/src/views/projectFront/scheduleManage/projectNodeManage.vue
@@ -246,6 +246,15 @@
                 >
                 </el-date-picker>
               </el-form-item>
+              <el-form-item label="实际完成时间" prop="actualEndTime">
+                <el-date-picker
+                  v-model="workerInfo.actualEndTime"
+                  type="date"
+                  :placeholder="$t('message.projectManage.chooseDate')"
+                  value-format="yyyy-MM-dd"
+                >
+                </el-date-picker>
+              </el-form-item>
               <!-- 重要程度 -->
               <el-form-item :label="$t('message.projectManage.degreeOfImportance')" prop="importance">
                 <el-select v-model="workerInfo.importance" :placeholder="$t('message.projectManage.pleaseChoose')">
@@ -270,6 +279,14 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <!-- 完成状态 -->
+              <el-form-item label="完成状态" prop="state">
+                 <el-select v-model="workerInfo.state" placeholder="请选择">
+                  <el-option label="未开始" :value="0"></el-option>
+                  <el-option label="进行中" :value="1"></el-option>
+                  <el-option label="已完成" :value="2"></el-option>
+                 </el-select>
+                </el-form-item>
               <el-form-item :label="$t('message.projectManage.accessory')" prop="fileUrl">
                 <el-upload
                   class="upload-demo"
@@ -359,6 +376,8 @@ export default {
         startTime: "",
         endTime: "",
         fileUrl: "",
+        actualEndTime:"", //实际完成时间
+        state:'',
       },
       principalLsit: [], //负责人
       fileList: [],