Merge branch 'qhse_file' of shuzhihua/pms-iot-vue into master

.env.local

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

src/views/pms/constructionDailyReport/components/report-config.ts

@@ -98,9 +98,9 @@ export type ConstructionDailyReportTableColumn =
   | ConstructionDailyReportTableColumnGroup
 
 export const tableColumns: ConstructionDailyReportTableColumn[] = [
-  { prop: 'reportName', label: '日报名称', minWidth: 180, fixed: 'left' },
+  // { prop: 'reportName', label: '日报名称', minWidth: 180, fixed: 'left' },
   { prop: 'createTime', label: '创建日期', width: 120 },
-  { prop: 'projectName', label: '项目', minWidth: 160, fixed: 'left' },
+
   { prop: 'location', label: '施工区域', minWidth: 140 },
   { prop: 'deptName', label: '队伍', minWidth: 140 },
   { prop: 'mainDeviceNum', label: '主设备(泵车)数量', width: 130 },
@@ -134,6 +134,7 @@ export const tableColumns: ConstructionDailyReportTableColumn[] = [
   // { prop: 'nptReason', label: '造成非生产时间原因', minWidth: 180 },
   { prop: 'singleWellWorkload', label: '单井工作量', width: 120 },
   { prop: 'productionStatus', label: '施工动态', minWidth: 180 },
+  { prop: 'projectName', label: '项目', minWidth: 160 },
   { prop: 'planWorkingLayers', label: '本月计划层数', width: 120 },
   { prop: 'weather', label: '天气', width: 100 },
   { prop: 'temperature', label: '气温(℃)', width: 100 },
@@ -151,7 +152,7 @@ export const formSections: ConstructionDailyReportSection[] = [
       { prop: 'deptName', label: '队伍' },
       { prop: 'taskId', label: '生产任务', type: 'select', editableInEdit: true },
       { prop: 'customer', label: '合同甲方' },
-      { prop: 'deviceNames', label: '设备名称', span: 2 }
+      { prop: 'deviceNames', label: '设备名称', span: 2, type: 'textarea' }
     ]
   },
   {