Browse Source

瑞鹰统计调整及列表调整

lipenghui 2 weeks ago
parent
commit
a8728d94da

+ 6 - 6
src/views/pms/failure/index.vue

@@ -149,15 +149,15 @@
             </template>
           </el-table-column>
           <!--        <el-table-column label="故障编码" align="center" prop="failureCode" />-->
-          <el-table-column :label="t('fault.faultTitle')" align="center" prop="failureName" />
-          <el-table-column :label="t('iotMaintain.deviceCode')" align="center" prop="deviceCode" />
-          <el-table-column :label="t('fault.deviceName')" align="center" prop="deviceName" />
-          <el-table-column :label="t('fault.status')" align="center" prop="status">
+          <el-table-column :label="t('fault.faultTitle')" align="center" prop="failureName" width="320"/>
+          <el-table-column :label="t('iotMaintain.deviceCode')" align="center" prop="deviceCode" width="220" />
+          <el-table-column :label="t('fault.deviceName')" align="center" prop="deviceName" width="240"/>
+          <el-table-column :label="t('fault.status')" align="center" prop="status" width="110">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.PMS_FAILURE_STATUS" :value="scope.row.status" />
             </template>
           </el-table-column>
-          <el-table-column :label="t('fault.approvalStatus')"  align="center" prop="auditStatus">
+          <el-table-column :label="t('fault.approvalStatus')"  align="center" prop="auditStatus" width="130">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
             </template>
@@ -179,7 +179,7 @@
               {{ scope.row.dealHour&&scope.row.dealHour>0?scope.row.dealHour+'H':"" }}
             </template>
           </el-table-column>
-          <el-table-column :label="t('fault.operation')" align="center" min-width="120px">
+          <el-table-column :label="t('fault.operation')" align="center" min-width="120px" fixed="right">
             <template #default="scope">
               <el-button
                 link

+ 2 - 2
src/views/pms/inspect/order/index.vue

@@ -96,7 +96,7 @@
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column :label="t('bomList.name')" align="center" prop="inspectOrderTitle" width="230" />
+          <el-table-column :label="t('bomList.name')" align="center" prop="inspectOrderTitle" width="300" />
 <!--          <el-table-column label="工单编码" align="center" prop="inspectOrderCode" />-->
           <el-table-column :label="t('route.orderType')" align="center" prop="type" />
           <el-table-column :label="t('operationFill.status')" align="center" prop="status">
@@ -135,7 +135,7 @@
             :formatter="dateFormatter"
             width="180px"
           />
-          <el-table-column :label="t('iotMaintain.operation')" align="center" min-width="120px">
+          <el-table-column :label="t('iotMaintain.operation')" align="center" min-width="120px" fixed="right">
             <template #default="scope">
               <!--          <el-button-->
               <!--            link-->

+ 4 - 4
src/views/pms/inspect/plan/index.vue

@@ -87,8 +87,8 @@
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column :label="t('route.planTitle')" align="center" prop="planTitle"  />
-          <el-table-column :label="t('route.planNumber')" align="center" prop="planCode"  />
+          <el-table-column :label="t('route.planTitle')" align="center" prop="planTitle" width="240" />
+          <el-table-column :label="t('route.planNumber')" align="center" prop="planCode" width="200" />
           <el-table-column :label="t('route.cycle')" align="center" prop="planCycle"  width="80"/>
           <el-table-column :label="t('workOrderMaterial.unit')" align="center" prop="planUnit" width="80">
             <template #default="scope">
@@ -117,11 +117,11 @@
             align="center"
             prop="lastCreateTime"
             :formatter="dateFormatter"
-            width="150px"
+            width="180px"
           />
           <el-table-column :label="t('iotDevice.dept')" align="center" prop="deptName" width="130"/>
           <el-table-column :label="t('inspect.createName')" align="center" prop="createName" width="130"/>
-          <el-table-column :label="t('operationFill.operation')" align="center" width="180">
+          <el-table-column :label="t('operationFill.operation')" align="center" width="180" fixed="right">
             <template #default="scope">
               <el-button
                 link

+ 50 - 8
src/views/pms/stat/rykb.vue

@@ -113,13 +113,17 @@
   <el-row :gutter="16" class="mb-4">
     <el-col :span="8">
     <div class="flex flex-col justify-between">
-      <el-card class="chart-card" shadow="never">
+      <el-card class="safety-days-card chart-card" shadow="never">
         <template #header>
           <div class="flex items-center">
-            <span class="text-base font-medium text-gray-600">修井完成情况</span>
+            <span class="text-base font-medium text-gray-600">安全生产天数</span>
           </div>
         </template>
-        <div ref="repairWellChartRef" class="h-[150px]"></div>
+        <div class="safety-days-content">
+          <div class="days-number">{{ 165 }}</div>
+          <div class="days-label">天</div>
+          <div class="safety-desc">截至当前连续安全生产天数</div>
+        </div>
       </el-card>
       <el-card class="chart-card mt-1" shadow="never">
         <template #header>
@@ -283,7 +287,7 @@ const repairWellData = ref({
 const drillingWellData = ref({
   xAxis: ['50010队', '四川宝石带压作业队'],
   series: [
-    { name: '日累完成井数', data: [5, 8] },
+    // { name: '日累完成井数', data: [5, 8] },
     { name: '月累完成井数', data: [40, 30] },
     { name: '年累完成井数', data: [180,150 ] }
   ]
@@ -301,9 +305,9 @@ const drillingWorkloadData = ref({
 const repairWorkloadData = ref({
   xAxis: ['SCP项目部', '伊拉克项目部', '陕西项目部'],
   series: [
-    { name: '日累进尺', data: [120,80, 160] },
-    { name: '月累进尺', data: [1300,800, 1000] },
-    { name: '年累进尺', data: [4000, 5000, 7000] }
+    // { name: '日累进尺', data: [120,80, 160] },
+    { name: '月完井数', data: [1300,800, 1000] },
+    { name: '年完井数', data: [4000, 5000, 7000] }
   ]
 })
 const repairWellChartRef = ref()
@@ -1023,4 +1027,42 @@ onBeforeUnmount(() => {
 })
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.safety-days-card {
+  .safety-days-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 150px;
+    position: relative;
+
+    .days-number {
+      font-size: 58px;
+      font-weight: bold;
+      color: #1677ff;
+      line-height: 1;
+      transition: all 0.3s ease;
+    }
+
+    .days-number:hover {
+      transform: scale(1.05);
+    }
+
+    .days-label {
+      font-size: 20px;
+      color: #666;
+      margin-top: 8px;
+    }
+
+    .safety-desc {
+      font-size: 14px;
+      color: #999;
+      position: absolute;
+      bottom: 10px;
+      text-align: center;
+      width: 90%;
+    }
+  }
+}
+</style>