Merge remote-tracking branch 'origin/master'

src/views/task/logs/index.vue

@@ -40,6 +40,10 @@
                 <HcIcon name="add"/>
                 <span>写日志</span>
             </el-button>
+            <el-button size="large" type="primary" v-if="isEditState" @click="gobackLog">
+                <HcIcon name="arrow-go-back"/>
+                <span>取消</span>
+            </el-button>
         </template>
         <div class="hac-logs-main-body">
             <div class="hac-logs-user-list-body">
@@ -204,7 +208,10 @@ const editLogsClick = () => {
     logForm.value.logTitle = real_name + '的日志'
     logForm.value.createTime = dayjs().format('YYYY-MM-DD')
 }
-
+//返回到查看日志界面
+const gobackLog=()=>{
+    isEditState.value = false
+}
 const logsRef = ref(null)
 const logLoading = ref(false)