Merge branch 'master' of http://39.164.159.226:3000/hnsh-smart-steward/smart-steward-admin

apps/web-ele/src/api/aiAnalysis/aiAnalysis.ts

@@ -28,18 +28,24 @@ enum Api {
  * 查询检测统计
  * @returns 检测统计结果
  */
-export function getDetectStatistics() {
-  return requestClient.get<BaseResult<DetectStatisticsModel>>(Api.detectStatistics);
+export function getDetectStatistics(params: any) {
+  return requestClient.get<BaseResult<DetectStatisticsModel>>(Api.detectStatistics, {
+    params,
+  });
 }
 
 /**
  * 查询每个分类的预警未处理数量
  * @returns 预警分类统计结果
  */
-export function getWarningStatistics() {
-  return requestClient.get<BaseResult<WarningStatisticsModel[]>>(Api.warningStatistics);
+export function getWarningStatistics(params: any) {
+  return requestClient.get<BaseResult<WarningStatisticsModel[]>>(Api.warningStatistics, {
+    params,
+  });
 }
 
+
+
 /**
  * 查询预警记录列表
  * @param params 查询参数

apps/web-ele/src/api/workflow/task/index.ts

@@ -42,7 +42,7 @@ export function deleteOrder(taskId: string) {
  * @param data
  */
 export function completeTask(data: CompleteTaskReqData) {
-  return requestClient.postWithMsg<void>('/workflow/task/completeTask', data);
+  return requestClient.post<void>('/workflow/task/completeTask', data);
 }
 
 /**
@@ -113,7 +113,7 @@ export function getTaskByTaskId(taskId: string) {
  * 终止任务
  */
 export function terminationTask(data: { comment?: string; taskId: string }) {
-  return requestClient.postWithMsg<void>(
+  return requestClient.post<void>(
     '/workflow/task/terminationTask',
     data,
   );
@@ -128,7 +128,7 @@ export function taskOperation(
   taskOperationData: TaskOperationData,
   taskOperation: TaskOperationType,
 ) {
-  return requestClient.postWithMsg<void>(
+  return requestClient.post<void>(
     `/workflow/task/taskOperation/${taskOperation}`,
     taskOperationData,
   );
@@ -140,7 +140,7 @@ export function taskOperation(
  * @param userId 办理人id
  */
 export function updateAssignee(taskIdList: IDS, userId: ID) {
-  return requestClient.putWithMsg<void>(
+  return requestClient.put<void>(
     `/workflow/task/updateAssignee/${userId}`,
     taskIdList,
   );
@@ -151,7 +151,7 @@ export function updateAssignee(taskIdList: IDS, userId: ID) {
  * @param data 参数
  */
 export function backProcess(data: any) {
-  return requestClient.postWithMsg<void>('/workflow/task/backProcess', data);
+  return requestClient.post<void>('/workflow/task/backProcess', data);
 }
 
 /**

apps/web-ele/src/views/Archive/figuresManage/addInventory/addInventory-data.tsx

@@ -37,7 +37,7 @@ export const tableColumns: VxeGridProps['columns'] = [
     minWidth: 120,
   },
   {
-    field: 'position',
+    field: 'executePositionName',
     title: '岗位',
     minWidth: 120,
   },
@@ -46,28 +46,29 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '评论',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 1 ? '已评' : '未评';
+    formatter: (data: any) => {
+      return data.cellValue === 1 ? '已评' : '未评';
     },
   },
   {
-    field: 'deadline',
+    field: 'endTime',
     title: '截止时间',
     minWidth: 180,
   },
   {
-    field: 'processTime',
+    field: 'completeTime',
     title: '处理时间',
     minWidth: 180,
   },
   {
-    field: 'completionStatus',
+    field: 'isOverdue',
     title: '完成状态',
     minWidth: 120,
     align: 'center',
-    formatter: (cellValue: any) => {
+    formatter: (data: any) => {
       // if (cellValue.status ===)
-      return cellValue === 2 ? '按时完成' : '逾期完成';
+      console.log(data.cellValue);
+      return data.cellValue === 0 ? '按时完成' : '逾期完成';
     },
   },
   {
@@ -75,8 +76,8 @@ export const tableColumns: VxeGridProps['columns'] = [
     title: '创建',
     minWidth: 100,
     align: 'center',
-    formatter: (cellValue: number) => {
-      return cellValue === 0 ? '系统' : '新增';
+    formatter: (data: any) => {
+      return data.cellValue === 0 ? '系统' : '新增';
     },
   },
 ];
@@ -107,11 +108,11 @@ export const queryFormSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       options: [
-        { label: '按时完成', value: 2 },
+        { label: '按时完成', value: 0 },
         { label: '逾期完成', value: 1 },
       ],
     },
-    fieldName: 'completionStatus',
+    fieldName: 'isOverdue',
     label: '状态',
   },
   {

apps/web-ele/src/views/aiAnalysis/home/index.vue

@@ -119,6 +119,7 @@ import { useRouter } from 'vue-router';
 import { getDetectStatistics, getWarningStatistics, getSecurityAlertList } from '#/api/aiAnalysis/aiAnalysis';
 import { selectAllSysStation } from '#/api/system/infoEntry/stationInfo/stationInfo';
 import type { DetectStatisticsModel, WarningStatisticsModel, SecurityAlertModel } from '#/api/aiAnalysis/model';
+import { useUserStore } from '@vben/stores';
 import aiMonitorIcon from '#/assets/icon/ai-monitor.png';
 import cameraIcon from '#/assets/icon/camera.png';
 import monitorTypeIcon from '#/assets/icon/monitor-type.png';
@@ -126,6 +127,8 @@ import aiAlertIcon from '#/assets/icon/ai-alert.png';
 import angleRightIcon from '#/assets/icon/angle-right-circle.png';
 // 路由
 const router = useRouter();
+// 用户store
+const userStore = useUserStore();
 
 // 搜索表单
 const searchForm = ref({
@@ -210,14 +213,18 @@ const fetchStationList = async () => {
 const fetchData = async () => {
   try {
     // 获取检测统计数据
-    const detectRes = await getDetectStatistics();
+    const detectRes = await getDetectStatistics({
+      stationId: searchForm.value.stationId,
+    });
     console.log('detectRes', detectRes);
     if (detectRes) {
       detectStatistics.value = detectRes || {};
     }
 
     // 获取预警分类统计数据
-    const warningRes = await getWarningStatistics();
+    const warningRes = await getWarningStatistics({
+      stationId: searchForm.value.stationId,
+    });
     console.log('warningRes', warningRes);
     if (warningRes) {
       warningStatistics.value = warningRes || [];
@@ -249,6 +256,8 @@ const fetchData = async () => {
 onMounted(async () => {
   // 获取场站列表
   await fetchStationList();
+  // 设置默认场站，参考 creatOrder.vue 的实现
+  searchForm.value.stationId = userStore.userInfo?.stations[0]?.id || '';
   await fetchData();
 });
 </script>

apps/web-ele/src/views/system/post/index.vue

@@ -153,6 +153,7 @@ onMounted(async () => {
             plain
             @click="handleEdit(row)"
             v-access:code="['system:post:edit']"
+            v-show="row.source === 1"
           >
             编辑
           </ElButton>
@@ -166,6 +167,7 @@ onMounted(async () => {
                 type="danger"
                 plain
                 v-access:code="['system:post:remove']"
+                v-show="row.source === 1"
               >
                 删除
               </ElButton>

apps/web-ele/src/views/workflow/components/actions/flow-actions.vue

@@ -241,6 +241,9 @@ function handleApprove() {
   handleFormData.processContent = '';
   handleFormData.taskId = props.task!.taskId;
   handleFileList.value = [];
+  
+  // 设置操作类型为处理
+  actionType.value = 'handle';
 
   // 打开抽屉
   handleDrawerVisible.value = true;
@@ -379,22 +382,45 @@ async function handleCCSubmit() {
   }
 }
 
+// 操作类型：handle 处理，return 退回
+const actionType = ref('handle');
+
 // 退回
-async function handleBack() {
+function handleBack() {
+  // 重置表单数据
+  handleFormData.attachments = '';
+  handleFormData.processContent = '';
+  handleFormData.taskId = props.task!.taskId;
+  handleFileList.value = [];
+  
+  // 设置操作类型为退回
+  actionType.value = 'return';
+  
+  // 打开抽屉
+  handleDrawerVisible.value = true;
+}
+
+// 退回工单提交
+async function handleReturnSubmit() {
   try {
-    await ElMessageBox.confirm('确定要退回该工单吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-      center: true,
-    });
-    await backProcess({
-      taskId: props.task!.taskId,
-    });
+    // 验证处理内容
+    if (!handleFormData.processContent.trim()) {
+      ElMessage.error('请输入退回原因');
+      return;
+    }
+
+    // 调用退回接口
+    await requestClient.put<void>('/workOrder/order/return', handleFormData);
+    ElMessage.success('工单退回成功');
+
+    // 关闭抽屉
+    handleDrawerVisible.value = false;
+
+    // 重新加载数据
     emit('reload');
-  } catch {
-    // 用户取消操作，不做任何处理
-    console.log('用户取消了退回操作');
+  } catch (error) {
+    ElMessage.error('工单退回失败');
+    console.error('工单退回失败:', error);
   }
 }
 
@@ -539,10 +565,10 @@ async function handleApproveDelaySubmit() {
     </div>
   </ElDrawer>
 
-  <!-- 处理工单的抽屉组件 -->
+  <!-- 处理/退回工单的抽屉组件 -->
   <ElDrawer
     v-model="handleDrawerVisible"
-    title="处理工单"
+    :title="actionType === 'handle' ? '处理工单' : '退回工单'"
     width="800px"
     :close-on-click-modal="false"
   >
@@ -552,18 +578,18 @@ async function handleApproveDelaySubmit() {
         label-width="120px"
         class="handle-order-form"
       >
-        <!-- 处理内容 -->
-        <ElFormItem label="处理内容" required>
+        <!-- 处理内容/退回原因 -->
+        <ElFormItem :label="actionType === 'handle' ? '处理内容' : '退回原因'" required>
           <ElInput
             v-model="handleFormData.processContent"
             type="textarea"
             :rows="4"
-            placeholder="请输入处理内容"
+            :placeholder="actionType === 'handle' ? '请输入处理内容' : '请输入退回原因'"
           />
         </ElFormItem>
 
-        <!-- 处理附件 -->
-        <ElFormItem label="处理附件">
+        <!-- 处理附件/退回附件 -->
+        <ElFormItem :label="actionType === 'handle' ? '处理附件' : '退回附件'">
           <ElUpload
             :file-list="handleFileList"
             :action="getSingleImageUploadConfig().action"
@@ -590,7 +616,9 @@ async function handleApproveDelaySubmit() {
     >
       <div class="flex justify-end space-x-2">
         <ElButton @click="handleDrawerVisible = false">取消</ElButton>
-        <ElButton type="primary" @click="handleSubmitForm">提交</ElButton>
+        <ElButton type="primary" @click="actionType === 'handle' ? handleSubmitForm() : handleReturnSubmit()">
+          {{ actionType === 'handle' ? '提交' : '退回' }}
+        </ElButton>
       </div>
     </div>
   </ElDrawer>