v1.9 测试完成设备下的功能

wuxw
1 parent 050d35a0
Showing 20 changed files with 383 additions and 153 deletions
src/components/inspection/maintainanceTaskDetail.vue
src/components/machine/addPrinterRule.vue
src/components/machine/printerRuleFees.vue
src/components/machine/printerRuleMachine.vue
src/components/machine/printerRuleRepair.vue
src/components/staff/AStaffDetailMaintainance.vue
src/i18n/inspectionI18n.js
src/router/inspectionRouter.js
src/views/dev/cacheList.vue
src/views/dev/taskList.vue
src/views/inspection/maintainanceItemList.vue
src/views/inspection/maintainanceTaskDetailView.vue
src/views/inspection/maintainanceTaskDetailViewLang.js
src/views/inspection/maintainanceTaskDetailsList.vue
src/views/inspection/maintainanceTaskManageLang.js
src/views/inspection/maintainanceTaskManageList.vue
src/views/machine/equipmentAccountList.vue
src/views/machine/machinePrinterManageList.vue
src/views/machine/machineTranslateManageList.vue
src/views/machine/printerRuleList.vue
 <template>
-  <el-dialog
-    :title="$t('maintainanceTaskDetail.title')"
-    :visible.sync="visible"
-    width="90%"
-    top="5vh"
-    @close="handleClose"
-  >
-    <el-table
-      :data="taskDetails"
-      border
-      style="width: 100%"
-      v-loading="loading"
-    >
-      <el-table-column
-        prop="machineName"
-        :label="$t('maintainanceTaskDetail.machineName')"
-        align="center"
-      />
-      <el-table-column
-        prop="planName"
-        :label="$t('maintainanceTaskDetail.planName')"
-        align="center"
-      />
-      <el-table-column
-        prop="standardName"
-        :label="$t('maintainanceTaskDetail.standardName')"
-        align="center"
-      />
-      <el-table-column
-        prop="planUserName"
-        :label="$t('maintainanceTaskDetail.planUserName')"
-        align="center"
-      />
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.timeRange')"
-        align="center"
-      >
+  <el-dialog :title="$t('maintainanceTaskDetail.title')" :visible.sync="visible" width="90%" top="5vh"
+    @close="handleClose">
+    <el-table :data="taskDetails" border style="width: 100%" v-loading="loading">
+      <el-table-column prop="machineName" :label="$t('maintainanceTaskDetail.machineName')" align="center" />
+      <el-table-column prop="planName" :label="$t('maintainanceTaskDetail.planName')" align="center" />
+      <el-table-column prop="standardName" :label="$t('maintainanceTaskDetail.standardName')" align="center" />
+      <el-table-column prop="planUserName" :label="$t('maintainanceTaskDetail.planUserName')" align="center" />
+      <el-table-column :label="$t('maintainanceTaskDetail.timeRange')" align="center">
         <template slot-scope="scope">
           {{ scope.row.planInsTime }}<br />{{ scope.row.planEndTime }}
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.actInsTime')"
-        align="center"
-      >
+      <el-table-column :label="$t('maintainanceTaskDetail.actInsTime')" align="center">
         <template slot-scope="scope">
           {{ scope.row.inspectionTime || '-' }}
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.actUserName')"
-        align="center"
-      >
+      <el-table-column :label="$t('maintainanceTaskDetail.actUserName')" align="center">
         <template slot-scope="scope">
           {{ scope.row.actUserName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="stateName"
-        :label="$t('maintainanceTaskDetail.stateName')"
-        align="center"
-      />
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.description')"
-        align="center"
-      >
+      <el-table-column prop="stateName" :label="$t('maintainanceTaskDetail.stateName')" align="center" />
+      <el-table-column :label="$t('maintainanceTaskDetail.description')" align="center">
         <template slot-scope="scope">
           <span class="text-primary">
             {{ scope.row.description || '-' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.photos')"
-        align="center"
-      >
+      <el-table-column :label="$t('maintainanceTaskDetail.photos')" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.photos && scope.row.photos.length > 0" class="photo-container">
-            <el-image
-              v-for="(photo, index) in scope.row.photos"
-              :key="index"
-              :src="photo.url"
-              :preview-src-list="scope.row.photos.map(p => p.url)"
-              style="width: 60px; height: 60px; margin-right: 5px;"
-              fit="cover"
-            />
+            <el-image v-for="(photo, index) in scope.row.photos" :key="index" :src="photo.url"
+              :preview-src-list="scope.row.photos.map(p => p.url)" style="width: 60px; height: 60px; margin-right: 5px;"
+              fit="cover" />
           </div>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        :label="$t('maintainanceTaskDetail.createTime')"
-        align="center"
-      />
-      <el-table-column
-        :label="$t('maintainanceTaskDetail.operation')"
-        align="center"
-        width="100"
-      >
+      <el-table-column prop="createTime" :label="$t('maintainanceTaskDetail.createTime')" align="center" />
+      <el-table-column :label="$t('common.operation')" align="center" width="100">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleViewDetail(scope.row.taskDetailId)"
-          >
-            {{ $t('maintainanceTaskDetail.viewDetail') }}
+          <el-button type="text" @click="handleViewDetail(scope.row.taskDetailId)">
+            {{ $t('common.detail') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination-wrapper">
-      <el-pagination
-        :current-page="pagination.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
     </div>
   </el-dialog>
 </template>
@@ -188,7 +121,7 @@ export default {
       this.loadTaskDetails()
     },
     handleViewDetail(taskDetailId) {
-      window.open(`/#/pages/property/maintainanceTaskDetailView?taskDetailId=${taskDetailId}`, '_blank')
+      window.open(`/#/views/inspection/maintainanceTaskDetailView?taskDetailId=${taskDetailId}`, '_blank')
     }
   }
 }
@@ -7,11 +7,11 @@
       <el-form-item :label="$t('printerRule.remark')" prop="remark">
         <el-input type="textarea" v-model="form.remark" :placeholder="$t('printerRule.remarkPlaceholder')"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('printerRule.state')" prop="state">
+      <!-- <el-form-item :label="$t('printerRule.state')" prop="state">
         <el-select v-model="form.state" style="width:100%">
           <el-option v-for="item in stateOptions" :key="item.statusCd" :label="item.name" :value="item.statusCd"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -51,12 +51,11 @@ export default {
   },
   created() {
     this.form.communityId = getCommunityId()
-    this.getStateOptions()
   },
   methods: {
     async getStateOptions() {
       try {
-        const data = await getDict('printer_rule', 'state')
+        const {data} = await getDict('printer_rule', 'state')
         this.stateOptions = data
       } catch (error) {
         console.error('获取状态字典失败:', error)
@@ -65,6 +64,8 @@ export default {
     open() {
       this.visible = true
       this.resetForm()
+      this.getStateOptions()
+
     },
     handleClose() {
       this.resetForm()
@@ -2,19 +2,16 @@
   <div class="printer-rule-fees">
     <el-form :inline="true" :model="searchForm" class="search-form">
-      <el-form-item :label="$t('printerRuleFees.id')">
+      <el-form-item >
         <el-input v-model="searchForm.prfId" :placeholder="$t('printerRuleFees.idPlaceholder')" clearable />
       </el-form-item>
-      <el-form-item :label="$t('printerRuleFees.feeName')">
+      <el-form-item >
         <el-input v-model="searchForm.feeConfigName" :placeholder="$t('printerRuleFees.feeNamePlaceholder')" clearable />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleSearch">
           {{ $t('common.search') }}
         </el-button>
-        <el-button @click="handleReset">
-          {{ $t('common.reset') }}
-        </el-button>
         <el-button type="primary" @click="openAddModal">
           <i class="el-icon-plus"></i>
           {{ $t('common.add') }}
@@ -2,10 +2,10 @@
   <div class="printer-rule-machine">
     <el-form :inline="true" :model="searchForm" class="search-form">
-      <el-form-item :label="$t('printerRuleMachine.id')">
+      <el-form-item >
         <el-input v-model="searchForm.prmId" :placeholder="$t('printerRuleMachine.idPlaceholder')" clearable />
       </el-form-item>
-      <el-form-item :label="$t('printerRuleMachine.machineName')">
+      <el-form-item >
         <el-input v-model="searchForm.machineName" :placeholder="$t('printerRuleMachine.machineNamePlaceholder')"
           clearable />
       </el-form-item>
@@ -13,9 +13,6 @@
         <el-button type="primary" @click="handleSearch">
           {{ $t('common.search') }}
         </el-button>
-        <el-button @click="handleReset">
-          {{ $t('common.reset') }}
-        </el-button>
         <el-button type="primary" @click="openAddModal">
           <i class="el-icon-plus"></i>
           {{ $t('common.add') }}
@@ -2,10 +2,10 @@
   <div class="printer-rule-repair">
     <el-form :inline="true" :model="searchForm" class="search-form">
-      <el-form-item :label="$t('printerRuleRepair.id')">
+      <el-form-item >
         <el-input v-model="searchForm.prrId" :placeholder="$t('printerRuleRepair.idPlaceholder')" clearable />
       </el-form-item>
-      <el-form-item :label="$t('printerRuleRepair.repairType')">
+      <el-form-item >
         <el-input v-model="searchForm.repairTypeName" :placeholder="$t('printerRuleRepair.repairTypePlaceholder')"
           clearable />
       </el-form-item>
@@ -13,9 +13,6 @@
         <el-button type="primary" @click="handleSearch">
           {{ $t('common.search') }}
         </el-button>
-        <el-button @click="handleReset">
-          {{ $t('common.reset') }}
-        </el-button>
         <el-button type="primary" @click="openAddModal">
           <i class="el-icon-plus"></i>
           {{ $t('common.add') }}
@@ -69,7 +69,7 @@
         <el-table-column prop="createTime" :label="$t('staffDetailMaintainance.createTime')" align="center" />
         <el-table-column :label="$t('common.operation')" align="center">
           <template slot-scope="scope">
-            <el-link :href="`/views/property/maintainanceTaskDetailView?taskDetailId=${scope.row.taskDetailId}`">
+            <el-link :href="`/views/inspection/maintainanceTaskDetailView?taskDetailId=${scope.row.taskDetailId}`">
               {{ $t('common.detail') }}
             </el-link>
           </template>
@@ -7,6 +7,7 @@ import { messages as editMaintainancePlanMessages } from &#39;../views/inspection/ed
 import { messages as maintainancePlanMachineMessages } from '../views/inspection/maintainancePlanMachineLang'
 import { messages as maintainanceTaskDetailsMessages } from '../views/inspection/maintainanceTaskDetailsLang'
 import { messages as maintainanceTaskManageMessages } from '../views/inspection/maintainanceTaskManageLang'
+import { messages as maintainanceTaskDetailViewMessages } from '../views/inspection/maintainanceTaskDetailViewLang'
 import { messages as adminInspectionPlanMessages } from '../views/inspection/adminInspectionPlanLang'
 import { messages as aInspectionPlanDetailMessages } from '../views/inspection/aInspectionPlanDetailLang'
 import { messages as adminInspectionTaskMessages } from '../views/inspection/adminInspectionTaskLang'
@@ -36,6 +37,7 @@ export const messages = {
         ...maintainancePlanMachineMessages.en,
         ...maintainanceTaskDetailsMessages.en,
         ...maintainanceTaskManageMessages.en,
+        ...maintainanceTaskDetailViewMessages.en,
         ...inspectionPointMessages.en,
         ...inspectionRouteMessages.en,
         ...inspectionItemManageMessages.en,
@@ -60,6 +62,7 @@ export const messages = {
         ...maintainancePlanMachineMessages.zh,
         ...maintainanceTaskDetailsMessages.zh,
         ...maintainanceTaskManageMessages.zh,
+        ...maintainanceTaskDetailViewMessages.zh,
         ...inspectionPointMessages.zh,
         ...inspectionRouteMessages.zh,
         ...inspectionItemManageMessages.zh,
@@ -100,6 +100,11 @@ export default [
         component: () => import('@/views/inspection/maintainanceTaskDetailsList.vue')
     },
     {
+        path: '/views/inspection/maintainanceTaskDetailView',
+        name: '/views/inspection/maintainanceTaskDetailView',
+        component: () => import('@/views/inspection/maintainanceTaskDetailView.vue')
+    },
+    {
         path: '/pages/property/maintainanceTaskManage',
         name: '/pages/property/maintainanceTaskManage',
         component: () => import('@/views/inspection/maintainanceTaskManageList.vue')
 <template>
-  <div class="cache-container padding">
+  <div class="cache-container ">
     <div class="list-wrapper">
       <div class="list-header">
         <div class="list-title">{{ $t('cache.list.title') }}</div>
@@ -118,7 +118,7 @@ export default {
 <style lang="scss" scoped>
 .cache-container {
-  padding: 0;
+  padding: 20px;
   margin: 0;
   .search-wrapper {
 <template>
-  <div class="task-container">
+  <div class="task-container ">
     <!-- 查询条件 -->
     <div class="search-wrapper">
       <div class="search-title">{{ $t('task.search.title') }}</div>
@@ -177,7 +177,7 @@ export default {
 <style lang="scss" scoped>
 .task-container {
-  padding: 0;
+  padding: 20px;
   margin: 0;
   .search-wrapper {
@@ -32,9 +32,9 @@
       <div slot="header" class="flex justify-between">
         <span>{{ $t('maintainanceItem.list.title') }}</span>
         <div style="float: right;">
-          <el-button type="primary" size="small" @click="handleGoBack">
+          <!-- <el-button type="primary" size="small" @click="handleGoBack">
             {{ $t('common.back') }}
-          </el-button>
+          </el-button> -->
           <!-- <el-button type="primary" size="small" @click="handleShowDocument">
             {{ $t('common.document') }}
           </el-button> -->
+<template>
+  <div class="maintainance-task-detail-view">
+    <el-card class="detail-card">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('maintainanceTaskDetailView.title') }}</span>
+        <el-button type="primary" size="mini" @click="goBack">
+          <i class="el-icon-back"></i>
+          {{ $t('maintainanceTaskDetailView.back') }}
+        </el-button>
+      </div>
+
+      <el-card shadow="never" class="info-card text-left">
+        <div slot="header" class="flex justify-between">
+          <span>{{ $t('maintainanceTaskDetailView.basicInfo') }}</span>
+        </div>
+
+        <el-row :gutter="24" class="">
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.taskDetailId') }}：</span>
+              <span>{{ detail.taskDetailId || '-' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.machineName') }}：</span>
+              <span>{{ detail.machineName || '-' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.planUserName') }}：</span>
+              <span>{{ detail.planUserName || '-' }}</span>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.planTime') }}：</span>
+              <span>{{ formatPlanTime(detail.planInsTime, detail.planEndTime) }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.actUserName') }}：</span>
+              <span>{{ detail.actUserName || '-' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.inspectionTime') }}：</span>
+              <span>{{ detail.inspectionTime || '-' }}</span>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.stateName') }}：</span>
+              <span>{{ detail.stateName || '-' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.planName') }}：</span>
+              <span>{{ detail.planName || '-' }}</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="info-item">
+              <span class="label">{{ $t('maintainanceTaskDetailView.fields.standardName') }}：</span>
+              <span>{{ detail.standardName || '-' }}</span>
+            </div>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card shadow="never" class="info-card text-left">
+        <div slot="header" class="flex justify-between">
+          <span>{{ $t('maintainanceTaskDetailView.photosTitle') }}</span>
+        </div>
+
+        <div v-if="photoList.length" class="photo-list">
+          <el-image
+            v-for="(photo, index) in photoList"
+            :key="index"
+            :src="photo"
+            :preview-src-list="photoList"
+            fit="cover"
+            class="photo-item"
+          />
+        </div>
+        <div v-else class="empty-text">{{ $t('maintainanceTaskDetailView.noPhotos') }}</div>
+      </el-card>
+
+      <el-card shadow="never" class="info-card text-left">
+        <div slot="header" class="flex justify-between">
+          <span>{{ $t('maintainanceTaskDetailView.descriptionTitle') }}</span>
+        </div>
+        <div class="description">
+          {{ detail.description || $t('maintainanceTaskDetailView.noDescription') }}
+        </div>
+      </el-card>
+    </el-card>
+
+    <view-image ref="viewImage" />
+  </div>
+</template>
+
+<script>
+import { getMaintainanceTaskDetailList } from '@/api/inspection/maintainanceTaskDetailsApi'
+import ViewImage from '@/components/system/viewImage'
+import { messages } from './maintainanceTaskDetailViewLang'
+
+export default {
+  name: 'MaintainanceTaskDetailView',
+  components: {
+    ViewImage
+  },
+  i18n: {
+    messages
+  },
+  data() {
+    return {
+      detail: {
+        taskDetailId: '',
+        machineName: '',
+        planName: '',
+        standardName: '',
+        planUserName: '',
+        planInsTime: '',
+        planEndTime: '',
+        actUserName: '',
+        inspectionTime: '',
+        stateName: '',
+        description: '',
+        photos: []
+      },
+      loading: false
+    }
+  },
+  computed: {
+    photoList() {
+      if (!this.detail.photos || !this.detail.photos.length) {
+        return []
+      }
+      return this.detail.photos.map(photo => photo.url).filter(Boolean)
+    }
+  },
+  created() {
+    this.fetchDetail()
+  },
+  methods: {
+    async fetchDetail() {
+      const taskDetailId = this.$route.query.taskDetailId
+      if (!taskDetailId) {
+        return
+      }
+      try {
+        this.loading = true
+        const params = {
+          page: 1,
+          row: 1,
+          taskDetailId
+        }
+        const res = await getMaintainanceTaskDetailList(params)
+        if (res && res.data && res.data.length) {
+          this.detail = { ...this.detail, ...res.data[0] }
+        }
+      } catch (error) {
+        this.$message.error(this.$t('maintainanceTaskDetailView.fetchError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    formatPlanTime(start, end) {
+      if (!start && !end) {
+        return '-'
+      }
+      if (!start) {
+        return end
+      }
+      if (!end) {
+        return start
+      }
+      return `${start} ~ ${end}`
+    },
+    goBack() {
+      if (window.history.length > 1) {
+        this.$router.back()
+      } else {
+        this.$router.push({ path: '/pages/property/maintainanceTaskDetails' })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.maintainance-task-detail-view {
+  padding: 20px;
+
+  .detail-card {
+    .card-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .info-card {
+      margin-bottom: 20px;
+    }
+
+    .section-title {
+      font-weight: 600;
+    }
+
+    .info-item {
+      margin-bottom: 16px;
+      .label {
+        color: #606266;
+        margin-right: 4px;
+      }
+    }
+
+    .photo-list {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 12px;
+
+      .photo-item {
+        width: 120px;
+        height: 120px;
+        border-radius: 4px;
+        overflow: hidden;
+        border: 1px solid #ebeef5;
+      }
+    }
+
+    .empty-text {
+      color: #999;
+    }
+
+    .description {
+      min-height: 80px;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+  }
+}
+</style>
+
+export const messages = {
+  en: {
+    maintainanceTaskDetailView: {
+      title: 'Maintenance Detail',
+      basicInfo: 'Basic Information',
+      photosTitle: 'Maintenance Photos',
+      descriptionTitle: 'Maintenance Description',
+      noPhotos: 'No photos available',
+      noDescription: 'No description',
+      back: 'Back',
+      fields: {
+        taskDetailId: 'ID',
+        machineName: 'Equipment Name',
+        planUserName: 'Planned Maintainer',
+        planTime: 'Planned Maintenance Time',
+        actUserName: 'Actual Maintainer',
+        inspectionTime: 'Actual Maintenance Time',
+        stateName: 'Status',
+        planName: 'Plan',
+        standardName: 'Maintenance Standard'
+      },
+      fetchError: 'Failed to load maintenance detail'
+    }
+  },
+  zh: {
+    maintainanceTaskDetailView: {
+      title: '保养详情',
+      basicInfo: '基本信息',
+      photosTitle: '保养图片',
+      descriptionTitle: '保养说明',
+      noPhotos: '暂无保养图片',
+      noDescription: '暂无保养说明',
+      back: '返回',
+      fields: {
+        taskDetailId: '编码',
+        machineName: '设备名称',
+        planUserName: '计划保养人',
+        planTime: '计划保养时间',
+        actUserName: '实际保养人',
+        inspectionTime: '实际保养时间',
+        stateName: '状态',
+        planName: '计划',
+        standardName: '保养标准'
+      },
+      fetchError: '获取保养详情失败'
+    }
+  }
+}
+
@@ -25,19 +25,13 @@
           </el-select>
         </el-col>
         <el-col :span="4">
-          <el-input v-model="searchForm.taskDetailId" :placeholder="$t('maintainanceTaskDetails.search.taskDetailId')"
-            clearable />
-        </el-col>
-        <el-col :span="4">
           <el-select v-model="searchForm.taskState" :placeholder="$t('maintainanceTaskDetails.search.taskState')"
             style="width:100%">
             <el-option :label="$t('maintainanceTaskDetails.search.selectState')" value="" />
             <el-option v-for="(item, index) in taskStateList" :key="index" :label="item.name" :value="item.statusCd" />
           </el-select>
         </el-col>
-      </el-row>
-      <el-row :gutter="20" style="margin-top:20px">
-        <el-col :span="24" style="text-align:right">
+        <el-col :span="4" style="text-align:right">
           <el-button type="primary" @click="handleSearch">
             <i class="el-icon-search"></i>
             {{ $t('common.search') }}
@@ -219,7 +213,7 @@ export default {
     },
     handleDetail(taskDetailId) {
       this.$router.push({
-        path: '/inspection/maintainanceTaskDetailView',
+        path: '/views/inspection/maintainanceTaskDetailView',
         query: { taskDetailId }
       })
     },
@@ -50,7 +50,10 @@ export const messages = {
       photos: 'Maintenance Photos',
       createTime: 'Create Time',
       viewDetail: 'View Details',
-      fetchError: 'Failed to get task details'
+      fetchError: 'Failed to get task details',
+      timeRange: 'Start/End Time',
+      actInsTime: 'Actual Maintenance Time',
+      planName: 'Maintenance Plan',
     },
     deleteMaintainanceTask: {
       title: 'Confirm Operation',
@@ -128,7 +131,10 @@ export const messages = {
       photos: '保养照片',
       createTime: '创建时间',
       viewDetail: '详情',
-      fetchError: '获取任务详情失败'
+      fetchError: '获取任务详情失败',
+      timeRange: '开始/结束时间',
+      actInsTime: '实际保养时间',
+      planName: '保养计划',
     },
     deleteMaintainanceTask: {
       title: '请确认您的操作',
@@ -7,14 +7,16 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="4">
-          <el-input v-model="searchForm.planUserName" :placeholder="$t('maintainanceTaskManage.planUserNamePlaceholder')"
-            clearable />
+          <el-input v-model="searchForm.planUserName"
+            :placeholder="$t('maintainanceTaskManage.planUserNamePlaceholder')" clearable />
         </el-col>
         <el-col :span="4">
-          <el-date-picker v-model="searchForm.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"            :placeholder="$t('maintainanceTaskManage.startTimePlaceholder')" style="width: 100%"  />
+          <el-date-picker v-model="searchForm.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            :placeholder="$t('maintainanceTaskManage.startTimePlaceholder')" style="width: 100%" />
         </el-col>
         <el-col :span="4">
-          <el-date-picker v-model="searchForm.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"            :placeholder="$t('maintainanceTaskManage.endTimePlaceholder')" style="width: 100%"  />
+          <el-date-picker v-model="searchForm.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            :placeholder="$t('maintainanceTaskManage.endTimePlaceholder')" style="width: 100%" />
         </el-col>
         <el-col :span="4">
           <el-input v-model="searchForm.planName" :placeholder="$t('maintainanceTaskManage.planNamePlaceholder')"
@@ -19,20 +19,17 @@
         <el-card class="box-card text-left">
           <div slot="header" class="">
             <span>{{ $t('equipmentAccount.searchCondition') }}</span>
-            <el-button type="text" style="float: right;" @click="toggleMoreCondition">
-              {{ equipmentAccountInfo.moreCondition ? $t('equipmentAccount.hide') : $t('equipmentAccount.more') }}
-            </el-button>
           </div>
           <el-form :inline="true" :model="equipmentAccountInfo.conditions" class="search-form">
-            <el-form-item :label="$t('equipmentAccount.machineName')">
+            <el-form-item >
               <el-input v-model.trim="equipmentAccountInfo.conditions.machineName"
                 :placeholder="$t('equipmentAccount.machineNamePlaceholder')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('equipmentAccount.machineCode')">
+            <el-form-item >
               <el-input v-model.trim="equipmentAccountInfo.conditions.machineCode"
                 :placeholder="$t('equipmentAccount.machineCodePlaceholder')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('equipmentAccount.state')">
+            <el-form-item >
               <el-select v-model="equipmentAccountInfo.conditions.state" style="width:100%">
                 <el-option :label="$t('equipmentAccount.selectState')" value=""></el-option>
                 <el-option v-for="item in equipmentAccountInfo.useStatus" :key="item.statusCd" :label="item.name"
@@ -40,15 +37,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="queryEquipmentAccountMethod">{{ $t('common.search') }}</el-button>
-              <el-button @click="resetEquipmentAccountMethod">{{ $t('common.reset') }}</el-button>
-            </el-form-item>
-          </el-form>
-
-          <el-form v-show="equipmentAccountInfo.moreCondition" :inline="true" :model="equipmentAccountInfo.conditions"
-            class="search-form">
-            <el-form-item :label="$t('equipmentAccount.importanceLevel')">
+            <el-form-item >
               <el-select v-model="equipmentAccountInfo.conditions.importanceLevel" style="width:100%">
                 <el-option :label="$t('equipmentAccount.selectImportanceLevel')" value=""></el-option>
                 <el-option v-for="item in equipmentAccountInfo.importanceLevels" :key="item.statusCd" :label="item.name"
@@ -56,7 +45,12 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="queryEquipmentAccountMethod">{{ $t('common.search') }}</el-button>
+              <el-button @click="resetEquipmentAccountMethod">{{ $t('common.reset') }}</el-button>
+            </el-form-item>
           </el-form>
+
         </el-card>
         <el-card class="box-card margin-top">
@@ -269,7 +263,7 @@ export default {
   }
   .search-form {
-    margin-bottom: 20px;
+    margin-bottom: 0px;
   }
   .pagination-wrapper {
@@ -33,9 +33,6 @@
           <el-button type="primary" size="small" @click="handleAdd">
             {{ $t('common.add') }}
           </el-button>
-          <el-button type="primary" size="small" @click="handleShowDoc">
-            {{ $t('common.document') }}
-          </el-button>
         </div>
       </div>
@@ -4,9 +4,9 @@
     <el-card class="search-wrapper">
       <div slot="header" class="flex justify-between">
         <span>{{ $t('machineTranslateManage.search.title') }}</span>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="toggleMoreCondition">
+        <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="toggleMoreCondition">
           {{ machineTranslateManageInfo.moreCondition ? $t('common.hide') : $t('common.more') }}
-        </el-button>
+        </el-button> -->
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
@@ -7,7 +7,7 @@
       <el-col :span="20">
         <el-card class="box-card">
           <div slot="header" class="text-left">
-            <h5>{{ printerRuleInfo.curPrinterRule.ruleName }}</h5>
+            <span>{{ printerRuleInfo.curPrinterRule.ruleName }}</span>
             <div class="role-context">{{ printerRuleInfo.curPrinterRule.remark }}</div>
           </div>
           <div class="role-menu flex justify-start">