From 19705f4428d65c06fd455f62ab94b37ee9133381 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Thu, 18 Jul 2024 09:27:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=91=A8=E6=9C=9F?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AE=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/leger/toolinventoryrecordDetail.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index f63c323..22e5151 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -33,10 +33,8 @@
     <span v-else-if="type.prop==='task'">
       <div>
         <avue-crud :data="task_data"
-                   :table-loading="loading"
                    :option="optionTask"
                    :permission="permissionList"
-                   :before-open="beforeOpen"
                    :header-cell-class-name="headerClass"
                    v-model="task_form"
                    ref="crud">
@@ -139,6 +137,7 @@
                :visible.sync="resultVisible">
       <avue-crud :option="resultDia"
                  v-model="resultForm"
+                 :header-cell-class-name="headerClass"
                  :data="result_data"
                  ref="diaForm">
       </avue-crud>
@@ -336,8 +335,10 @@ export default {
           },
         ]
       },
+      task_form: {},
       task_data: [],
       optionTask: {
+        addBtn: false,
         delBtn: false,
         editBtn: false,
         align: 'center',

From b4652d8c813a0a1c08332b6c62ba16800ce679df Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Thu, 18 Jul 2024 10:14:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/smart/operationticket.vue       |  3 ++-
 src/views/smart/operationticketDetail.vue | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue
index 6d0be57..ef03cd1 100644
--- a/src/views/smart/operationticket.vue
+++ b/src/views/smart/operationticket.vue
@@ -93,6 +93,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
       return {
         form: {},
         updateid:0,
+        search:{},
         query: {},
         loading: true,
         closeTicketBox: false,
@@ -700,7 +701,7 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExport(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
+          expUtil.excelExportEasy(`/api/smart/operationticket/export?daf-auth=${getToken()}`, this.search);
         });
       },
     }
diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue
index f86478a..8327a9c 100644
--- a/src/views/smart/operationticketDetail.vue
+++ b/src/views/smart/operationticketDetail.vue
@@ -50,16 +50,16 @@
       </span>
     <div class="container">
        <span >
+         <el-button type="primary"
+                              size="large"
+                              @click="back"
+                              v-if="addUpdateShowButton">
+                     取消</el-button>
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
                      v-if="addUpdateShowButton">
                      确定</el-button>
-          <el-button type="text"
-                     size="large"
-                     @click="back"
-                     v-if="addUpdateShowButton">
-                     取消</el-button>
          <el-button type="primary"
                     size="small"
                     @click="handleDetailcls"
@@ -339,6 +339,8 @@ export default {
                 prop: "plannedStartTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划开始时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
@@ -351,6 +353,8 @@ export default {
                 prop: "plannedEndTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划结束时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',
@@ -363,6 +367,8 @@ export default {
                 prop: "workIssuanceTime",
                 rules: [{
                   required: true,
+                  message: "请输入计划工作签发时间",
+                  trigger: "blur"
                 }],
                 type: "datetime",
                 format: 'yyyy/MM/dd HH:mm:ss',

From 77f73074b2fb467c66c7f4b94e18d011bdf1b6c4 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Thu, 18 Jul 2024 10:22:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E6=AF=8F=E6=97=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/index.vue | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index d043365..f126c94 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -32,43 +32,8 @@
             <p class="notification-title"><i class="el-icon-document el-icon-home"></i>  今日任务</p>
             <div class="overflowList">
               <el-skeleton :rows="3" animated v-show="skeleton"/>
-              <div class="el-collapse">
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-                </div>
-                <div class="el-collapse-item">
-                  <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-                </div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
-              </div>
-              <div class="el-collapse-item">
-                <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+              <div class="el-collapse-item" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
+                <div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
               </div>
             </div>
           </div>