yanghao 1 неделя назад
Родитель
Сommit
6493e0aa8b

+ 1 - 1
src/locales/zh-CN.ts

@@ -8,7 +8,7 @@ export default {
     maintained: '已保养',
     notInspected: '未巡检',
     inspected: '已巡检',
-    zj: '总进尺',
+    zj: '总进尺(m)',
     xj: '总完成井数',
     mttr: 'MTTR(平均解决时间)',
     materialsUnderInventory: '库存预警物料数量',

+ 2 - 2
src/views/pms/iotrddailyreport/summary.vue

@@ -156,10 +156,10 @@ const list = ref<List[]>([])
 
 const type = ref('2')
 
-const columns = (type: string) => {
+const columns = (_type: string) => {
   return [
     {
-      label: type === '2' ? '项目部' : '队伍',
+      label: '部门',
       prop: 'name'
     },
     {

+ 19 - 11
src/views/report-statistics/costs.vue

@@ -191,11 +191,16 @@ watch(
   { immediate: true }
 )
 
-function selectType(type: string) {
+function selectType(type: string | undefined) {
   query.value.type = type
   query.value.pageNo = 1
   loadList()
 }
+
+function handleReset() {
+  handleTimeChange('year')
+  selectType(undefined)
+}
 </script>
 
 <template>
@@ -284,16 +289,19 @@ function selectType(type: string) {
           </div>
         </section>
       </div>
-      <el-button-group size="default">
-        <el-button
-          v-for="item in timeOptions"
-          :key="item.value"
-          :type="activeTimeType === item.value ? 'primary' : ''"
-          @click="handleTimeChange(item.value)"
-        >
-          {{ item.label }}
-        </el-button>
-      </el-button-group>
+      <div class="flex justify-between gap-4">
+        <el-button-group size="default">
+          <el-button
+            v-for="item in timeOptions"
+            :key="item.value"
+            :type="activeTimeType === item.value ? 'primary' : ''"
+            @click="handleTimeChange(item.value)"
+          >
+            {{ item.label }}
+          </el-button>
+        </el-button-group>
+        <el-button size="default" @click="handleReset">重置</el-button>
+      </div>
     </div>
     <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col mt-4">
       <div class="flex-1 relative">

+ 20 - 20
src/views/report-statistics/daily-report.vue

@@ -86,26 +86,26 @@ const columns = ref<Column[]>([
     isTag: true,
     dictType: DICT_TYPE.PMS_PROJECT_TASK_SCHEDULE
   },
-  {
-    label: '审批状态',
-    prop: 'auditStatus',
-    'min-width': '120px',
-    isTag: true,
-    formatter: (row: List) => {
-      switch (row.auditStatus) {
-        case 0:
-          return '待提交'
-        case 10:
-          return '待审批'
-        case 20:
-          return '审批通过'
-        case 30:
-          return '审批拒绝'
-        default:
-          return ''
-      }
-    }
-  },
+  // {
+  //   label: '审批状态',
+  //   prop: 'auditStatus',
+  //   'min-width': '120px',
+  //   isTag: true,
+  //   formatter: (row: List) => {
+  //     switch (row.auditStatus) {
+  //       case 0:
+  //         return '待提交'
+  //       case 10:
+  //         return '待审批'
+  //       case 20:
+  //         return '审批通过'
+  //       case 30:
+  //         return '审批拒绝'
+  //       default:
+  //         return ''
+  //     }
+  //   }
+  // },
   {
     label: '搬迁安装天数',
     prop: 'relocationDays',

+ 20 - 20
src/views/report-statistics/ry-daily-report.vue

@@ -116,26 +116,26 @@ const columns = ref<Column[]>([
     dictType: DICT_TYPE.PMS_PROJECT_TASK_RY_SCHEDULE,
     fixed: 'left'
   },
-  {
-    label: '审批状态',
-    prop: 'auditStatus',
-    'min-width': '120px',
-    isTag: true,
-    formatter: (row: List) => {
-      switch (row.auditStatus) {
-        case 0:
-          return '待提交'
-        case 10:
-          return '待审批'
-        case 20:
-          return '审批通过'
-        case 30:
-          return '审批拒绝'
-        default:
-          return ''
-      }
-    }
-  },
+  // {
+  //   label: '审批状态',
+  //   prop: 'auditStatus',
+  //   'min-width': '120px',
+  //   isTag: true,
+  //   formatter: (row: List) => {
+  //     switch (row.auditStatus) {
+  //       case 0:
+  //         return '待提交'
+  //       case 10:
+  //         return '待审批'
+  //       case 20:
+  //         return '审批通过'
+  //       case 30:
+  //         return '审批拒绝'
+  //       default:
+  //         return ''
+  //     }
+  //   }
+  // },
   {
     label: '设备型号',
     prop: 'equipmentType',

+ 19 - 11
src/views/report-statistics/work-order-completion.vue

@@ -237,11 +237,16 @@ watch(
   { immediate: true }
 )
 
-function selectType(type: string) {
+function selectType(type: string | undefined) {
   query.value.type = type
   query.value.pageNo = 1
   loadList()
 }
+
+function handleReset() {
+  handleTimeChange('year')
+  selectType(undefined)
+}
 </script>
 
 <template>
@@ -340,16 +345,19 @@ function selectType(type: string) {
         </section>
       </div>
       <div class="flex justify-between">
-        <el-button-group size="default">
-          <el-button
-            v-for="item in timeOptions"
-            :key="item.value"
-            :type="activeTimeType === item.value ? 'primary' : ''"
-            @click="handleTimeChange(item.value)"
-          >
-            {{ item.label }}
-          </el-button>
-        </el-button-group>
+        <div class="flex gap-4">
+          <el-button-group size="default">
+            <el-button
+              v-for="item in timeOptions"
+              :key="item.value"
+              :type="activeTimeType === item.value ? 'primary' : ''"
+              @click="handleTimeChange(item.value)"
+            >
+              {{ item.label }}
+            </el-button>
+          </el-button-group>
+          <el-button size="default" @click="handleReset">重置</el-button>
+        </div>
         <el-button size="default" type="primary">导出</el-button>
       </div>
     </div>