🦄 refactor: 调整日报表头顺序

.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.149:48080  https://iot.deepoil.cc  http://172.26.0.3:48080
-VITE_BASE_URL='http://192.168.188.79:48080'
+VITE_BASE_URL='https://iot.deepoil.cc'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/views/pms/iotrhdailyreport/approval.vue

@@ -183,6 +183,16 @@ const columns = ref<Column[]>([
       }
     ]
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -253,16 +263,7 @@ const columns = ref<Column[]>([
     prop: 'otherNptReason',
     'min-width': '120px'
   },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
 
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
-  },
   // {
   //   label: '非生产时间原因',
   //   prop: 'nptReason',

src/views/pms/iotrhdailyreport/fill.vue

@@ -183,6 +183,16 @@ const columns = ref<Column[]>([
       }
     ]
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -253,16 +263,7 @@ const columns = ref<Column[]>([
     prop: 'otherNptReason',
     'min-width': '120px'
   },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
 
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
-  },
   // {
   //   label: '非生产时间原因',
   //   prop: 'nptReason',

src/views/pms/iotrhdailyreport/index.vue

@@ -274,6 +274,14 @@
                 resizable
               />
             </el-table-column>
+            <el-table-column
+              label="非生产时效"
+              align="center"
+              prop="nonProductionRate"
+              :formatter="nonProductionRateFormatter"
+              :min-width="columnWidths.nonProductionRate.width"
+              resizable
+            />
             <el-table-column label="非生产时间" align="center">
               <el-table-column
                 label="工程质量"
@@ -367,14 +375,7 @@
               :min-width="columnWidths.otherNptReason.width"
               resizable
             />
-            <el-table-column
-              label="非生产时效"
-              align="center"
-              prop="nonProductionRate"
-              :formatter="nonProductionRateFormatter"
-              :min-width="columnWidths.nonProductionRate.width"
-              resizable
-            />
+
             <!-- <el-table-column
               :label="t('project.nptReason')"
               align="center"

src/views/pms/iotrydailyreport/approval.vue

@@ -276,6 +276,16 @@ const columns = ref<Column[]>([
     prop: 'otherProductionTime',
     'min-width': '120px'
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -345,16 +355,6 @@ const columns = ref<Column[]>([
     label: '其他非生产时间原因',
     prop: 'otherNptReason',
     'min-width': '120px'
-  },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
-
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
   }
 ])
 

src/views/pms/iotrydailyreport/fill.vue

@@ -276,6 +276,16 @@ const columns = ref<Column[]>([
     prop: 'otherProductionTime',
     'min-width': '120px'
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -345,16 +355,6 @@ const columns = ref<Column[]>([
     label: '其他非生产时间原因',
     prop: 'otherNptReason',
     'min-width': '120px'
-  },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
-
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
   }
 ])
 

src/views/pms/iotrydailyreport/index.vue

@@ -338,6 +338,14 @@
               :min-width="columnWidths.otherProductionTime.width"
               resizable
             />
+            <el-table-column
+              label="非生产时效"
+              align="center"
+              prop="nonProductionRate"
+              :formatter="nonProductionRateFormatter"
+              :min-width="columnWidths.nonProductionRate.width"
+              resizable
+            />
             <el-table-column label="非生产时间" align="center">
               <el-table-column
                 label="工程质量"
@@ -431,14 +439,7 @@
               :min-width="columnWidths.otherNptReason.width"
               resizable
             />
-            <el-table-column
-              label="非生产时效"
-              align="center"
-              prop="nonProductionRate"
-              :formatter="nonProductionRateFormatter"
-              :min-width="columnWidths.nonProductionRate.width"
-              resizable
-            />
+
             <el-table-column label="操作" align="center" fixed="right">
               <template #default="scope">
                 <el-button

src/views/pms/iotrydailyreport/xapproval.vue

@@ -210,6 +210,16 @@ const columns = ref<Column[]>([
     prop: 'productionTime',
     'min-width': '120px'
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -280,16 +290,7 @@ const columns = ref<Column[]>([
     prop: 'otherNptReason',
     'min-width': '120px'
   },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
 
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
-  },
   {
     label: '生产动态',
     prop: 'productionStatus',

src/views/pms/iotrydailyreport/xfill.vue

@@ -210,6 +210,16 @@ const columns = ref<Column[]>([
     prop: 'productionTime',
     'min-width': '120px'
   },
+  {
+    label: '非生产时效',
+    prop: 'nonProductionRate',
+    'min-width': '120px',
+    formatter: (row: List) => {
+      const nonProductionRate = row?.nonProductionRate ?? 0
+
+      return (nonProductionRate * 100).toFixed(2) + '%'
+    }
+  },
   {
     label: '非生产时间',
     children: [
@@ -280,16 +290,7 @@ const columns = ref<Column[]>([
     prop: 'otherNptReason',
     'min-width': '120px'
   },
-  {
-    label: '非生产时效',
-    prop: 'nonProductionRate',
-    'min-width': '120px',
-    formatter: (row: List) => {
-      const nonProductionRate = row?.nonProductionRate ?? 0
 
-      return (nonProductionRate * 100).toFixed(2) + '%'
-    }
-  },
   // {
   //   label: '非生产时间原因',
   //   prop: 'ryNptReason',

src/views/pms/iotrydailyreport/xjindex.vue

@@ -290,6 +290,14 @@
               :min-width="columnWidths.productionTime.width"
               resizable
             />
+            <el-table-column
+              label="非生产时效"
+              align="center"
+              prop="nonProductionRate"
+              :formatter="nonProductionRateFormatter"
+              :min-width="columnWidths.nonProductionRate.width"
+              resizable
+            />
             <el-table-column label="非生产时间" align="center">
               <el-table-column
                 label="工程质量"
@@ -383,14 +391,7 @@
               :min-width="columnWidths.otherNptReason.width"
               resizable
             />
-            <el-table-column
-              label="非生产时效"
-              align="center"
-              prop="nonProductionRate"
-              :formatter="nonProductionRateFormatter"
-              :min-width="columnWidths.nonProductionRate.width"
-              resizable
-            />
+
             <!-- <el-table-column
               :label="t('project.nptReason')"
               align="center"