Merge remote-tracking branch 'origin/main'

src/views/smart/workpermit.vue

@@ -7,6 +7,7 @@
                :permission="permissionList"
                :before-open="beforeOpen"
                v-model="form"
+               :search.sync="search"
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
@@ -104,7 +105,6 @@
         option: {
           height: 'auto',
           calcHeight: 210,
-          search:{},
           searchShow: true,
           searchMenuSpan: 22,
           searchBtnText: '查询',
@@ -257,7 +257,8 @@
             },
             {
               label: "计划开始时间",
-              prop: "planStartDate",
+              prop: "planStartDateExt",
+              hide: true,
               type: "date",
               format: 'yyyy/MM/dd',
               search: true,
@@ -268,6 +269,18 @@
               }],
               span:8,
             },
+            {
+              label: "计划开始时间",
+              prop: "planStartDate",
+              type: "date",
+              format: 'yyyy/MM/dd',
+              rules: [{
+                required: true,
+                message: "请输入计划开始时间",
+                trigger: "blur"
+              }],
+              span:8,
+            },
             {
               label: "工作条件",
               prop: "workingConditions",

src/views/wel/index.vue

@@ -7,20 +7,8 @@
         <div class="headOverflowList">
           <el-skeleton :rows="3" animated v-show="skeleton"/>
           <div class="el-collapse">
-            <div class="el-collapse-item">
+            <div class="el-collapse-item" v-for="(item, index) in homePageData.productionInformationAudit" :key="index">
-              <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
+              <div class="el-collapse-item__header"><span class="el-collapse-span">☆{{item.messageType}}☆  {{item.messageContent}}</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>
         </div>
@@ -32,43 +20,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" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
-                <div class="el-collapse-item">
+                <div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
-                  <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>
             </div>
           </div>