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

src/views/pms/qhse/ptw/index.vue

@@ -32,10 +32,10 @@
             <el-input placeholder="请输入PTW序号" v-model="queryParams.ptwXh" />
           </el-form-item>
 
-          <el-form-item label="创建日期" prop="createTime">
+          <el-form-item label="创建日期" prop="ptwTime">
             <el-date-picker
-              v-model="queryParams.createTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="queryParams.ptwTime"
+              value-format="x"
               type="daterange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -77,108 +77,108 @@
             :stripe="true"
             height="100%"
             :show-overflow-tooltip="true">
-          <zm-table-column :label="t('monitor.serial')" width="70" align="center" fixed="left">
-            <template #default="scope">
-              {{ scope.$index + 1 }}
-            </template>
-          </zm-table-column>
-
-          <zm-table-column label="PTW编号" align="center" prop="ptwNo" fixed="left" />
-          <zm-table-column label="PTW序号" align="center" prop="ptwXh" fixed="left" />
-
-          <zm-table-column label="时间" align="center" show-overflow-tooltip>
-            <template #default="{ row }">
-              {{ formatDate(row.ptwTime).substring(0, 10) }}
-            </template>
-          </zm-table-column>
-
-          <zm-table-column label="作业票类型" align="center" width="120">
-            <template #default="{ row }">
-              <dict-tag :type="DICT_TYPE.QHSE_PTW_TYPE" :value="row.ptwType" />
-            </template>
-          </zm-table-column>
-
-          <zm-table-column label="作业分级" align="center">
-            <template #default="{ row }">
-              <dict-tag :type="DICT_TYPE.QHSE_PTW_GRADE" :value="row.ptwGrade" />
-            </template>
-          </zm-table-column>
-
-          <zm-table-column
-            label="作业地点"
-            align="center"
-            prop="workLocation"
-            show-overflow-tooltip />
-          <zm-table-column
-            label="作业内容"
-            align="center"
-            prop="workContent"
-            show-overflow-tooltip />
-
-          <zm-table-column
-            label="作业人员"
-            align="center"
-            prop="workPerson"
-            show-overflow-tooltip />
-
-          <zm-table-column label="监护人" align="center" prop="guardian" show-overflow-tooltip />
-          <zm-table-column
-            label="作业负责人"
-            align="center"
-            prop="workDuty"
-            show-overflow-tooltip />
-          <zm-table-column label="部门" align="center" prop="deptName" show-overflow-tooltip />
-
-          <zm-table-column label="附件" align="center" min-width="90">
-            <template #default="{ row }">
-              <el-button
-                text
-                v-if="row.file"
-                :underline="false"
-                type="primary"
-                size="small"
-                @click="viewFile(row.file)"
-                >查看</el-button
-              >
-              <span v-else>-</span>
-            </template>
-          </zm-table-column>
-
-          <zm-table-column prop="createTime" label="创建时间" align="center" min-width="150">
-            <template #default="{ row }">
-              {{ formatDate(row.createTime) }}
-            </template>
-          </zm-table-column>
-
-          <zm-table-column
-            label="备注"
-            align="center"
-            prop="remark"
-            :show-overflow-tooltip="true" />
-
-          <zm-table-column
-            :label="t('devicePerson.operation')"
-            align="center"
-            fixed="right"
-            min-width="120px"
-            action>
-            <template #default="scope">
-              <el-button
-                v-hasPermi="['rq:qhse-ptw:update']"
-                link
-                type="primary"
-                @click="handleEdit(scope.row)">
-                编辑
-              </el-button>
-              <el-button
-                v-hasPermi="['rq:qhse-ptw:delete']"
-                link
-                type="danger"
-                @click="handleDelete(scope.row.id)">
-                删除
-              </el-button>
-            </template>
-          </zm-table-column>
+            <zm-table-column :label="t('monitor.serial')" width="70" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </zm-table-column>
+
+            <zm-table-column label="PTW编号" align="center" prop="ptwNo" fixed="left" />
+            <zm-table-column label="PTW序号" align="center" prop="ptwXh" fixed="left" />
+
+            <zm-table-column label="时间" align="center" show-overflow-tooltip>
+              <template #default="{ row }">
+                {{ formatDate(row.ptwTime).substring(0, 10) }}
+              </template>
+            </zm-table-column>
+
+            <zm-table-column label="作业票类型" align="center" width="120">
+              <template #default="{ row }">
+                <dict-tag :type="DICT_TYPE.QHSE_PTW_TYPE" :value="row.ptwType" />
+              </template>
+            </zm-table-column>
+
+            <zm-table-column label="作业分级" align="center">
+              <template #default="{ row }">
+                <dict-tag :type="DICT_TYPE.QHSE_PTW_GRADE" :value="row.ptwGrade" />
+              </template>
+            </zm-table-column>
+
+            <zm-table-column
+              label="作业地点"
+              align="center"
+              prop="workLocation"
+              show-overflow-tooltip />
+            <zm-table-column
+              label="作业内容"
+              align="center"
+              prop="workContent"
+              show-overflow-tooltip />
+
+            <zm-table-column
+              label="作业人员"
+              align="center"
+              prop="workPerson"
+              show-overflow-tooltip />
+
+            <zm-table-column label="监护人" align="center" prop="guardian" show-overflow-tooltip />
+            <zm-table-column
+              label="作业负责人"
+              align="center"
+              prop="workDuty"
+              show-overflow-tooltip />
+            <zm-table-column label="部门" align="center" prop="deptName" show-overflow-tooltip />
+
+            <zm-table-column label="附件" align="center" min-width="90">
+              <template #default="{ row }">
+                <el-button
+                  text
+                  v-if="row.file"
+                  :underline="false"
+                  type="primary"
+                  size="small"
+                  @click="viewFile(row.file)"
+                  >查看</el-button
+                >
+                <span v-else>-</span>
+              </template>
+            </zm-table-column>
+
+            <zm-table-column prop="createTime" label="创建时间" align="center" min-width="150">
+              <template #default="{ row }">
+                {{ formatDate(row.createTime) }}
+              </template>
+            </zm-table-column>
+
+            <zm-table-column
+              label="备注"
+              align="center"
+              prop="remark"
+              :show-overflow-tooltip="true" />
+
+            <zm-table-column
+              :label="t('devicePerson.operation')"
+              align="center"
+              fixed="right"
+              min-width="120px"
+              action>
+              <template #default="scope">
+                <el-button
+                  v-hasPermi="['rq:qhse-ptw:update']"
+                  link
+                  type="primary"
+                  @click="handleEdit(scope.row)">
+                  编辑
+                </el-button>
+                <el-button
+                  v-hasPermi="['rq:qhse-ptw:delete']"
+                  link
+                  type="danger"
+                  @click="handleDelete(scope.row.id)">
+                  删除
+                </el-button>
+              </template>
+            </zm-table-column>
           </zm-table>
         </div>
 
@@ -589,7 +589,7 @@ const queryParams = reactive({
   pageSize: 10,
   ptwXh: '',
   ptwNo: '',
-  createTime: null,
+  ptwTime: null,
   deptId: ''
 })
 
@@ -671,10 +671,17 @@ const formRules = {
 }
 
 /** 查询列表 */
+const buildPtwQueryParams = () => ({
+  ...queryParams,
+  ptwTime: Array.isArray(queryParams.ptwTime)
+    ? queryParams.ptwTime.map((time) => ensureMillisecondTimestamp(time))
+    : queryParams.ptwTime
+})
+
 const getList = async () => {
   loading.value = true
   try {
-    const data = await QHSEPtwApi.getPtwList(queryParams)
+    const data = await QHSEPtwApi.getPtwList(buildPtwQueryParams())
     list.value = data.list
     total.value = data.total
   } finally {
@@ -717,7 +724,7 @@ const downloadFile = (response) => {
 const handleExport = async () => {
   try {
     exportLoading.value = true
-    const response = await QHSEPtwApi.exportPtw(queryParams)
+    const response = await QHSEPtwApi.exportPtw(buildPtwQueryParams())
     downloadFile(response)
     exportLoading.value = false
   } catch (error) {
@@ -1096,8 +1103,9 @@ async function getStatic() {
 let timeStaticRes = ref<TimeStaticItem>({})
 async function getTimeStaticRes() {
   const deptId = queryParams.deptId || userStore.user.deptId
+  const { ptwTime } = buildPtwQueryParams()
   const res = await QHSEPtwApi.getPtwCountByDateRange({
-    createTime: queryParams.createTime,
+    ptwTime,
     deptId: deptId
   })
 
@@ -1110,7 +1118,7 @@ const resizeStatsCharts = () => {
 }
 
 watch(
-  () => queryParams.createTime,
+  () => queryParams.ptwTime,
   () => {
     getTimeStaticRes()
   }