Просмотр исходного кода

计量器具台账去掉检测信息列

yanghao 1 день назад
Родитель
Сommit
669ed18392
2 измененных файлов с 31 добавлено и 3 удалено
  1. 9 2
      src/views/pms/iotrddailyreport/index.vue
  2. 22 1
      src/views/pms/stat/rdkb/rdProductionBriefs.vue

+ 9 - 2
src/views/pms/iotrddailyreport/index.vue

@@ -47,12 +47,18 @@ const getRouteCreateTime = () => {
   return typeof createTime === 'string' ? [createTime] : getDefaultCreateTime()
   return typeof createTime === 'string' ? [createTime] : getDefaultCreateTime()
 }
 }
 
 
+const getRouteTaskName = () => {
+  const taskName = route.query.taskName
+
+  return typeof taskName === 'string' ? taskName : undefined
+}
+
 const initQuery: Query = {
 const initQuery: Query = {
   pageNo: 1,
   pageNo: 1,
   pageSize: 10,
   pageSize: 10,
   deptId: route.query.deptId ? Number(route.query.deptId) : id,
   deptId: route.query.deptId ? Number(route.query.deptId) : id,
   createTime: getRouteCreateTime(),
   createTime: getRouteCreateTime(),
-  wellName: route.query.wellName ? (route.query.wellName as string) : undefined,
+  taskName: getRouteTaskName(),
   taskId: route.query.taskId ? Number(route.query.taskId) : undefined
   taskId: route.query.taskId ? Number(route.query.taskId) : undefined
 }
 }
 
 
@@ -174,10 +180,11 @@ watch(
 )
 )
 
 
 watch(
 watch(
-  () => [route.query.deptId, route.query.createTime],
+  () => [route.query.deptId, route.query.createTime, route.query.taskName],
   () => {
   () => {
     query.value.deptId = route.query.deptId ? Number(route.query.deptId) : id
     query.value.deptId = route.query.deptId ? Number(route.query.deptId) : id
     query.value.createTime = getRouteCreateTime()
     query.value.createTime = getRouteCreateTime()
+    query.value.taskName = getRouteTaskName()
   }
   }
 )
 )
 
 

+ 22 - 1
src/views/pms/stat/rdkb/rdProductionBriefs.vue

@@ -5,6 +5,7 @@ import type { Ref } from 'vue'
 
 
 interface RdProductionBriefRow {
 interface RdProductionBriefRow {
   id?: number
   id?: number
+  deptId?: number
   projectName?: string
   projectName?: string
   deptName?: string
   deptName?: string
   rdStatusLabel?: string
   rdStatusLabel?: string
@@ -39,6 +40,7 @@ const props = withDefaults(
 const selectedDate = ref(DEFAULT_DATE)
 const selectedDate = ref(DEFAULT_DATE)
 const loading = ref(false)
 const loading = ref(false)
 const list = ref<RdProductionBriefRow[]>([])
 const list = ref<RdProductionBriefRow[]>([])
+const router = useRouter()
 const kbScale = inject<Ref<number>>('rdKbScale', ref(1))
 const kbScale = inject<Ref<number>>('rdKbScale', ref(1))
 const tableHeight = computed<number | string>(() =>
 const tableHeight = computed<number | string>(() =>
   props.pageMode === 'full' ? '100%' : Math.round(TABLE_HEIGHT * kbScale.value)
   props.pageMode === 'full' ? '100%' : Math.round(TABLE_HEIGHT * kbScale.value)
@@ -120,6 +122,20 @@ function handleDateChange() {
   getList()
   getList()
 }
 }
 
 
+function handleRowClick(row: RdProductionBriefRow) {
+  const query: Record<string, string | number | string[]> = {
+    createTime: getCreateTimeRange()
+  }
+
+  if (row.deptId) query.deptId = row.deptId
+  if (row.taskName) query.taskName = row.taskName
+
+  router.push({
+    name: 'IotRdDailyReport',
+    query
+  })
+}
+
 async function getList() {
 async function getList() {
   loading.value = true
   loading.value = true
 
 
@@ -175,7 +191,8 @@ onMounted(() => {
         element-loading-background="rgb(222 236 252 / 72%)"
         element-loading-background="rgb(222 236 252 / 72%)"
         border
         border
         class="device-list-table production-brief-table"
         class="device-list-table production-brief-table"
-        :class="{ 'device-list-table--full': props.pageMode === 'full' }">
+        :class="{ 'device-list-table--full': props.pageMode === 'full' }"
+        @row-click="handleRowClick">
         <el-table-column prop="projectName" label="项目" min-width="150" align="center">
         <el-table-column prop="projectName" label="项目" min-width="150" align="center">
           <template #default="{ row }">
           <template #default="{ row }">
             {{ formatText(row.projectName) }}
             {{ formatText(row.projectName) }}
@@ -300,6 +317,10 @@ onMounted(() => {
     background: #b8cee5;
     background: #b8cee5;
   }
   }
 
 
+  :deep(.el-table__body tr) {
+    cursor: pointer;
+  }
+
   :deep(.el-table__row:hover > td.el-table__cell) {
   :deep(.el-table__row:hover > td.el-table__cell) {
     background: #75a5d6 !important;
     background: #75a5d6 !important;
   }
   }