fix

bigScreen3/src/views/dashboard/cpns/VideoSurveillance.vue

@@ -41,7 +41,6 @@
               playsinline 
               controls 
               class="video-player" 
-              style="width: 100%; height: 100%; object-fit: contain;"
               autoplay
               muted
             ></video>
@@ -60,6 +59,10 @@ import { getPageListData } from '@/api/index'
 import videoSrc from '@/assets/mp4/ziyuan.mp4'
 import defaultImg from '@/assets/defaultImg.png'
 import axios from 'axios'
+import { getToken } from '@/utils/auth'
+import { ElMessage } from 'element-plus'
+
+
 
 // 监控设备列表（响应式数据）
 const videoList = ref([])
@@ -86,8 +89,8 @@ const fetchDriveInfoList = async () => {
         return {
           name: device.deviceName || device.fRemark || '未知监控设备',
           time: formattedTime,
-          deviceId: device.id || device.deviceId || '',
-          streamUrl: 'rtsp://'+device.fAccount+':'+device.fPassword+'@'+device.fIp,
+          deviceId: device.fDriveid,
+          streamUrl: device.url,
           fImg: device.fImg || '' // 保存设备图片地址
         }
       })
@@ -134,14 +137,18 @@ watch(() => props.selectedProjectId, () => {
   // 重新获取数据
   fetchDriveInfoList();
 }, { immediate: true })
-
+const fDriveid = ref('')
 // 关闭所有视频并打开模态框
 function closeAllVideosAndOpenModal(video) {
-  
+  if (!video.streamUrl) {
+    ElMessage.warning('视频流URL为空，无法播放');
+
+    return;
+  }
   // 打开模态框播放当前视频
   selectedVideo.value = video
   isModalOpen.value = true
-  
+  fDriveid.value = video.deviceId
   // 等待模态框完全渲染后初始化视频元素并自动播放
   setTimeout(() => {
     if (videoElement.value) {
@@ -159,7 +166,7 @@ function closeAllVideosAndOpenModal(video) {
 // 关闭视频播放模态框
 function closeModal() {
   // 先触发截图并上传
-  // captureAndUploadSnapshot();
+  captureAndUploadSnapshot();
   
   // 停止视频播放
   if (videoElement.value) {
@@ -204,29 +211,57 @@ async function captureAndUploadSnapshot() {
           console.warn('创建截图失败');
           return;
         }
-        
+        console.log('截图创建成功，大小:', blob.size);
         try {
-          // 创建FormData用于上传
+          // 创建FormData用于上传，添加文件名参数
           const formData = new FormData();
-          const fileName = `${selectedVideo.value?.deviceId || 'unknown'}_${new Date().getTime()}_snapshot.jpg`;
+          // 为文件添加文件名参数，格式为：监控截图_时间戳.jpg
+          const fileName = `监控截图_${Date.now()}.jpg`;
           formData.append('file', blob, fileName);
           
-          // 添加其他可能需要的参数
-          if (selectedVideo.value) {
-            formData.append('deviceId', selectedVideo.value.deviceId);
-            formData.append('deviceName', selectedVideo.value.name);
-          }
-          
           // 上传图片到指定接口
-          const response = await axios.post('/file/uploadFacilityFile', formData, {
+          const response = await axios.post(import.meta.env.VITE_APP_BASE_API +'/file/uploadFile', formData, {
             headers: {
               'Content-Type': 'multipart/form-data',
-              'token': localStorage.getItem('token') || ''
+              'fSource':2,
+              'token':getToken()
             },
             timeout: 10000 // 设置10秒超时
           });
           
           console.log('截图上传成功:', response.data);
+          // 上传成功后保存图片路径到设备信息
+          if (response.data && response.data.data && response.data.data[0]) {
+            const fFileurl = response.data.data[0].fFileurl;
+            // 获取当前设备ID
+           
+            
+            // 调用更新设备信息接口保存图片路径
+            try {
+              if (!fDriveid.value) {
+                console.warn('设备ID为空，无法保存图片路径');
+                return;
+              }
+              await axios.post(import.meta.env.VITE_APP_BASE_API + 'tbasedriveinfo/updateDriveInfo', {
+                data: {
+                  fDriveid: fDriveid.value,
+                  fImg: fFileurl,
+                }
+              }, {
+                headers: {
+                  'Content-Type': 'application/json',
+                  'token': getToken(),
+                  'fSource':2
+                }
+              });
+              fDriveid.value = ''
+              fetchDriveInfoList()
+              console.log('图片路径保存成功');
+            } catch (saveError) {
+              console.error('图片路径保存失败:', saveError.message || saveError);
+            }
+          }
+
         } catch (uploadError) {
           console.error('截图上传失败:', uploadError.message || uploadError);
         }
@@ -551,7 +586,6 @@ onUnmounted(() => {
     height: 72vh;
     background-image: url('@/assets/bj2.png');
     background-size: 100% 100%;
-    background-size: cover;
     background-position: center;
     background-repeat: no-repeat;
     border-radius: 6px;
@@ -564,7 +598,7 @@ onUnmounted(() => {
       flex: 1;
       display: flex;
       flex-direction: column;
-      
+      height: 100%;
       .video-wrapper {
         position: relative;
         flex: 1;
@@ -577,7 +611,7 @@ onUnmounted(() => {
         .video-player {
           width: 100%;
           height: 100%;
-          object-fit: contain;
+          object-fit: cover;
           background: #000;
           cursor: pointer;
         }

web/src/views/basesystem_manage/zhdgList.vue

@@ -4,13 +4,13 @@
     <div class="head-container">
       <div>
         <!-- 搜索 -->
-        <el-input  clearable size="small" placeholder="请输入设备识别号" style="width: 200px;" class="filter-item" v-model="input_name"/>
+        <el-input v-model="input_name" clearable size="small" placeholder="请输入设备识别号" style="width: 200px;" class="filter-item" />
         <!--<el-input  clearable size="small" placeholder="请输入参数内容" style="width: 200px;" class="filter-item" v-model="input_content"/>-->
         <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="search">搜索</el-button>
-    <el-button  class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="reset">重置</el-button>
-   <el-button  class="filter-item" type="primary" size="mini" @click="showLog" icon="el-icon-plus">新增</el-button>
-  </span>
+          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="reset">重置</el-button>
+          <el-button class="filter-item" type="primary" size="mini" icon="el-icon-plus" @click="showLog">新增</el-button>
+        </span>
       </div>
     </div>
     <el-row :gutter="24">
@@ -18,23 +18,23 @@
         <el-card class="box-card box-cardh map-container" shadow="never" style="overflow:auto;">
           <!--表格渲染-->
           <el-table :data="tableData" style="width: 100%;">
-            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column type="selection" width="55" />
             <!--<el-table-column fixed label="参数ID" width="60" align="center">-->
             <!--<template slot-scope="scope">{{ scope.row.fParamid }}</template>-->
             <!--</el-table-column>-->
-            <el-table-column prop="name"  label="设备名称" width="150"></el-table-column>
-            <el-table-column prop="number"  label="设备识别号" width="150"></el-table-column>
-            <el-table-column prop="lightPole" label="灯杆号" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="voltage" label="电压" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="name" label="设备名称" width="150" />
+            <el-table-column prop="number" label="设备识别号" width="150" />
+            <el-table-column prop="lightPole" label="灯杆号" show-overflow-tooltip />
+            <el-table-column prop="voltage" label="电压" show-overflow-tooltip />
             <el-table-column prop="ms" label="类型">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ms == '0' ? '自动' : '' }}</span>
-              <span>{{ scope.row.ms == '1' ? '手动' : '' }}</span>
-            </template>
-          </el-table-column>
-            <el-table-column prop="longitude" label="经度"  show-overflow-tooltip></el-table-column>
-            <el-table-column prop="latitude" label="纬度" show-overflow-tooltip></el-table-column>
-            <el-table-column label="参数操作" width="200"  align="center" fixed="right">
+              <template slot-scope="scope">
+                <span>{{ scope.row.ms == '0' ? '自动' : '' }}</span>
+                <span>{{ scope.row.ms == '1' ? '手动' : '' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="longitude" label="经度" show-overflow-tooltip />
+            <el-table-column prop="latitude" label="纬度" show-overflow-tooltip />
+            <el-table-column label="参数操作" width="200" align="center" fixed="right">
               <template slot-scope="scope">
                 <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                 <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
@@ -43,43 +43,44 @@
           </el-table>
           <!--分页组件-->
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
             :current-page="page.current"
             :page-sizes="[10, 20, 30, 40]"
             :page-size="page.size"
             layout="total, sizes, prev, pager, next, jumper"
             :total="totals"
-          ></el-pagination>
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </el-card>
       </el-col>
     </el-row>
     <!-- 新增 表格 数据 弹框 -->
     <el-dialog :title="titleType" :visible.sync="basedatadialogVisible" width="50%" height>
       <!--<div class="addBox">-->
-      <el-scrollbar class="editbox-cardh"
-                    v-loading="loadingdialog"
+      <el-scrollbar v-loading="loadingdialog"
+                    class="editbox-cardh"
                     element-loading-text="数据加载中"
-                    element-loading-spinner="el-icon-loading">
+                    element-loading-spinner="el-icon-loading"
+      >
         <el-form
-          :model="basedataForm"
           ref="ruleForm"
+          :model="basedataForm"
           size="small"
           label-width="150px"
           class="demo-ruleForm"
           style="width:80%"
         >
 
-         <el-row :gutter="20">
+          <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="所属公园" prop="parkId" >
+              <el-form-item label="所属公园" prop="parkId">
                 <el-select v-model="basedataForm.parkId" clearable filterable placeholder="请选择所属公园" class="filter-item">
                   <el-option
                     v-for="item in parkList"
                     :key="item.fParkid"
                     :label="item.fParkname"
                     :value="{value:item.fParkid,label:item.fParkname}"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -87,49 +88,49 @@
           <el-row :gutter="20" style="padding-top: 10px;">
             <el-col :span="24">
               <el-form-item label="设备识别号" prop="number">
-                <el-input v-model="basedataForm.number" placeholder="设备识别号" ></el-input>
+                <el-input v-model="basedataForm.number" placeholder="设备识别号" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="设备别名" prop="name">
-                <el-input v-model="basedataForm.name" placeholder="设备别名" ></el-input>
+                <el-input v-model="basedataForm.name" placeholder="设备别名" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="灯杆号" prop="lightPole">
-                <el-input v-model="basedataForm.lightPole" placeholder="灯杆号" ></el-input>
+                <el-input v-model="basedataForm.lightPole" placeholder="灯杆号" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="经度" prop="longitude" >
-                <el-input v-model="basedataForm.longitude" placeholder="经度" ></el-input>
+              <el-form-item label="经度" prop="longitude">
+                <el-input v-model="basedataForm.longitude" placeholder="经度" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="纬度" prop="latitude">
-                <el-input v-model="basedataForm.latitude" placeholder="纬度" ></el-input>
+                <el-input v-model="basedataForm.latitude" placeholder="纬度" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="电压" prop="voltage">
-                <el-input v-model="basedataForm.voltage" placeholder="电压" ></el-input>
+                <el-input v-model="basedataForm.voltage" placeholder="电压" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="地址" prop="address">
-                <el-input type="textarea" v-model="basedataForm.address" ></el-input>
+                <el-input v-model="basedataForm.address" type="textarea" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -137,9 +138,9 @@
       </el-scrollbar>
       <!--</div>-->
       <span slot="footer" class="dialog-footer">
-         <el-button type="danger" @click="resetForm" :visible.sync="resetnew">重置</el-button>
-           <el-button type="warning" @click="cancel">取 消</el-button>
-           <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="danger" :visible.sync="resetnew" @click="resetForm">重置</el-button>
+        <el-button type="warning" @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -197,6 +198,21 @@
         parkList: []
       }
     },
+    //  优化  查询功能
+    watch: {
+      input_name: {
+        handler(val) {
+          if (val === '') {
+            this.page.number = val
+            // 获取 列表
+            this.getList(this.page)
+            this.page.current = 1
+          }
+        },
+        deep: true,
+        immediate: true
+      }
+    },
     created() {
       // 获取 列表
       this.getList()
@@ -432,21 +448,6 @@
       checkboxT(row, rowIndex) {
         return row.id !== 1
       }
-    },
-    //  优化  查询功能
-    watch: {
-      input_name: {
-        handler(val) {
-          if (val === '') {
-            this.page.number = val
-            // 获取 列表
-            this.getList(this.page)
-            this.page.current = 1
-          }
-        },
-        deep: true,
-        immediate: true
-      }
     }
   }
 </script>

web/src/views/sbss_manage/drivelist.vue

@@ -167,17 +167,8 @@
           <el-form-item label="设备编号" prop="fNvscode" >
             <el-input  v-model="tableForm.fNvscode" placeholder="设备编号"></el-input>
           </el-form-item>
-          <el-form-item label="地址" prop="fIp" >
-            <el-input  v-model="tableForm.fIp" placeholder="设备地址"></el-input>
-          </el-form-item>
-          <el-form-item label="端口" prop="fPort" >
-            <el-input  v-model="tableForm.fPort" placeholder="设备端口"></el-input>
-          </el-form-item>
-          <el-form-item label="用户名" prop="fAccount" >
-            <el-input  v-model="tableForm.fAccount" placeholder="登录用户名"></el-input>
-          </el-form-item>
-          <el-form-item label="密码" prop="fPassword" >
-            <el-input  v-model="tableForm.fPassword" placeholder="登录密码" show-password></el-input>
+          <el-form-item label="地址" prop="url" >
+            <el-input  v-model="tableForm.url" placeholder="设备地址"></el-input>
           </el-form-item>
           <el-form-item label="设备名称" prop="fName" >
             <el-input  v-model="tableForm.fName" placeholder="设备名称"></el-input>
@@ -397,10 +388,7 @@
                   fIsuse: this.tableForm.fIsuse,
                   fState: this.tableForm.fState,
                   fDriveid: null,
-                  fIp: this.tableForm.fIp,
-                  fPort: this.tableForm.fPort,
-                  fAccount: this.tableForm.fAccount,
-                  fPassword: this.tableForm.fPassword
+                  url: this.tableForm.url
                 }
               })
               // console.log('res', res)
@@ -427,14 +415,11 @@
               fParkname: this.tableForm.fParkname,
               fParkid: this.tableForm.fParkid,
               fIsuse: this.tableForm.fIsuse,
-                  fX: this.tableForm.fX,
-                  fY: this.tableForm.fY,
-                  fState: this.tableForm.fState,
-                  fDriveid: this.tableForm.fDriveid,
-                  fIp: this.tableForm.fIp,
-                  fPort: this.tableForm.fPort,
-                  fAccount: this.tableForm.fAccount,
-                  fPassword: this.tableForm.fPassword
+              fX: this.tableForm.fX,
+              fY: this.tableForm.fY,
+              fState: this.tableForm.fState,
+              fDriveid: this.tableForm.fDriveid,
+              url: this.tableForm.url,
             }
           }).then(res => {
             // console.log('res修改,', res)

web/src/views/sbss_manage/maintainlogs.vue

@@ -4,13 +4,13 @@
     <div class="head-container">
       <div>
         <!-- 搜索 -->
-        <el-input  clearable size="small" placeholder="请输入公园名称" style="width: 200px;" class="filter-item" v-model="input_parkName"/>
-        <el-input  clearable size="small" placeholder="请输入设备名称" style="width: 200px;" class="filter-item" v-model="input_equipmentName"/>
+        <el-input v-model="input_parkName" clearable size="small" placeholder="请输入公园名称" style="width: 200px;" class="filter-item" />
+        <el-input v-model="input_equipmentName" clearable size="small" placeholder="请输入设备名称" style="width: 200px;" class="filter-item" />
         <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="search">搜索</el-button>
-    <el-button  class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="reset">重置</el-button>
-   <el-button  class="filter-item" type="primary" size="mini" @click="showLog" icon="el-icon-plus">新增</el-button>
-  </span>
+          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="reset">重置</el-button>
+          <el-button class="filter-item" type="primary" size="mini" icon="el-icon-plus" @click="showLog">新增</el-button>
+        </span>
       </div>
     </div>
     <el-row :gutter="24">
@@ -18,21 +18,21 @@
         <el-card class="box-card box-cardh map-container" shadow="never" style="overflow:auto;">
           <!--表格渲染-->
           <el-table :data="tableData" style="width: 100%;">
-            <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column prop="parkName"  label="公园名称" width="150"></el-table-column>
-            <el-table-column prop="equipmentName"  label="设备名称" width="150"></el-table-column>
-            <el-table-column prop="equipmentId"  label="设备编号" width="150"></el-table-column>
-            <el-table-column prop="maintenanceContent" label="保养内容" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="maintenanceCost" label="保养费用" width="120"></el-table-column>
-            <el-table-column prop="maintenanceDate" label="保养日期" width="150"></el-table-column>
-            <el-table-column prop="maintenancePerson" label="保养人员" width="120"></el-table-column>
-            <el-table-column prop="maintenanceType" label="保养类型" width="120"></el-table-column>
-            <el-table-column prop="nextMaintenanceDate" label="下次保养日期" width="150"></el-table-column>
-            <el-table-column prop="parkName" label="所属公园" width="150"></el-table-column>
-            <el-table-column prop="workHours" label="工时(小时)" width="120"></el-table-column>
-            <el-table-column prop="createdBy" label="记录创建人" width="120"></el-table-column>
-            <el-table-column prop="createdAt" label="创建时间" width="180"></el-table-column>
-            <el-table-column label="操作" width="200"  align="center" fixed="right">
+            <el-table-column type="selection" width="55" />
+            <el-table-column prop="parkName" label="公园名称" width="150" />
+            <el-table-column prop="equipmentName" label="设备名称" width="150" />
+            <el-table-column prop="equipmentId" label="设备编号" width="150" />
+            <el-table-column prop="maintenanceContent" label="保养内容" show-overflow-tooltip />
+            <el-table-column prop="maintenanceCost" label="保养费用" width="120" />
+            <el-table-column prop="maintenanceDate" label="保养日期" width="150" />
+            <el-table-column prop="maintenancePerson" label="保养人员" width="120" />
+            <el-table-column prop="maintenanceType" label="保养类型" width="120" />
+            <el-table-column prop="nextMaintenanceDate" label="下次保养日期" width="150" />
+            <el-table-column prop="parkName" label="所属公园" width="150" />
+            <el-table-column prop="workHours" label="工时(小时)" width="120" />
+            <el-table-column prop="createdBy" label="记录创建人" width="120" />
+            <el-table-column prop="createdAt" label="创建时间" width="180" />
+            <el-table-column label="操作" width="200" align="center" fixed="right">
               <template slot-scope="scope">
                 <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                 <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
@@ -41,26 +41,27 @@
           </el-table>
           <!--分页组件-->
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
             :current-page="page.current"
             :page-sizes="[10, 20, 30, 40]"
             :page-size="page.size"
             layout="total, sizes, prev, pager, next, jumper"
             :total="totals"
-          ></el-pagination>
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </el-card>
       </el-col>
     </el-row>
     <!-- 新增 表格 数据 弹框 -->
     <el-dialog :title="titleType" :visible.sync="maintainDialogVisible" width="50%" height>
-      <el-scrollbar class="editbox-cardh"
-                    v-loading="loadingdialog"
+      <el-scrollbar v-loading="loadingdialog"
+                    class="editbox-cardh"
                     element-loading-text="数据加载中"
-                    element-loading-spinner="el-icon-loading">
+                    element-loading-spinner="el-icon-loading"
+      >
         <el-form
-          :model="maintainForm"
           ref="ruleForm"
+          :model="maintainForm"
           size="small"
           label-width="150px"
           class="demo-ruleForm"
@@ -68,14 +69,14 @@
         >
           <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="所属公园" prop="parkId" >
+              <el-form-item label="所属公园" prop="parkId">
                 <el-select v-model="maintainForm.parkId" clearable filterable placeholder="请选择所属公园" class="filter-item">
                   <el-option
                     v-for="item in parkList"
                     :key="item.fParkid"
                     :label="item.fParkname"
                     :value="{value:item.fParkid,label:item.fParkname}"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -89,7 +90,7 @@
                     :key="item.ffacilityid"
                     :label="item.fname"
                     :value="{value:item.ffacilityid,label:item.fname,name:item.fname}"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -97,65 +98,65 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="设备名称" prop="equipmentName">
-                <el-input v-model="maintainForm.equipmentName" placeholder="设备名称" :disabled="true"></el-input>
+                <el-input v-model="maintainForm.equipmentName" placeholder="设备名称" :disabled="true" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="保养内容" prop="maintenanceContent">
-                <el-input type="textarea" v-model="maintainForm.maintenanceContent" placeholder="保养内容"></el-input>
+                <el-input v-model="maintainForm.maintenanceContent" type="textarea" placeholder="保养内容" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="保养费用" prop="maintenanceCost">
-                <el-input v-model="maintainForm.maintenanceCost" placeholder="保养费用" type="number"></el-input>
+                <el-input v-model="maintainForm.maintenanceCost" placeholder="保养费用" type="number" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="保养日期" prop="maintenanceDate">
-                <el-date-picker v-model="maintainForm.maintenanceDate" type="datetime" placeholder="选择保养日期" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                <el-date-picker v-model="maintainForm.maintenanceDate" type="datetime" placeholder="选择保养日期" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="保养人员" prop="maintenancePerson">
-                <el-input v-model="maintainForm.maintenancePerson" placeholder="请输入保养人员" class="filter-item"></el-input>
+                <el-input v-model="maintainForm.maintenancePerson" placeholder="请输入保养人员" class="filter-item" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="保养类型" prop="maintenanceType">
-                <el-input v-model="maintainForm.maintenanceType" placeholder="保养类型"></el-input>
+                <el-input v-model="maintainForm.maintenanceType" placeholder="保养类型" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="下次保养日期" prop="nextMaintenanceDate">
-                <el-date-picker v-model="maintainForm.nextMaintenanceDate" type="datetime" placeholder="选择下次保养日期" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                <el-date-picker v-model="maintainForm.nextMaintenanceDate" type="datetime" placeholder="选择下次保养日期" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="工时(小时)" prop="workHours">
-                <el-input v-model="maintainForm.workHours" placeholder="工时(小时)" type="number"></el-input>
+                <el-input v-model="maintainForm.workHours" placeholder="工时(小时)" type="number" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </el-scrollbar>
       <span slot="footer" class="dialog-footer">
-         <el-button type="danger" @click="resetForm" :visible.sync="resetnew">重置</el-button>
-           <el-button type="warning" @click="cancel">取 消</el-button>
-           <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="danger" :visible.sync="resetnew" @click="resetForm">重置</el-button>
+        <el-button type="warning" @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -213,6 +214,34 @@
         equipmentList: []
       }
     },
+    // 监听设备编号变化，自动填充设备名称
+    watch: {
+      'maintainForm.equipmentId': {
+        handler(val) {
+          if (val && val.name) {
+            this.maintainForm.equipmentName = val.name
+          }
+        },
+        deep: true
+      },
+      'maintainForm.parkId': {
+        handler(val) {
+          if (val && val.value) {
+            // 公园切换时，更新设备列表
+            this.getEquipmentList(val.value)
+            // 重置设备选择和设备名称
+            this.maintainForm.equipmentId = ''
+            this.maintainForm.equipmentName = ''
+          } else {
+            // 清空公园时，清空设备列表和选择
+            this.equipmentList = []
+            this.maintainForm.equipmentId = ''
+            this.maintainForm.equipmentName = ''
+          }
+        },
+        deep: true
+      }
+    },
     created() {
       // 获取 列表
       this.getList()
@@ -298,7 +327,7 @@
         }).then(() => {
           request({
             url: `/t-equipment-maintenance/${row.id}`,
-            method: 'delete',
+            method: 'delete'
             // data: [row]
           })
             .then(res => {
@@ -468,34 +497,6 @@
             this.$message.error(err || '加载失败')
           })
       }
-    },
-    // 监听设备编号变化，自动填充设备名称
-    watch: {
-      'maintainForm.equipmentId': {
-        handler(val) {
-          if (val && val.name) {
-            this.maintainForm.equipmentName = val.name
-          }
-        },
-        deep: true
-      },
-      'maintainForm.parkId': {
-        handler(val) {
-          if (val && val.value) {
-            // 公园切换时，更新设备列表
-            this.getEquipmentList(val.value)
-            // 重置设备选择和设备名称
-            this.maintainForm.equipmentId = ''
-            this.maintainForm.equipmentName = ''
-          } else {
-            // 清空公园时，清空设备列表和选择
-            this.equipmentList = []
-            this.maintainForm.equipmentId = ''
-            this.maintainForm.equipmentName = ''
-          }
-        },
-        deep: true
-      },
     }
   }
 </script>
@@ -618,4 +619,4 @@
   .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
     background-color: #e7faf0;
   }
-</style>
+</style>

web/src/views/workorder/Workorder.vue

@@ -54,10 +54,10 @@
         <div class="worderorder_item_right">{{ post.fLevelname }}</div>
       </div>
       <!-- 养护单位 -->
-      <div class="worderorder_item">
+      <!-- <div class="worderorder_item">
         <div class="worderorder_item_left">养护单位 ：</div>
         <div class="worderorder_item_right">{{ post.fYhdeptname }}</div>
-      </div>
+      </div> -->
       <!-- 整改限期-->
       <div class="worderorder_item">
         <div class="worderorder_item_left">整改限期 ：</div>

web/src/views/workorder/workorder_all.vue

@@ -201,11 +201,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
+          <!-- <el-row :gutter="20">
             <el-col :span="24">
-              <!-- 养护单位名称 -->
               <el-form-item label="养护单位名称" prop="fYhdeptname">
-                <!--<el-input v-model="workForm.fYhdeptname" placeholder="养护单位名称"></el-input>-->
                 <el-select v-model="workForm.fYhdeptname" style="width:280px;" placeholder="请选择养护单位" class="filter-item" @change="selectyhdwnameTrigger" >
                   <el-option
                     v-for="item in yhdwList"
@@ -216,7 +214,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row :gutter="20">
             <el-col :span="24">
               <!-- 整改限期 -->
@@ -319,11 +317,11 @@
                       <el-input v-model="dialogModel.fLevelname"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="养护单位">
                       <el-input v-model="dialogModel.fYhdeptname"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="12">
@@ -331,11 +329,11 @@
                       <el-input v-model="dialogModel.fSgusername"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="公园园长">
                       <el-input v-model="dialogModel.fYhusername"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="24">

web/src/views/workorder/workorder_dcl.vue

@@ -45,8 +45,9 @@
         <template slot-scope="scope">
           <!--<el-button size="mini" type="info" icon="el-icon-view" @click="handleSearch(scope.$index, scope.row)">查看</el-button>-->
           <el-button type="primary" size="mini" icon="el-icon-view"  @click="btnShow(scope.row)">查看</el-button>
-          <el-button size="mini" type="primary" icon="el-icon-view" @click="handleEdit(scope.$index, scope.row)">处置</el-button>
-          <el-button size="mini" type="danger" icon="el-icon-delete" @click="handlefinishOrAfresh(scope.$index, scope.row)">注销</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-edit"  @click="showDispatchDialog(scope.row)">派单</el-button>
+          <!-- <el-button size="mini" type="primary" icon="el-icon-view" @click="handleEdit(scope.$index, scope.row)">处置</el-button> -->
+          <!-- <el-button size="mini" type="danger" icon="el-icon-delete" @click="handlefinishOrAfresh(scope.$index, scope.row)">注销</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -234,12 +235,12 @@
       </span>
     </el-dialog>
     <el-dialog append-to-body
-               width="80%"
-               :close-on-click-modal="false"
-               :destroy-on-close="true"
-               :before-close="dialogClose"
-               :title="`${dialogTitle}`"
-               :visible.sync="dialogFormVisible">
+      width="80%"
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      :before-close="dialogClose"
+      :title="`${dialogTitle}`"
+      :visible.sync="dialogFormVisible">
       <el-container
         v-loading="loadingdialog"
         element-loading-text="数据加载中"
@@ -285,11 +286,11 @@
                       <el-input v-model="dialogModel.fLevelname"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="养护单位">
                       <el-input v-model="dialogModel.fYhdeptname"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="12">
@@ -297,11 +298,11 @@
                       <el-input v-model="dialogModel.fSgusername"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="公园园长">
                       <el-input v-model="dialogModel.fYhusername"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="24">
@@ -324,8 +325,7 @@
             </div>
           </el-card>
         </el-aside>
-        <el-main style="background-color: rgb(255, 255, 255); margin-bottom: 0px; padding:0px;line-height: 32px;
-    font-size: 16px;">
+        <el-main style="background-color: rgb(255, 255, 255); margin-bottom: 0px; padding:0px;line-height: 32px;    font-size: 16px;">
           <el-card class="box-card map-container" shadow="never" style="overflow:auto;">
             <div slot="header" class="clearfix">
               <span>工单处理信息</span>
@@ -370,6 +370,46 @@
       </el-container>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogClose" type="warning" style="border:0px ">取 消</el-button>
+        
+      </div>
+    </el-dialog>
+    
+    <!-- 派单弹框 -->
+    <el-dialog title="派单" :visible.sync="dispatchDialogVisible" width="50%">
+      <el-form
+        :model="dispatchForm"
+        ref="dispatchForm"
+        size="small"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="选择部门" prop="selectedDepartment">
+          <el-select v-model="selectedDepartment" @change="onDepartmentChange" placeholder="请选择部门">
+            <el-option
+              v-for="item in departmentList"
+              :key="item.fDeptid"
+              :label="item.fDeptname"
+              :value="item.fDeptid"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        
+        <!-- 人员选择 - 仅当选择了部门后显示 -->
+        <el-form-item v-if="selectedDepartment" label="选择人员" prop="selectedUser">
+          <el-select v-model="selectedUser" placeholder="请选择人员">
+            <el-option
+              v-for="item in userList"
+              :key="item.fUserid"
+              :label="item.fUsername"
+              :value="{id: item.fUserid, name: item.fUsername}"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeDispatchDialog">取 消</el-button>
+        <el-button type="primary" @click="submitDispatch">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -387,7 +427,7 @@
     data() {
       return {
 // 工单类型列表
-        statetype: 2,
+        statetype: 1,
         workcode: '',
         worktype: '',
         // 工单类型列表
@@ -469,7 +509,14 @@
         dialogImageVisible: false,
         dialogModel: {
           id: null
-        }
+        },
+        // 派单相关数据
+        dispatchDialogVisible: false,
+        selectedDepartment: '',
+        departmentList: [],
+        userList: [],
+        selectedUser: '',
+        dispatchForm: {}
       }
     },
     created() {
@@ -751,7 +798,119 @@
             this.$message.error(err || '加载失败')
           })
       },
-      //  处置功能+完结功能
+      // 显示派单弹框
+      showDispatchDialog(row) {
+        this.workForm = row
+        this.dispatchDialogVisible = true
+        this.selectedDepartment = ''
+        this.selectedUser = ''
+        this.userList = []
+        this.getDepartmentList()
+      },
+      
+      // 关闭派单弹框
+      closeDispatchDialog() {
+        this.dispatchDialogVisible = false
+        this.selectedDepartment = ''
+        this.selectedUser = ''
+        this.userList = []
+      },
+      
+      // 提交派单
+      submitDispatch() {
+        // 验证是否选择了人员
+        if (!this.selectedUser || !this.selectedUser.id) {
+          this.$message.warning('请选择派单人员')
+          return
+        }
+        
+        // 准备派单参数
+        const params = {
+          fYhuserid: this.selectedUser.id,
+          fWorkorderid: this.workForm.fWorkorderid
+        }
+        
+        // 调用派单接口
+        request({
+          url: '/workorderbaseApp/dispatchAppOrder',
+          method: 'post',
+          data: params
+        })
+          .then(res => {
+            if (res.status === 200) {
+              this.$message.success('派单成功')
+              this.closeDispatchDialog()
+              // 刷新工单列表
+              this.getList()
+              // 刷新当前工单详情
+              this.getDetail()
+            } else {
+              this.$message.error(res.data.msg || '派单失败')
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '派单失败')
+          })
+      },
+      
+      // 获取部门列表
+      getDepartmentList() {
+        request({
+          url: '/sysdepartment/selectDepartmentByPageListpara?stateid=0',
+          method: 'post',
+          data: {
+            current: 1,
+            fDeptname: "",
+            size: 1000
+          }
+        })
+          .then(res => {
+            if (res.data && res.data.data) {
+              this.departmentList = res.data.data;
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '加载部门列表失败')
+          })
+      },
+      
+      // 部门变更处理
+      onDepartmentChange(deptId) {
+        this.selectedUser = ''; // 清空已选人员
+        // 当部门变更时，获取该部门下的人员列表
+        if (deptId) {
+          this.getUserListByDepartment(deptId);
+        } else {
+          this.userList = [];
+        }
+      },
+      
+      // 根据部门获取人员列表
+      getUserListByDepartment(deptId) {
+        request({
+          url: '/sysuseraccount/selectUserAccountAppByPageList',
+          method: 'post',
+          data: {
+            current: 1,
+            fDeptid: deptId,
+            size: 9999
+          }
+        })
+          .then(res => {
+            if (res.data && res.data.data) {
+              this.userList = res.data.data;
+            } else {
+              this.userList = [];
+              this.$message.info('该部门下暂无人员');
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '加载人员列表失败');
+            this.userList = [];
+          })
+      },
+      
+      // 处置功能+完结功能
       submitForm() {
         // acceptOrDispose:1接收，2处置，3完结，4重新指派
         if (this.key === 'dcl') {

web/src/views/workorder/workorder_ycl.vue

@@ -46,8 +46,9 @@
         <template slot-scope="scope">
           <!--<el-button size="mini" type="info" icon="el-icon-view" @click="handleSearch(scope.$index, scope.row)">查看</el-button>-->
           <el-button type="primary" size="mini" icon="el-icon-view"  @click="btnShow(scope.row)">查看</el-button>
-          <el-button size="mini" type="primary" icon="el-icon-view" @click="handleEdit(scope.$index, scope.row)">完结</el-button>
-          <el-button size="mini" type="danger" icon="el-icon-delete" @click="handlefinishOrAfresh(scope.$index, scope.row)">注销</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-view"  @click="btnDispatch(scope.row)">处理</el-button>
+          <!-- <el-button size="mini" type="primary" icon="el-icon-view" @click="handleEdit(scope.$index, scope.row)">完结</el-button>
+          <el-button size="mini" type="danger" icon="el-icon-delete" @click="handlefinishOrAfresh(scope.$index, scope.row)">注销</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -286,11 +287,11 @@
                       <el-input v-model="dialogModel.fLevelname"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="养护单位">
                       <el-input v-model="dialogModel.fYhdeptname"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="12">
@@ -298,11 +299,11 @@
                       <el-input v-model="dialogModel.fSgusername"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="公园园长">
                       <el-input v-model="dialogModel.fYhusername"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="24">
@@ -325,8 +326,7 @@
             </div>
           </el-card>
         </el-aside>
-        <el-main style="background-color: rgb(255, 255, 255); margin-bottom: 0px; padding:0px;line-height: 32px;
-    font-size: 16px;">
+        <el-main style="background-color: rgb(255, 255, 255); margin-bottom: 0px; padding:0px;line-height: 32px;  font-size: 16px;">
           <el-card class="box-card map-container" shadow="never" style="overflow:auto;">
             <div slot="header" class="clearfix">
               <span>工单处理信息</span>
@@ -373,6 +373,53 @@
         <el-button @click="dialogClose" type="warning" style="border:0px ">取 消</el-button>
       </div>
     </el-dialog>
+    
+    <!-- 处理工单弹框 -->
+    <el-dialog title="处理工单" :visible.sync="dispatchDialogVisible" width="55%">
+      <el-form
+        :model="dispatchForm"
+        ref="dispatchForm"
+        size="small"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="处理内容" prop="disposeRemark">
+          <el-input 
+            type="textarea" 
+            :rows="4" 
+            v-model="dispatchForm.disposeRemark" 
+            placeholder="请输入处理内容"
+          ></el-input>
+        </el-form-item>
+        
+        <el-form-item label="上传附件">
+          <el-upload
+            ref="upload"
+            multiple
+            :file-list="fileList"
+            :limit="20"
+            :on-exceed="handleFileExceed"
+            :before-remove="handleFileBeforeRemove"
+            :on-success="handleFileSuccess"
+            :on-error="handleFileError"
+            :headers="headers"
+            :action="uploadActionUrl"
+            list-type="picture"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleFileRemove">
+            <el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <el-dialog :visible.sync="dialogImageVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+        </el-form-item>
+      </el-form>
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeDispatchDialog">取 消</el-button>
+        <el-button type="primary" @click="submitDispose">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -380,6 +427,7 @@
   import request from '@/utils/request'
   import DateRangePicker from '@/components/DateRangePicker'
   import { parseTime, downloadFile } from '@/utils/index'
+  import { getToken } from '@/utils/auth'
   // 详情组件
   import workorder from '@/views/workorder/Workorder'
   export default {
@@ -387,8 +435,8 @@
     components: { workorder, DateRangePicker },
     data() {
       return {
-// 工单类型列表
-        statetype: 3,
+        // 工单类型列表
+        statetype: 2,
         workcode: '',
         worktype: '',
         // 工单类型列表
@@ -398,6 +446,7 @@
         dialogVisible: false,
         // 表格数据
         tableData: [],
+        rowListData: [],
         // 公园列表
         parkList: [],
         parkname: '',
@@ -457,7 +506,20 @@
         dialogImageVisible: false,
         dialogModel: {
           id: null
-        }
+        },
+        // 处理工单弹框相关数据
+        dispatchDialogVisible: false,
+        dispatchForm: {
+          id: '',
+          disposeRemark: ''
+        },
+        fileList: [],
+        uploadActionUrl:   process.env.VUE_APP_BASE_API+'/file/uploadFile',
+        headers: {
+          fSource:2,
+          token:getToken()
+        },
+        fileInfoList: []
       }
     },
     created() {
@@ -769,6 +831,7 @@
           // this.dialogVisible = false;
         }
         if (this.key === 'ycl') {
+          
           request({
             url: '/workorderbaseApp/finishOrAfreshWorkOrder',
             method: 'post',
@@ -820,6 +883,111 @@
       },
       checkboxT(row, rowIndex) {
         return row.id !== 1
+      },
+      
+      // 显示处理工单弹框
+      btnDispatch(row) {
+        this.dispatchDialogVisible = true
+        this.rowListData = row
+        this.dispatchForm.id = row.fWorkorderid
+        this.fileList = []
+      },
+      
+      // 关闭处理工单弹框
+      closeDispatchDialog() {
+        this.dispatchDialogVisible = false
+        this.dispatchForm.disposeRemark = ''
+        this.fileList = []
+        this.fileInfoList = []
+        this.$refs.dispatchForm && this.$refs.dispatchForm.resetFields()
+      },
+      
+      // 文件超出限制处理
+      handleFileExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 20 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+      },
+      
+      // 文件移除前确认
+      handleFileBeforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`)
+      },
+      
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+        if (response.status === 200) {
+          // 上传成功，将文件信息添加到列表
+          this.fileInfoList.push(response.data[0])
+          this.$message.success('上传成功')
+        } else {
+          this.$message.error('上传失败')
+        }
+      },
+      
+      // 文件上传失败处理
+      handleFileError(err, file, fileList) {
+        this.$message.error('上传失败')
+      },
+      
+      // 图片预览
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url
+        this.dialogImageVisible = true
+      },
+      
+      // 文件移除处理
+      handleFileRemove(file, fileList) {
+        // 从fileInfoList中移除对应的文件信息
+        if (file.response && file.response.status === 200) {
+          const filePath = file.response.data.filePath
+          const index = this.fileInfoList.findIndex(item => item.filePath === filePath)
+          if (index > -1) {
+            this.fileInfoList.splice(index, 1)
+          }
+        }
+      },
+      
+      // 提交处理工单
+      submitDispose() {
+        this.$refs.dispatchForm.validate(valid => {
+          if (valid) {
+            // 准备请求参数
+            const dialogModelList = this.rowListData
+            const params = {
+              fWorkorderid: this.dispatchForm.id,
+              acceptOrDispose: 3, // 3表示处理工单
+              fileList: this.fileInfoList // 上传的文件信息 []
+            }
+            const dataObject = Object.assign(params, dialogModelList);
+            console.log(dataObject)
+            
+            this.$confirm('确定要处理此工单吗?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              request({
+                url: '/workorderbaseApp/finishOrAfreshWorkOrder',
+                method: 'post',
+                data: dataObject
+              }).then(res => {
+                  if (res.status === 200) {
+                    this.$message.success('处理成功')
+                    this.closeDispatchDialog()
+                    // 重新加载列表数据
+                    this.getList(this.page)
+                  } else {
+                    this.$message.error(res.message || '处理失败')
+                  }
+                })
+                .catch(err => {
+                  this.$message.error(err || '处理失败')
+                })
+            })
+          } else {
+            this.$message.warning('请完善处理信息')
+            return false
+          }
+        })
       }
 
     },

web/src/views/workorder/workorder_ywj.vue

@@ -166,11 +166,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
+          <!-- <el-row :gutter="20">
             <el-col :span="24">
-              <!-- 养护单位名称 -->
               <el-form-item label="养护单位名称" prop="fYhdeptname">
-                <!--<el-input v-model="workForm.fYhdeptname" placeholder="养护单位名称"></el-input>-->
                 <el-select v-model="workForm.fYhdeptname" style="width:280px;" placeholder="请选择养护单位" class="filter-item" @change="selectyhdwnameTrigger" >
                   <el-option
                     v-for="item in yhdwList"
@@ -181,7 +179,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row :gutter="20">
             <el-col :span="24">
               <!-- 整改限期 -->
@@ -284,11 +282,11 @@
                       <el-input v-model="dialogModel.fLevelname"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="养护单位">
                       <el-input v-model="dialogModel.fYhdeptname"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="12">
@@ -296,11 +294,11 @@
                       <el-input v-model="dialogModel.fSgusername"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="公园园长">
                       <el-input v-model="dialogModel.fYhusername"></el-input>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <el-row :gutter="10">
                   <el-col :span="24">

web/src/views/workorder/workordercreate.vue

@@ -28,8 +28,7 @@
                     <el-form-item label="紧急程度" prop="fLevelname">
                       <el-select v-model="sizeForm.fLevelname" placeholder="请选择紧急程度">
                         <el-option
-                          v-for="item in  dicList"
-                          @change="selectlevelTrigger"
+                          v-for="item in dicList"
                           :key="item.fDictionaryvalueid"
                           :label="item.fName"
                           :value="{value:item.fValuecode,label:item.fName}"
@@ -51,7 +50,7 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <!-- <el-col :span="12">
                     <el-form-item label="公园园长" prop="director">
                       <el-select v-model="sizeForm.director" placeholder="请选择公园园长">
                         <el-option
@@ -62,7 +61,7 @@
                         ></el-option>
                       </el-select>
                     </el-form-item>
-                  </el-col>
+                  </el-col> -->
                 </el-row>
                 <!--
                 <el-form-item label="养护单位" prop="unit">
@@ -85,12 +84,18 @@
                      ></el-option>
                    </el-select>
                  </el-form-item>-->
-                <!--<el-form-item label="反映人姓名">-->
-                  <!--<el-input v-model="sizeForm.fCustomername"  placeholder="反映人姓名" ></el-input>-->
-                <!--</el-form-item>-->
-                <!--<el-form-item label="联系电话">-->
-                  <!--<el-input v-model="sizeForm.fPhone"  placeholder="联系电话" ></el-input>-->
-                <!--</el-form-item>-->
+                 <el-row :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item label="反映人姓名">
+                        <el-input v-model="sizeForm.fCustomername"  placeholder="反映人姓名" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="联系电话">
+                        <el-input v-model="sizeForm.fPhone"  placeholder="联系电话" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="12">
                     <el-form-item label="整改期限" prop="fAskfinishtime">
@@ -132,7 +137,59 @@
                 <el-form-item label="工单内容" prop="content">
                   <el-input type="textarea" v-model="sizeForm.content" ></el-input>
                 </el-form-item>
-
+                
+                <el-form-item label="是否抄送">
+                  <el-switch v-model="isCc" active-text="是" inactive-text="否"></el-switch>
+                </el-form-item>
+                
+                <!-- 部门选择 - 仅当需要抄送时显示 -->
+                <el-form-item v-if="isCc" label="选择部门" prop="selectedDepartment">
+                  <el-select v-model="selectedDepartment" @change="onDepartmentChange" placeholder="请选择部门">
+                    <el-option
+                      v-for="item in departmentList"
+                      :key="item.fDeptid"
+                      :label="item.fDeptname"
+                      :value="item.fDeptid"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                
+                <!-- 人员选择 - 仅当选择了部门后显示 -->
+                <el-form-item v-if="isCc && selectedDepartment" label="选择人员" prop="selectedUser">
+                  <el-select v-model="selectedUser" placeholder="请选择人员">
+                    <el-option
+                      v-for="item in userList"
+                      :key="item.fUserid"
+                      :label="item.fUsername"
+                      :value="{id: item.fUserid, name: item.fUsername}"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                
+                <!-- 图片上传 -->
+                <el-form-item label="图片上传">
+                  <el-upload
+                    ref="upload"
+                    multiple
+                    :file-list="fileList"
+                    :limit="20"
+                    :on-exceed="handleFileExceed"
+                    :before-remove="handleFileBeforeRemove"
+                    :on-success="handleFileSuccess"
+                    :on-error="handleFileError"
+                    :headers="headers"
+                    :action="uploadActionUrl"
+                    list-type="picture"
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleFileRemove">
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                  <el-dialog :visible.sync="dialogImageVisible">
+                    <img width="100%" :src="dialogImageUrl" alt="">
+                  </el-dialog>
+                </el-form-item>
+                             
+                         
                 <!--<el-form-item size="large">-->
                   <!--<el-button type="primary" @click="onSubmit">提交工单</el-button>-->
                   <!--<el-button @click="resetForm">继续录入</el-button>-->
@@ -152,7 +209,11 @@
 </template>
 <script>
   import request from '@/utils/request'
+  import { getToken } from '@/utils/auth'
+
   import { parseTime, downloadFile } from '@/utils/index'
+  import { mapGetters } from 'vuex'
+
   export default {
       name: 'Workordercreate',
       data() {
@@ -166,6 +227,21 @@
               fName: ''
             }
           ],
+          // 图片上传相关
+          fileList: [],
+          uploadActionUrl: process.env.VUE_APP_BASE_API+'/file/uploadFile', // 上传文件接口地址
+          dialogImageVisible: false,
+          dialogImageUrl: '',
+          headers:{
+            fSource:2,
+            token:getToken()
+          },
+          // 抄送相关
+          isCc: false, // 是否抄送
+          departmentList: [], // 部门列表
+          selectedDepartment: '', // 选中的部门
+          userList: [], // 部门人员列表
+          selectedUser: '', // 选中的人员
           sizeForm: {
             delivery: false,
             // 类型
@@ -268,7 +344,13 @@
         }
       }
     },
+    computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
     created() {
+      this.sizeForm.fCustomername = this.user.fUsername
       //  获取 工单 类型
       this.getOrderType()
       // 获取 养护单位
@@ -277,22 +359,34 @@
       this.getParkList()
       this.Dealuser()
       this.getlevelType()
+      // 获取部门列表
+      this.getDepartmentList()
     },
     methods: {
-      selectlevelTrigger(params) {
-        const { value, label } = params
-        this.size.fLevelid = value
-        this.size.fLevelname = label
-      },
       // 重置工单状态
       resetForm() {
+        // 重置表单数据
+        this.fileList = []
+        // this.sizeForm.type = ''
+        this.sizeForm.company = ''
+        this.sizeForm.director = ''
+        this.sizeForm.unit = ''
+        this.sizeForm.user = ''
+        this.sizeForm.bigType = ''
+        this.sizeForm.fLevelname = ''
         this.sizeForm.fAskfinishtime = ''
         this.sizeForm.fCustomername = ''
         this.sizeForm.fPhone = ''
         this.sizeForm.fAddress = ''
         this.sizeForm.content = ''
+        // 重置抄送相关数据
+        this.isCc = false
+        this.selectedDepartment = ''
+        this.selectedUser = ''
+        this.userList = []
       },
-      //  获取  工单 类型
+      
+      // 获取工单类型
       getOrderType(fLayer) {
         request({
           url: '/woworkordertype/selectOrderTypeList',
@@ -306,7 +400,6 @@
                 if (item.fLayer === 1) {
                   this.sizeForm.orderTypeList.push(item)
                 } else if (item.fLayer === 2) {
-                  console.log(item)
                   this.sizeForm.orderBigClass.push(item)
                 }
               })
@@ -317,13 +410,15 @@
             this.$message.error(err || '加载失败')
           })
       },
+      
       // 工单类型变更处理
       onTypeChange(data) {
         // 清空已选择的工单大类
         this.sizeForm.bigType = ''
         this.sizeForm.orderfilterBigClass = this.sizeForm.orderBigClass.filter(item => item.fParentid === data.sort)
       },
-      //  获取  养护单位
+      
+      // 获取养护单位
       getYanghuUnit() {
         request({
           url: '/tbaseyhcompany/selectYhCompanyList',
@@ -337,7 +432,8 @@
             this.$message.error(err || '加载失败')
           })
       },
-      // 获取
+      
+      // 获取紧急程度类型
       getlevelType() {
         request({
           url: '/sysdictionaryvalue/selectFlagInfoList?flag=GDJJCD',
@@ -351,7 +447,8 @@
             this.$message.error(err || '加载失败')
           })
       },
-      //  获取 公园
+      
+      // 获取公园列表
       getParkList() {
         request({
           url: '/tbaseparkinfo/selectParkInfoList',
@@ -366,13 +463,8 @@
             this.$message.error(err || '加载失败')
           })
       },
-      //  工单大类
-      getGDbigclass() {
-        // 不再需要单独获取工单大类，由工单类型联动获取
-        // 这里保留方法但不执行实际请求
-      },
-
-      //  获取处理人
+      
+      // 获取处理人
       Dealuser() {
         request({
           url: '/sysuseraccount/selectDealuserList?deptid=7',
@@ -386,7 +478,8 @@
             this.$message.error(err || '加载失败')
           })
       },
-      // 获取公园 园长
+      
+      // 获取公园园长
       getParkHead(val) {
         if (this.sizeForm.parkHeader.length !== 0) {
           // 当再次 选择 公园 清空上一次的园长列表
@@ -398,59 +491,166 @@
         //    获取 当个公园   的园长数据
         console.log('this.sizeForm.parkHeader', this.sizeForm.parkHeader)
       },
-      //  新增功能 + 修改功能
+
+      // 图片上传相关方法
+      handleFileExceed(files, fileList) {
+        this.$message.warning(`当前限制上传20个文件，本次选择了${files.length}个文件，已自动过滤多余文件`);
+      },
+      
+      handleFileBeforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`);
+      },
+      
+      handleFileSuccess(response, file, fileList) {
+        // 根据接口要求，fileInfoList取data.data[0]
+        this.$message.success('上传成功');
+        this.fileList = fileList;
+      },
+      
+      handleFileError(err, file, fileList) {
+        this.$message.error('上传失败，请重试');
+        console.error('上传失败', err);
+      },
+      
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogImageVisible = true;
+      },
+      handleFileRemove(file, fileList) {
+        this.fileList = fileList;
+      },
+      
+      // 获取部门列表
+      getDepartmentList() {
+        request({
+          url: '/sysdepartment/selectDepartmentByPageListpara?stateid=0',
+          method: 'post',
+          data: {
+            current: 1,
+            fDeptname: "",
+            size: 1000
+          }
+        })
+          .then(res => {
+            if (res.data && res.data.data) {
+              this.departmentList = res.data.data;
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '加载部门列表失败')
+          })
+      },
+      
+      // 部门变更处理
+      onDepartmentChange(deptId) {
+        this.selectedUser = ''; // 清空已选人员
+        // 当部门变更时，获取该部门下的人员列表
+        if (deptId) {
+          this.getUserListByDepartment(deptId);
+        } else {
+          this.userList = [];
+        }
+      },
+      
+      // 根据部门获取人员列表
+      getUserListByDepartment(deptId) {
+        request({
+          url: '/sysuseraccount/selectUserAccountAppByPageList',
+          method: 'post',
+          data: {
+            current: 1,
+            fDeptid: deptId,
+            size: 9999
+          }
+        })
+          .then(res => {
+            if (res.data && res.data.data) {
+              this.userList = res.data.data;
+            } else {
+              this.userList = [];
+              this.$message.info('该部门下暂无人员');
+            }
+          })
+          .catch(err => {
+            this.$message.error(err || '加载人员列表失败');
+            this.userList = [];
+          })
+      },
+      
+      // 表单提交方法 - 新增功能
       onSubmit() {
         if (this.key === 'add') {
           this.$refs.ruleForm.validate(async valid => {
             if (valid) {
-              // console.log('提交')
-              // 发送 请求
+              // 验证抄送信息
+              if (this.isCc && !this.selectedUser) {
+                this.$message.warning('请选择要抄送的人员');
+                return;
+              }
+              
+              // 处理上传的文件，提取fileInfoList
+              const fileInfoList = this.fileList.filter(file => file.response && file.response.data && file.response.data[0]).map(file => file.response.data[0]);
+              
+              // 构建提交数据
+              const submitData = {
+                workOrderbase: {
+                  fWorkordertypeid: this.sizeForm.type.value,
+                  fWorkordertype: this.sizeForm.type.label,
+                  fStateid: 1,
+                  fState: '预警',
+                  fFromtype: '巡视巡查',
+                  fCustomername: this.sizeForm.fCustomername,
+                  fPhone: this.sizeForm.fPhone,
+                  fAddress: this.sizeForm.fAddress,
+                  // fRegionname: this.sizeForm.parkHeader[0].fStreet,
+                  fContent: this.sizeForm.content,
+                  fCategoryid1: this.sizeForm.bigType.value,
+                  fCategoryname1: this.sizeForm.bigType.label,
+                  // fYhdeptid: this.sizeForm.parkHeader[0].fYhcompanyid,
+                  // fYhdeptname: this.sizeForm.parkHeader[0].fYhcompanyname,
+                  fAskfinishtime: null,
+                  fCreateid: 84,
+                  fCreatename: '自动预警',
+                  fLevelname: this.sizeForm.fLevelname.label,
+                  fLevelid: this.sizeForm.fLevelname.value,
+                  // fYhuserid: this.sizeForm.parkHeader[0].fParkid,
+                  // fYhusername: this.sizeForm.parkHeader[0].fHeader,
+                  fSguserid: this.sizeForm.parkHeader[0].fParkid,
+                  fSgusername: this.sizeForm.parkHeader[0].fParkname,
+                  syncstatus: 1,
+                  distributedept: '生态环境局',
+                  distributedeptcode: 'sthjj',
+                  handlejgdept: '生态环境局',
+                  riskclassify: '6',
+                  riskclassifyname: this.sizeForm.bigType.label,
+                  disposalmethod: '5',
+                  // checkdept: this.sizeForm.parkHeader[0].fYhcompanyname,
+                  // checkusername: this.sizeForm.parkHeader[0].fParkname,
+                  fDeleteflag: 0,
+                  deptType: 1,
+                  fWorkorderid: null
+                },
+                fileInfoList: fileInfoList
+              };
+              
+              // 添加抄送信息
+              if (this.isCc && this.selectedUser) {
+                submitData.workOrderbase.cc = this.selectedUser.id; // 人员ID
+                submitData.workOrderbase.ccName = this.selectedUser.name; // 人员姓名
+              }
+              
+              // 发送请求
               const res = await request({
                 url: '/workorderbaseApp/saveAppWorkorderbase',
                 method: 'post',
-                data: {
-                  workOrderbase: {
-                    fWorkordertypeid: this.sizeForm.type.value,
-                    fWorkordertype: this.sizeForm.type.label,
-                    fStateid: 1,
-                    fState: '预警',
-                    fFromtype: '巡视巡查',
-                    fCustomername: this.sizeForm.fCustomername,
-                    fPhone: this.sizeForm.fPhone,
-                    fAddress: this.sizeForm.fAddress,
-                    fRegionname: this.sizeForm.parkHeader[0].fStreet,
-                    fContent: this.sizeForm.content,
-                    fCategoryid1: this.sizeForm.bigType.value,
-                    fCategoryname1: this.sizeForm.bigType.label,
-                    fYhdeptid: this.sizeForm.parkHeader[0].fYhcompanyid,
-                    fYhdeptname: this.sizeForm.parkHeader[0].fYhcompanyname,
-                    fAskfinishtime: null,
-                    fCreateid: 84,
-                    fCreatename: '自动预警',
-                    fLevelname: this.sizeForm.fLevelname.label,
-                    fLevelid: this.sizeForm.fLevelname.value,
-                    fYhuserid: this.sizeForm.parkHeader[0].fParkid,
-                    fYhusername: this.sizeForm.parkHeader[0].fHeader,
-                    fSguserid: this.sizeForm.parkHeader[0].fParkid,
-                    fSgusername: this.sizeForm.parkHeader[0].fParkname,
-                    syncstatus: 1,
-                    distributedept: '生态环境局',
-                    distributedeptcode: 'sthjj',
-                    handlejgdept: '生态环境局',
-                    riskclassify: '6',
-                    riskclassifyname: this.sizeForm.bigType.label,
-                    disposalmethod: '5',
-                    checkdept: this.sizeForm.parkHeader[0].fYhcompanyname,
-                    checkusername: this.sizeForm.parkHeader[0].fParkname,
-                    fDeleteflag: 0,
-                    deptType: 1,
-                    fWorkorderid: null
-                  }
-                }
+                data: submitData
               })
-               console.log('res', res)
-              if (res.status === 200) {
-                this.$message('新增成功！')
+              if (res && res.status === 200 && res.data) {
+                this.$message.success('新增成功！');
+                // 提交成功后可以重置表单
+                this.resetForm();
+              } else {
+                this.$message.error('提交失败，请重试');
               }
             }
           })
@@ -484,3 +684,4 @@
   }
 </style>
 
+

wxproject/app.json

@@ -34,7 +34,8 @@
         "pages/examinedetail/examinedetail",
         "pages/dailyWeeklyReport/dailyWeeklyReport",
         "pages/createReport/createReport",
-        "pages/onDuty/onDuty"
+        "pages/onDuty/onDuty",
+        "pages/recordDetail/recordDetail"
       ]
     },
     {

wxproject/packageA/pages/onDuty/onDuty.wxml

@@ -3,9 +3,9 @@
 	<view class="calendar">
 		<view class='bcfff'>
 			<view class="map_box">
-        <view class="jilu"  catchtap="nav" data-url="/packageA/pages/recordDetail/recordDetail">
-          打卡记录
-        </view>
+			<view class="jilu"  catchtap="nav" data-url="/packageA/pages/recordDetail/recordDetail">
+			打卡记录
+			</view>
 				<map id="map" longitude="{{posObj.longitude}}" latitude="{{posObj.latitude}}" markers='{{markers}}' scale="17" show-location class="mapSize" polyline="{{polyline}}" circles="{{circles}}" ></map>
 			</view>
 			<view class="timeactive">

wxproject/packageA/pages/recordDetail/recordDetail.js

@@ -0,0 +1,243 @@
+// packageA/pages/recordDetail/recordDetail.js
+var app = getApp();
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    inputValue1: '',
+    inputValue2: '',
+    startTime: '请选择时间', //默认起始时间
+    endTime: '请选择时间', //默认结束时间
+    startStamp: null, // 开始时间戳
+    endStamp: null, // 结束时间戳
+    startOrenDFlag: true,
+    // 上拉加载
+    total: '',
+    dataUrl: '',
+    listData: [],
+    isPage: false,
+    pageSize: 15,
+    pageNum: 1,
+    loading: false,
+    noMore: false,
+    loadingFailed: false,
+    scrollY: '',
+    fUserid: '', // 用户ID
+    scaling: false, // 控制筛选框
+    date3: null, //筛选时间
+    time3: null, // 开始时间
+    date4: null, //结束时间筛选
+    time4: null, //结束时间筛选
+    directorName: null, // 园长名称
+    objectName: null, // 公园名称
+    showBtnFlag: false, // 权限判断
+  },
+
+  //页面跳转
+  nav(e) {
+    ////console.log("路径", e.currentTarget.dataset.url)
+    var url = e.currentTarget.dataset.url;
+    wx.navigateTo({
+      url: url,
+    });
+  },
+
+  //到达底部
+  scrollToLower(e) {
+    if (!this.data.loading && !this.data.noMore) {
+      this.setData({
+        loading: true,
+        pageNum: this.data.pageNum + 1,
+      });
+      this.getData(true);
+    }
+  },
+
+  //请求数据
+  getData(isPage) {
+    var that = this;
+    var url = app.globalData.httpsUrlServer +'/tbaseemployeeworkrecords/selectEmployeeworkrecordsByPageList';
+    var data = {
+      size: 15,
+      current: that.data.pageNum,
+      startTime: that.data.time3,
+      endTime: that.data.time4,
+      fExpand2: that.data.objectName,
+      fRealname: that.data.directorName,
+      fExpandint1: that.data.fUserid,
+    };
+    if (that.data.noMore) {
+      that.setData({
+        noMore: false,
+      });
+    }
+    //请求
+    wx.showLoading({
+      title: '加载中',
+      mark: 'true',
+    });
+    app.postReq(url, data, (res) => {
+      if (res.message == '请求成功') {
+        wx.hideLoading();
+        if (isPage) {
+          //下一页的数据拼接在原有数据后面
+          ////console.log(res.data.data)
+          that.setData({
+            listData: that.data.listData.concat(res.data.data),
+            total: res.data.total,
+            loading: false,
+          });
+        } else {
+          //第一页数据直接赋值
+
+          that.setData({
+            listData: res.data.data,
+            total: res.data.total,
+          });
+        }
+        if (that.data.total == that.data.listData.length) {
+          that.setData({
+            noMore: true,
+          });
+        }
+      } else {
+        that.setData({
+          loading: false,
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+
+  // 选择筛选条件
+  showScaling() {
+    ////console.log("ss")
+    this.setData({
+      scaling: true,
+    });
+  },
+  // 关闭筛选
+  close() {
+    this.setData({
+      scaling: false,
+    });
+  },
+  //  重置
+  qxScaling() {
+    this.setData({
+      pageNum: 1,
+      listData: [],
+      date3: null, //筛选时间
+      time3: null, // 开始时间
+      date4: null, //结束时间筛选
+      time4: null, //结束时间筛选
+      directorName: null, // 园长名称
+      objectName: null, // 公园名称
+      showBtnFlag: false, // 权限判断
+    });
+  },
+  // 确定
+  qdScaling() {
+    var that = this;
+    that.setData({
+      scaling: false,
+      pageNum: 1,
+      scrollY: 0,
+      listData: [],
+    });
+    this.getData(true);
+  },
+
+  // 园长名称
+  parkname2(e) {
+    this.setData({
+      directorName: e.detail.value,
+    });
+  },
+  // 计划公园
+  parkname3(e) {
+    this.setData({
+      objectName: e.detail.value,
+    });
+  },
+  // 筛选日期（开始）
+  bindDateChange3(e) {
+    let val = e.detail.value;
+    let times = new Date(val + ' 00:00:00').getTime();
+    if (this.data.time4) {
+      if (times >= this.data.time4) {
+        return app.toast('不能大于结束时间');
+      }
+    }
+    this.setData({
+      date3: val,
+      time3: times,
+    });
+  },
+  // 筛选日期（结束）
+  bindDateChange4(e) {
+    let val = e.detail.value;
+    let times = new Date(val + ' 23:59:59').getTime();
+    if (this.data.time3) {
+      if (times <= this.data.time3) {
+        return app.toast('不能小于开始时间');
+      }
+    }
+    this.setData({
+      date4: val,
+      time4: times,
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if (wx.getStorageSync('position')) {
+      var flag = '';
+      if (wx.getStorageSync('position') == '中心') {
+        flag = false;
+      } else {
+        flag = true;
+      }
+      this.setData({
+        showBtnFlag: flag,
+      });
+    }
+    // 获取请求地址
+    this.setData({
+      dataUrl: app.globalData.httpsUrlServer,
+      fUserid: wx.getStorageSync('fUserid'),
+    });
+    this.getData(true);
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {},
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {},
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {},
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {},
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {},
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {},
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {},
+});

wxproject/packageA/pages/recordDetail/recordDetail.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "签到记录"
+}

wxproject/packageA/pages/recordDetail/recordDetail.wxml

@@ -0,0 +1,89 @@
+<!--packageA/pages/recordDetail/recordDetail.wxml-->
+<view class="record">
+	<view class="times">
+		<!-- 模态框 -->
+		<view bind:tap="showScaling" class="scaling">筛选</view>
+		<!-- <view class="title">时间筛选：</view>
+		<view class="time_box">
+			<view class="start">
+				<picker mode="date" value="{{startTime}}" bindchange="bindDateChange">
+					<view class="picker">
+						{{startTime}}
+					</view>
+				</picker>
+			</view>
+			<view style="margin: 0 15rpx">---</view>
+			<view class="end">
+				<picker mode="date" value="{{endTime}}" bindchange="bindDateChange2">
+					<view class="picker">
+						{{endTime}}
+					</view>
+				</picker>
+			</view>
+			<view class="all" bindtap="getAll">全部</view>
+		</view> -->
+	</view>
+	<view class="record_box">
+		<scroll-view scroll-y scroll-top="{{ scrollY }}" lower-threshold="50" bindscrolltolower="scrollToLower" style="height: 87vh;">
+			<view class="items" wx:for="{{ listData }}" wx:key="index">
+				<view class="time-box">
+					<view class="name">打卡人：{{ item.fRealname }}</view>
+					<view class="onTime" wx:if="{{item.fWorktype == 1 }}">
+						上班打卡
+					</view>
+					<view class="outTime" wx:elif="{{item.fWorktype == 2 }}">
+						下班打卡
+					</view>
+				</view>
+				<view class="place">所属公园：{{ item.fExpand2 ? item.fExpand2: ""  }}</view>
+				<view class="place">打卡地点：{{ item.fExpand1 ? item.fExpand1: "" }}</view>
+				<view class="nows">打卡时间：{{ item.fWorktime }}</view>
+			</view>
+			<view style="text-align: center;margin: 10px;">
+				<view wx:if="{{loading}}">加载中...</view>
+				<view wx:if="{{noMore}}">没有更多了</view>
+				<view wx:if="{{loadingFailed}}">数据加载失败,请重试</view>
+			</view>
+		</scroll-view>
+	</view>
+</view>
+
+
+<!-- 筛选框 -->
+<view class="dailogBox" wx:if='{{ scaling }}'>
+	<view class="scalingBox">
+		<view class="closeImg" catchtap="close">
+			<image src="./../../../images/weatherImg/close.png"></image>
+		</view>
+
+		<view class="scaling_itme" wx:if="{{ !showBtnFlag  }}">
+			<view class="scaling_itme_left">园长名称：</view>
+			<view class="scaling_itme_right">
+				<input bindinput="parkname2" value="{{ directorName }}" type="text" placeholder="请输入园长名称" maxlength="20"></input>
+			</view>
+		</view>
+		<view class="scaling_itme" wx:if="{{ !showBtnFlag }}">
+			<view class="scaling_itme_left">公园名称：</view>
+			<view class="scaling_itme_right">
+				<input bindinput="parkname3" value="{{ objectName  }}" type="text" placeholder="请输入公园名称" maxlength="20"></input>
+			</view>
+		</view>
+
+		<view class="scaling_itme">
+			<view class="scaling_itme_left">开始时间：</view>
+			<picker class="scaling_itme_right" mode="date" value="{{date3}}" bindchange="bindDateChange3">
+				<view>{{ date3 ? date3: "请选择开始时间" }}</view>
+			</picker>
+		</view>
+		<view class="scaling_itme">
+			<view class="scaling_itme_left">结束时间：</view>
+			<picker class="scaling_itme_right" mode="date" value="{{date4}}" bindchange="bindDateChange4">
+				<view>{{ date4 ? date4: "请选择结束时间" }}</view>
+			</picker>
+		</view>
+		<view class="scaling_fooder">
+			<view class="scaling_fooder_left" bind:tap="qxScaling">重置</view>
+			<view class="scaling_fooder_right" bind:tap="qdScaling">确定</view>
+		</view>
+	</view>
+</view>

wxproject/packageA/pages/recordDetail/recordDetail.wxss

@@ -0,0 +1,163 @@
+/* packageA/pages/recordDetail/recordDetail.wxss */
+page {
+  color: #000000;
+  font-size: 28rpx;
+  padding: 20rpx;
+  background-color: #f4f4f4f4;
+}
+view {
+  width: auto;
+  box-sizing: border-box;
+  display: block;
+}
+.times {
+  height: 8vh;
+  display: flex;
+  align-items: center;
+  padding:0 20rpx;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+}
+.times .title {
+  width: 21%;
+}
+.time_box {
+  width: 79%;
+  display: flex;
+  align-items: center;
+}
+.time_box view {
+  text-align: center;
+}
+.start {
+  padding: 5rpx 10rpx;
+  border: 1rpx solid #c4c4c4;
+}
+.end {
+  padding: 5rpx 10rpx;
+  border: 1rpx solid #c4c4c4;
+}
+.record_box {
+  margin-top: 9vh;
+  /* height: 87vh; */
+  border-radius: 15rpx;
+  /* box-shadow: 0 0 10px #C0C0C0; */
+}
+.time-box {
+  display: flex;
+  justify-content: space-between;
+}
+.time-box .name {
+  padding-bottom: 10rpx;
+}
+.onTime {
+  font-weight: 600;
+  color: #4e72b8;
+} 
+.outTime {
+  font-weight: 600;
+  color: #d71345;
+}
+.items {
+  padding: 20rpx;
+  box-shadow: 0 0 10rpx #CCCCCC;
+  border-radius: 15rpx;
+  margin-bottom: 20rpx;
+  background-color: #fff;
+}
+.nows {
+  margin-bottom: 10rpx;
+}
+.place {
+  width: 80%;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+.all {
+  margin-left: 30rpx;
+} 
+
+
+/* 展开 筛选框 */
+.scaling {
+  /* width: 85rpx; */
+  /* height: 60rpx; */
+  background-color: rgba(123, 104, 238, 0.65);
+  /* position: fixed;
+  top: 80rpx;
+  left: 0rpx; */
+  border-radius: 0 20rpx 20rpx 0;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  padding: 5rpx 20rpx;
+}
+.scalingBox {
+  width: 100%;
+  background-color: #fff;
+  border-radius: 0 0 30rpx 30rpx;
+}
+.scaling_fooder {
+  width: 100%;
+  height: 80rpx;
+  display: flex;
+}
+.scaling_fooder_left {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #333;
+  background-color: #c4c4c4;
+  border-radius: 0 0 0 10rpx;
+}
+
+.scaling_fooder_right {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  color: #333;
+  align-items: center;
+  background-color: #0099FF;
+  border-radius: 0 0 10rpx 0;
+  color: #fff;
+}
+.scaling_itme {
+  color: #333;
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  padding: 0 20rpx;
+}
+.scaling_itme_left {
+  flex: 2;
+  display: flex;
+}
+.scaling_itme_right {
+  flex: 3;
+  display: flex;
+}
+.closeImg {
+  width: 50rpx;
+  height: 50rpx;
+  position: absolute;
+  right: 10rpx;
+  top: 10rpx;
+}
+.closeImg>image {
+  width: 50rpx;
+  height: 50rpx;
+}
+.dailogBox {
+  width: 100%;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 99;
+  position: fixed;
+  left: 0;
+  top: 0;
+}

wxproject/packagePersonnel/pages/personAdd/personAdd.js

@@ -1,6 +1,6 @@
 // packagePersonnel/pages/personAdd/personAdd.js
 const app = getApp()
-import { chineseToPinYin } from "../../../utils/china"
+import { chineseToPinYin } from "../../utils/china"
 Page({
   /**
    * 页面的初始数据

wxproject/packagePersonnel/pages/personAddCenter/personAddCenter.js

@@ -1,7 +1,7 @@
 // packagePersonnel/pages/personAdd/personAdd.js
 const app = getApp()
-import { chineseToPinYin } from "../../../utils/china"
-import CryptoJS from "../../../utils/CryptoJs"
+import { chineseToPinYin } from "../../utils/china"
+import CryptoJS from "../../utils/CryptoJs"
 // ////console.log(CryptoJS)
 Page({
   /**

wxproject/packagePersonnel/pages/personCenterInfo/personCenterInfo.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import { chineseToPinYin } from "../../../utils/china"
+import { chineseToPinYin } from "../../utils/china"
 Page({
   /**
    * 页面的初始数据

wxproject/packagePersonnel/pages/personInfo/personInfo.js

@@ -1,5 +1,5 @@
 const app = getApp()
-import { chineseToPinYin } from "../../../utils/china"
+import { chineseToPinYin } from "../../utils/china"
 Page({
   /**
    * 页面的初始数据

wxproject/packagePersonnel/utils/CryptoJs.js

@@ -0,0 +1,28 @@
+var CryptoJS = require("./abc.js").CryptoJS
+
+function a10010(word, para, value) {
+  var keyStr = para + "!@#" + value
+  var key = CryptoJS.enc.Utf8.parse(keyStr)
+  var srcs = CryptoJS.enc.Utf8.parse(word)
+  var encrypted = CryptoJS.AES.encrypt(srcs, key, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7,
+  })
+  return encrypted.toString()
+}
+function b10086(word, para, value) {
+  if (!word) {
+    return ""
+  }
+  var keyStr = para + "!@#" + value
+  var key = CryptoJS.enc.Utf8.parse(keyStr)
+
+  var decrypt = CryptoJS.AES.decrypt(word, key, {
+    mode: CryptoJS.mode.ECB,
+    padding: CryptoJS.pad.Pkcs7,
+  })
+  return CryptoJS.enc.Utf8.stringify(decrypt).toString()
+}
+//暴露接口
+module.exports.a10010 = a10010
+module.exports.b10086 = b10086

wxproject/pages/work_order_list/work_order_list.wxml

@@ -14,7 +14,7 @@
 								{{ jiaobiao.znfxCount > 99 ? 99 : jiaobiao.znfxCount }}
 						</view>
 				</view>
-				<view class="{{currentTab=='2'? 'checked' : ''}}" id="2" data-id="2" bindtap="tab">
+				<!-- <view class="{{currentTab=='2'? 'checked' : ''}}" id="2" data-id="2" bindtap="tab">
 						信访投诉
 						<text></text>
 						<view class="jiaobiao" wx:if="{{jiaobiao.xftsCount>0}}">
@@ -27,7 +27,7 @@
 						<view class="jiaobiao" wx:if="{{jiaobiao.zxjcCount>0}}">
 								{{ jiaobiao.zxjcCount > 99 ? 99 :  jiaobiao.zxjcCount }}
 						</view>
-				</view>
+				</view> -->
 				<!-- <view class="{{currentTab=='4'? 'checked' : ''}}" id="4" data-id="4" bindtap="tab">本单位检查
 		  <text></text>
 		</view> -->

wxproject/pages/workprocessing/workprocessing.js

@@ -8,6 +8,16 @@ Page({
   data: {
     // 防抖时间
     timer: null,
+    // 抄送相关
+    isCc: false,
+    departmentList: [],
+    departmentNames: [],
+    selectedDepartmentId: '',
+    selectedDepartmentIndex: '',
+    userList: [],
+    userNames: [],
+    selectedUserId: '',
+    selectedUserIndex: '',
     // 工单类型
     handleClassIndex1: 0,
     handleClassIndex: [], //所有id
@@ -516,6 +526,155 @@ Page({
       },
     })
   },
+  // 抄送开关切换
+  switchCcChange(e) {
+    var that = this;
+    var checked = e.detail.value;
+    
+    that.setData({
+      isCc: checked,
+      selectedDepartmentId: '',
+      selectedDepartmentIndex: '',
+      userList: [],
+      userNames: [],
+      selectedUserId: '',
+      selectedUserIndex: ''
+    });
+    
+    // 如果开启抄送，获取部门列表
+    if (checked) {
+      that.getDepartmentList();
+    }
+  },
+  
+  // 获取部门列表
+  getDepartmentList() {
+    var that = this;
+    var token = wx.getStorageSync('token');
+    
+    wx.showLoading({
+      title: '加载部门中...',
+      mask: true
+    });
+    
+    wx.request({
+      url: app.globalData.httpsUrlServer + '/sysdepartment/selectDepartmentByPageListpara?stateid=2',
+      method: 'post',
+      data: {data:{
+        current: 1,
+        fDeptname: "",
+        size: 1000
+      }},
+      dataType: 'json',
+      header: {
+        'Content-Type': 'application/json;charset=UTF-8',
+        token: token,
+        fSource: 1,
+      },
+      success: function (res) {
+        wx.hideLoading();
+        if (res.statusCode == 200 && res.data.status == 200) {
+          console.log('部门列表:', res.data.data.data);
+          var departments = res.data.data.data || [];
+          that.setData({
+            departmentList: departments,
+            departmentNames: departments.map(item => item.fDeptname),
+            selectedDepartmentId: '',
+            selectedDepartmentIndex: ''
+          });
+        }
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        console.error('获取部门列表失败:', err);
+        wx.showToast({
+          title: '获取部门失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+  
+  // 选择部门
+  bindDepartmentChange(e) {
+    var that = this;
+    var index = e.detail.value;
+    console.log('选择的部门索引:', index);
+    var departmentId = that.data.departmentList[index].fDeptid;
+    
+    that.setData({
+      selectedDepartmentIndex: index,
+      selectedDepartmentId: departmentId,
+      userList: [],
+      userNames: [],
+      selectedUserId: '',
+      selectedUserIndex: ''
+    });
+    
+    // 获取该部门的人员列表
+    that.getUserListByDepartment(departmentId);
+  },
+  
+  // 根据部门ID获取人员列表
+  getUserListByDepartment(departmentId) {
+    var that = this;
+    var token = wx.getStorageSync('token');
+    
+    wx.showLoading({
+      title: '加载人员中...',
+      mask: true
+    });
+    
+    wx.request({
+      url: app.globalData.httpsUrlServer + '/sysuseraccount/selectUserAccountAppByPageList',
+      method: 'post',
+      data: {data:{
+        current: 1,
+        size: 9999,
+        fDeptid: departmentId
+      }},
+      dataType: 'json',
+      header: {
+        'Content-Type': 'application/json;charset=UTF-8',
+        token: token,
+        fSource: 1,
+      },
+      success: function (res) {
+        wx.hideLoading();
+        if (res.statusCode == 200 && res.data.status == 200) {
+          var users = res.data.data.data || [];
+          console.log('人员列表:', users);
+          that.setData({
+            userList: users,
+            userNames: users.map(item => item.fUsername),
+            selectedUserId: '',
+            selectedUserIndex: ''
+          });
+        }
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        console.error('获取人员列表失败:', err);
+        wx.showToast({
+          title: '获取人员失败',
+          icon: 'none'
+        });
+      }
+    });
+  },
+  
+  // 选择人员
+  bindUserChange(e) {
+    var that = this;
+    var index = e.detail.value;
+    console.log('选择的人员索引:', index);
+    
+    that.setData({
+      selectedUserIndex: index,
+      selectedUserId: that.data.userList[index].fUserid
+    });
+  },
+  
   // 删除文档
   deleteWord(e) {
     var that = this
@@ -599,6 +758,14 @@ Page({
         duration: 2000,
       })
       return
+    } else if (that.data.isCc && !that.data.selectedUserId) {
+      wx.showToast({
+        title: "请选择抄送人员",
+        icon: "none",
+        mask: "true",
+        duration: 2000,
+      })
+      return
     } else {
       wx.showLoading({
         title: "加载中···",
@@ -606,28 +773,37 @@ Page({
       })
       var url =
         app.globalData.httpsUrlServer + "/workorderbaseApp/saveAppWorkorderbase"
+      // 构建提交数据
+      var workOrderbaseData = {
+        fWorkordertype: that.data.array_handleAllClassMoren.fEname, //工单类型
+        fWorkordertypeid: that.data.array_handleAllClassMoren.fWorkordertypeid,
+        fCustomername: that.data.reportMan, //反映人名
+        fSgusername: parkname, //公园名
+        fSguserid: parkid, //公园id
+        fPhone: that.data.inputPhone, //电话
+        fAddress: that.data.input_place, //地址
+        // 紧急程度
+        fLevelid: that.data.indexLevelDate * 1 + that.data.indexLevel * 1,
+        fLevelname: that.data.arrayLevelDate,
+        // 大类工单
+        fCategoryid1: that.data.indexBigClassValue.fValuecode,
+        fCategoryname1: that.data.indexBigClassValue.fName,
+        // 小类工单 - 已完全屏蔽
+        // 工单内容
+        fContent: that.data.ceshi,
+        // 限制期限
+        fAskfinishtime: that.data.ScrollStateTime,
+      };
+      
+      // 如果选择了抄送，添加抄送信息
+      if (that.data.isCc && that.data.selectedUserId) {
+        var selectedUser = that.data.userList[that.data.selectedUserIndex];
+        workOrderbaseData.cc = selectedUser.fUserid;
+        workOrderbaseData.ccName = selectedUser.fUsername;
+      }
+      
       var data = {
-        workOrderbase: {
-          fWorkordertype: that.data.array_handleAllClassMoren.fEname, //工单类型
-          fWorkordertypeid:
-            that.data.array_handleAllClassMoren.fWorkordertypeid,
-          fCustomername: that.data.reportMan, //反映人名
-          fSgusername: parkname, //公园名
-          fSguserid: parkid, //公园id
-          fPhone: that.data.inputPhone, //电话
-          fAddress: that.data.input_place, //地址
-          // 紧急程度
-          fLevelid: that.data.indexLevelDate * 1 + that.data.indexLevel * 1,
-          fLevelname: that.data.arrayLevelDate,
-          // 大类工单
-          fCategoryid1: that.data.indexBigClassValue.fValuecode,
-            fCategoryname1: that.data.indexBigClassValue.fName,
-            // 小类工单 - 已完全屏蔽
-          // 工单内容
-          fContent: that.data.ceshi,
-          // 限制期限
-          fAskfinishtime: that.data.ScrollStateTime,
-        },
+        workOrderbase: workOrderbaseData,
         fileInfoList: that.data.formFileurl,
         wordInfoList: that.data.fileDocList,
       }

wxproject/pages/workprocessing/workprocessing.wxml

@@ -13,10 +13,7 @@
 					<view class="img">
 						<image src="../../images/icon/icon_jt.png"></image>
 					</view>
-				</view>
-			</picker>
-		</view>
-	</view> -->
+	-->
 	<!-- 来源编号 -->
 	<!-- <view class="time_choose">
 		<view class="title">来源编号</view>
@@ -184,6 +181,27 @@
 				</view>
 			</view>
 		</view>
+		<view class="paidanzi" style="padding: 30rpx;">
+			<view class="paidanziRow" style="margin-bottom: 20rpx;">
+				<view class="paidanziFirst">是否抄送：</view>
+				<switch checked="{{isCc}}" bindchange="switchCcChange" />
+			</view>
+			<view class="paidanziRow" wx:if="{{isCc}}" style="margin-bottom: 20rpx;">
+				<view class="paidanziFirst">选择部门：</view>
+				<picker value="{{selectedDepartmentIndex}}" range="{{departmentNames}}" style="width:80%" bindchange="bindDepartmentChange">
+					<view>{{departmentNames.length > 0 && selectedDepartmentIndex !== '' ? departmentNames[selectedDepartmentIndex] : '请选择部门'}}</view>
+				</picker>
+				<image class="paidanziImg" src="../../images/icon/icon_jt.png"></image>
+			</view>
+			<view class="paidanziRow" wx:if="{{isCc && userNames.length > 0}}">
+				<view class="paidanziFirst">选择人员：</view>
+				<picker value="{{selectedUserIndex}}" range="{{userNames}}" style="width:80%" bindchange="bindUserChange">
+					<view>{{userNames.length > 0 && selectedUserIndex !== '' ? userNames[selectedUserIndex] : '请选择人员'}}</view>
+				</picker>
+				<image class="paidanziImg" src="../../images/icon/icon_jt.png"></image>
+			</view>
+		</view>
+
 
 	</view>
 	<view class="btn">

wxproject/pages/workprocessing/workprocessing.wxss

@@ -296,4 +296,33 @@ page {
   height: 80rpx;
   line-height: 80rpx;
   display: flex;
-} 
+} 
+.paidanzi {
+  padding: 20rpx;
+  background-color: #fff;
+}
+
+.paidanziFirst {
+  width: 170rpx;
+}
+
+.paidanziRow {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  height: 80rpx;
+  line-height: 80rpx;
+  width: 100%;
+}
+
+.paidanziImg {
+  position: absolute;
+  right: 20rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 34rpx;
+  height: 34rpx;
+  margin-right: 10rpx;
+  z-index: 99;
+}