修复bug

apps/web-ele/src/api/system/tasksettings/checktheform.ts

@@ -10,11 +10,10 @@ enum Api {
   editSubItemApi = '/inspectionSubItem/item', // 编辑子项
   deleteSubItemApi = '/inspectionSubItem/item', // 删除子项
   addTagApi = '/inspectionTag/tag', // 新增标签
-  querytagbaseApi = '/inspectionTag/tag/list', // 查询标签列表    
-  addinspectionItemApi = '/inspectionItem/item', // 新增检查项              
+  querytagbaseApi = '/inspectionTag/tag/list', // 查询标签列表
+  addinspectionItemApi = '/inspectionItem/item', // 新增检查项
   queryinspectionItemApi = '/inspectionItem/item/list', // 查询检查项列表
   saveApi = '/inspectionMain/main/save', // 保存检查
-
 }
 
 // 查询检查表单列表
@@ -59,14 +58,14 @@ export function querysubItembaseApilist(params?: any) {
 }
 //编辑子项
 export function editSubItemApi(post: any) {
-  return requestClient.put(Api.editSubItemApi, post,);
+  return requestClient.put(Api.editSubItemApi, post);
 }
 //删除子项
 export function deleteSubItemApi(ids: any) {
   return requestClient.delete(`${Api.deleteSubItemApi}/${ids}`, {
     successMessageMode: 'message',
   });
-}     
+}
 // 查询标签列表
 export function querytagbaseApilist(params?: any) {
   return requestClient.get(Api.querytagbaseApi, { params });
@@ -88,7 +87,7 @@ export function deleteTagApi(ids: any) {
   return requestClient.delete(`${Api.addTagApi}/${ids}`, {
     successMessageMode: 'message',
   });
-} 
+}
 // 新增检查项
 export function addinspectionItemApi(post: any) {
   return requestClient.post(Api.addinspectionItemApi, post, {
@@ -97,7 +96,7 @@ export function addinspectionItemApi(post: any) {
 }
 // 查询检查项列表
 export function queryinspectionItemApilist(params?: any) {
-  return requestClient.get(Api.queryinspectionItemApi,  {params} );
+  return requestClient.get(Api.queryinspectionItemApi, { params });
 }
 // 编辑检查项
 export function editinspectionItemApi(post: any) {
@@ -110,13 +109,18 @@ export function deleteinspectionItemApi(ids: any) {
   return requestClient.delete(`${Api.addinspectionItemApi}/${ids}`, {
     successMessageMode: 'message',
   });
-}  
+}
 //检查项列表
 export function saveApi(post: any) {
   return requestClient.post(Api.saveApi, post, {
     successMessageMode: 'message',
   });
 }
+// 获取检查项详情
+export function queryinspectionItemDetailApi(id: number) {
+  return requestClient.get(`${Api.addinspectionItemApi}/${id}`);
+}
+
 //油站执行人下拉框
 // export function stationoperatorapi(params?: any) {
 //   return requestClient.get(Api.stationoperatorapi, params);

apps/web-ele/src/app.vue

@@ -1,8 +1,6 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, ref } from 'vue';
-
-// @ts-ignore
-import { useVbenModal } from '@vben/common-ui';
+import { useRouter } from 'vue-router';
 import { useElementPlusDesignTokens } from '@vben/hooks';
 
 import { ElConfigProvider } from 'element-plus';
@@ -12,105 +10,91 @@ import { elementLocale } from '#/locales';
 defineOptions({ name: 'App' });
 
 useElementPlusDesignTokens();
+const router = useRouter();
 
-const [AIModal, AIModalApi] = useVbenModal({
-  title: 'AI Assistant',
-  showCancelBtn: false,
-});
-const handleAIModal = (e: MouseEvent) => {
-  // 如果是拖动操作，不触发点击事件
-  if (shouldPreventClick.value) {
-    shouldPreventClick.value = false;
+const handleAIModal = () => {
+  if (hasDragged.value) {
+    hasDragged.value = false;
     return;
   }
-  AIModalApi.open();
+  router.push('/aiAnalysis/home');
 };
 
-// 拖动相关状态
+const aiIconRef = ref<HTMLElement | null>(null);
 const isDragging = ref(false);
+const hasDragged = ref(false);
 const startX = ref(0);
 const startY = ref(0);
-const position = ref({ x: 0, y: 0 });
-const aiIconRef = ref<HTMLElement | null>(null);
-const shouldPreventClick = ref(false);
-const moveThreshold = 5; // 拖动阈值，超过此值不触发点击
+const startLeft = ref(0);
+const startTop = ref(0);
+
+// 鼠标按下事件处理函数
+const handleMouseDown = (e: MouseEvent) => {
+  if (!aiIconRef.value) return;
+  hasDragged.value = false;
+  // 阻止默认行为，防止文本选择等
+  e.preventDefault();
+
+  // 开始拖拽
+  isDragging.value = true;
+
+  // 记录初始位置
+  startX.value = e.clientX;
+  startY.value = e.clientY;
+
+  // 记录元素初始位置
+  const rect = aiIconRef.value.getBoundingClientRect();
+  startLeft.value = rect.left;
+  startTop.value = rect.top;
+};
 
-// 初始化位置
-onMounted(() => {
-  // 默认位置：右下角
-  if (aiIconRef.value) {
-    const rect = aiIconRef.value.getBoundingClientRect();
-    position.value = {
-      x: window.innerWidth - rect.width - 30,
-      y: window.innerHeight - rect.height - 30,
-    };
-  }
-});
+// 鼠标移动事件处理函数
+const handleMouseMove = (e: MouseEvent) => {
+  if (!isDragging.value || !aiIconRef.value) return;
 
-// 鼠标按下事件
-const onMouseDown = (e: MouseEvent) => {
-  if (
-    e.target === aiIconRef.value ||
-    aiIconRef.value?.contains(e.target as Node)
-  ) {
-    isDragging.value = true;
-    startX.value = e.clientX;
-    startY.value = e.clientY;
-    shouldPreventClick.value = false;
-  }
-};
+  // 标记为已拖拽
+  hasDragged.value = true;
 
-// 鼠标移动事件
-const onMouseMove = (e: MouseEvent) => {
-  if (isDragging.value) {
-    // 计算移动距离
-    const deltaX = e.clientX - startX.value;
-    const deltaY = e.clientY - startY.value;
-
-    // 如果移动距离超过阈值，标记为拖动操作
-    if (Math.abs(deltaX) > moveThreshold || Math.abs(deltaY) > moveThreshold) {
-      shouldPreventClick.value = true;
-    }
-
-    // 更新位置
-    position.value = {
-      x: position.value.x + deltaX,
-      y: position.value.y + deltaY,
-    };
-
-    // 更新起始位置，用于下一次移动计算
-    startX.value = e.clientX;
-    startY.value = e.clientY;
-
-    // 限制在窗口范围内
-    if (aiIconRef.value) {
-      const rect = aiIconRef.value.getBoundingClientRect();
-      position.value.x = Math.max(
-        0,
-        Math.min(position.value.x, window.innerWidth - rect.width),
-      );
-      position.value.y = Math.max(
-        0,
-        Math.min(position.value.y, window.innerHeight - rect.height),
-      );
-    }
-  }
+  // 计算偏移量
+  const offsetX = e.clientX - startX.value;
+  const offsetY = e.clientY - startY.value;
+
+  // 计算新位置
+  let newLeft = startLeft.value + offsetX;
+  let newTop = startTop.value + offsetY;
+
+  // 限制在视口内
+  const viewportWidth = window.innerWidth;
+  const viewportHeight = window.innerHeight;
+  const iconWidth = aiIconRef.value.offsetWidth;
+  const iconHeight = aiIconRef.value.offsetHeight;
+
+  newLeft = Math.max(0, Math.min(newLeft, viewportWidth - iconWidth));
+  newTop = Math.max(0, Math.min(newTop, viewportHeight - iconHeight));
+
+  // 更新位置
+  aiIconRef.value.style.left = `${newLeft}px`;
+  aiIconRef.value.style.top = `${newTop}px`;
+  aiIconRef.value.style.bottom = 'auto';
+  aiIconRef.value.style.right = 'auto';
 };
 
-// 鼠标释放事件
-const onMouseUp = () => {
+// 鼠标释放事件处理函数
+const handleMouseUp = () => {
   isDragging.value = false;
 };
 
-// 添加和移除全局事件监听器
+// 生命周期钩子
 onMounted(() => {
-  document.addEventListener('mousemove', onMouseMove);
-  document.addEventListener('mouseup', onMouseUp);
+  // 添加全局鼠标事件监听器
+  document.addEventListener('mousemove', handleMouseMove);
+  document.addEventListener('mouseup', handleMouseUp);
 });
 
 onUnmounted(() => {
-  document.removeEventListener('mousemove', onMouseMove);
-  document.removeEventListener('mouseup', onMouseUp);
+  // 移除全局鼠标事件监听器
+  document.removeEventListener('mousemove', handleMouseMove);
+  document.removeEventListener('mouseup', handleMouseUp);
 });
 </script>
 
@@ -121,21 +105,18 @@ onUnmounted(() => {
       ref="aiIconRef"
       class="ai-icon"
       @click="handleAIModal"
-      @mousedown="onMouseDown"
-      :style="{
-        left: `${position.x}px`,
-        top: `${position.y}px`,
-      }"
+      @mousedown="handleMouseDown"
     >
       <img src="/AIimgs.gif" alt="AI Assistant" />
     </div>
-    <AIModal />
   </ElConfigProvider>
 </template>
 
 <style scoped lang="scss">
 .ai-icon {
   position: fixed;
+  bottom: 20px;
+  right: 20px;
   z-index: 9999;
   width: 100px;
   height: 100px;
@@ -146,10 +127,6 @@ onUnmounted(() => {
   justify-content: center;
   cursor: pointer;
   user-select: none;
-  /* 拖动时的光标样式 */
-  &:active {
-    cursor: grabbing;
-  }
 }
 
 .ai-icon img {

apps/web-ele/src/views/schedule/view/index.vue

@@ -525,7 +525,7 @@ const createWorkOrderDrawerEvent = () => {
               <ElOption
                 v-for="item in gasstationlist"
                 :key="`${item.userId}-${item.stationId}`"
-                :label="`${item.nickName}-${item.postName}-${item.stationName}`"
+                :label="`${item.nickName}-${item.postName}${item.stationName ? '-' + item.stationName : ''}`"
                 :value="`${item.userId}-${item.stationId}`"
               />
             </ElSelect>

apps/web-ele/src/views/schedule/work/class/config-data.tsx

@@ -1,25 +1,26 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
+// import { selectAllSysStationAreaList } from '#/api/system/infoEntry/stationInfo/stationInfo';
 // import { queryGasStationList } from '#/api/schedule/index';
 import { queryrclassesApilist } from '#/api/schedule/work/classes';
 import { useUserStore } from '@vben/stores';
 const userStore = useUserStore();
-const getstationId = userStore.userInfo?.stations?.[0]?.id;
-
 export const querySchema: FormSchemaGetter = () => {
   return [
     {
-      component: 'ApiSelect',
+      component: 'Select',
       componentProps: {
-        api: selectAllSysStationAreaList,
-        labelField: 'stationName',
-        valueField: 'id',
+        options: (userStore.userInfo?.stations || []).map((item: any) => {
+          return {
+            label: item.stationName,
+            value: item.id,
+          };
+        }),
         placeholder: '请选择油站',
         clearable: true,
       },
       fieldName: 'stationName',
-      defaultValue: getstationId,
+      defaultValue: userStore.userInfo?.stations?.[0]?.id,
       label: '油站',
     },
     {

apps/web-ele/src/views/system/taskDesign/formDesign/index.vue

@@ -39,6 +39,7 @@ import {
   querysubItembaseApilist,
   querytagbaseApilist,
   saveApi,
+  queryinspectionItemDetailApi,
 } from '#/api/system/tasksettings/checktheform';
 import TinymceEditor from '#/components/tinymce/src/editor.vue';
 import { getUploadAction } from '#/components/upload/config';
@@ -107,6 +108,18 @@ const init = async () => {
   await taglistfn();
 };
 
+const queryinspectionItemDetail = async (id: number) => {
+  try {
+    const res = await queryinspectionItemDetailApi(id);
+    console.log('检查项详情', res);
+    // if (res) {
+    //   editForm = res;
+    // }
+  } catch (error) {
+    console.error('查询检查项详情失败:', error);
+  }
+};
+
 // 检测 id 变化
 watch(
   () => route.query.id,
@@ -184,7 +197,7 @@ const editForm = reactive({
   // exampleImagelist: [],
   // 富文本内容
   checkDescription: '',
-});
+}) as any;
 
 // 表单验证规则
 const editFormRules = reactive({
@@ -276,35 +289,21 @@ async function deleteSubItem(subItem: SubItem) {
 function addCheckItem() {
   editType.value = 'addcheck';
   editDrawerVisible.value = true;
-  editForm.id = '';
-  editForm.name = '';
   // 关联子项
   editForm.subItemId = selectedSubItemId.value || '';
-  // 检查项名称
-  editForm.itemName = '';
-  editForm.isRandom = '';
-  // 标签
-  editForm.tag = [];
-  // 输入项
-  editForm.hasInput = '';
-  editForm.inputContent = '';
-  // 拍照
-  ishasPhoto.value = false;
-  editForm.hasPhoto = '';
-  editForm.photoPrompt = '';
-  // 检查结果
-  editForm.checkResult = '';
-  editForm.limitScore = '';
-  // 示例图
-  editForm.exampleImage = '';
-  // editForm.exampleImagelist = [];
-  // 富文本内容
-  editForm.checkDescription = '';
 }
 
 // 编辑检查项
-function editCheckItem(checkItem: any) {
-  console.log(checkItem);
+async function editCheckItem(checkItem: any) {
+  // console.log(checkItem);
+  // const aa = "http://192.168.1.33:19000/smart-steward-bucket/comment/20260206/ca63ff81.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=root%2F20260206%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260206T100201Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=99e33fd4c65189bc90e60ca65dad1149f316847d69325484dc6850129427c5d4"
+  // console.log(aa.split('?')[0].split('/').slice(-3).join('/'));
+  
+  try {
+    await queryinspectionItemDetail(checkItem.id);
+  } catch (error) {
+    console.error('查询检查项详情失败:', error);
+  }
   ishasPhoto.value = checkItem?.hasPhoto == '2';
 
   editType.value = 'check';
@@ -322,20 +321,26 @@ function editCheckItem(checkItem: any) {
   editForm.photoPrompt = checkItem?.photoPrompt || '';
   editForm.checkResult = String(checkItem?.checkResult) || '';
   editForm.limitScore = checkItem?.limitScore || '';
-  // fileList.value = checkItem?.exampleImagelist|| [];
-  // fileList.value = checkItem?.exampleImage
-  //   .split(',')
-  //   .map((item: any, index: number) => {
+  // fileList.value = checkItem?.exampleImageUrl.map(
+  //   (item: any, index: number) => {
   //     return {
-  //       name: item,
+  //       name: item.split('?')[0].split('/').slice(-3).join('/'),
   //       response: {
-  //         fileName: item,
-  //         url: item,
+  //         code: 200,
+  //         data: {
+  //           fileName: item.split('?')[0].split('/').slice(-3).join('/'),
+  //           url: item,
+  //         },
+  //         msg: '操作成功',
   //       },
+  //       url: item,
   //       status: 'success',
   //       uid: index + Math.random().toString(36).substring(2),
   //     };
-  //   });
+  //   },
+  // );
+  // console.log(fileList.value);
+  
   editForm.checkDescription = checkItem?.checkDescription || '';
 }
 
@@ -347,7 +352,7 @@ function saveEdit() {
       switch (editType.value) {
         case 'addcheck': {
           // console.log(editForm);
-          // console.log(fileList.value);
+          console.log(fileList.value);
           // 新增检查项
           try {
             await addinspectionItemApi({
@@ -433,7 +438,7 @@ function saveEdit() {
         case 'sub': {
           // 编辑子项
           const index = subItems.value.findIndex(
-            (item) => item.id === editForm.id,
+            (item: any) => item.id === editForm.id,
           );
           if (index !== -1) {
             try {
@@ -528,10 +533,10 @@ async function onDrop(
 
     // 找到被拖拽元素和目标元素的索引（确保id类型一致）
     const draggedIndex = items.findIndex(
-      (item) => String(item.id) === String(itemId),
+      (item: any) => String(item.id) === String(itemId),
     );
     const targetIndex = items.findIndex(
-      (item) => String(item.id) === String(targetItem.id),
+      (item: any) => String(item.id) === String(targetItem.id),
     );
 
     if (draggedIndex === -1 || targetIndex === -1) {
@@ -548,7 +553,7 @@ async function onDrop(
     items.splice(targetIndex, 0, draggedItem);
 
     // 更新所有元素的order属性
-    items.forEach((item, index) => {
+    items.forEach((item: any, index: any) => {
       item.order = index + 1;
     });
 
@@ -558,7 +563,7 @@ async function onDrop(
       '到',
       targetItem.id,
       '新顺序:',
-      items.map((item) => ({
+      items.map((item: any) => ({
         id: item.id,
         name: item.name,
         order: item.order,
@@ -567,7 +572,7 @@ async function onDrop(
 
     // 保存排序结果到后端（只处理子项）
     if (type === 'sub') {
-      const updatePromises = items.map(async (item) => {
+      const updatePromises = items.map(async (item: any) => {
         try {
           await editSubItemApi({
             id: item.id,
@@ -582,7 +587,7 @@ async function onDrop(
       await Promise.all(updatePromises);
       await querysubItemlist();
     } else {
-      checkItems.value = items.map((item) => {
+      checkItems.value = items.map((item: any) => {
         return {
           ...item,
           sortOrder: item.order,
@@ -601,12 +606,13 @@ const fileList = ref([]) as any;
 const dialogImageUrl = ref('');
 const dialogVisible = ref(false);
 
-const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+const handleRemove = (uploadFile: any, uploadFiles: any) => {
   console.log(uploadFile, uploadFiles);
 };
 
-const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
-  dialogImageUrl.value = uploadFile.url!;
+const handlePictureCardPreview = (uploadFile: any) => {
+  console.log(uploadFile);
+  dialogImageUrl.value = uploadFile.url;
   dialogVisible.value = true;
 };
 // 抽屉打开后处理函数
@@ -618,6 +624,39 @@ function handleDrawerOpen() {
     drawerContent.scrollTop = 0;
   }
 }
+const closeEditDrawer = () => {
+  console.log('关闭了');
+  editForm.id = '';
+  editForm.name = '';
+  // 关联子项
+  editForm.subItemId = '';
+  // 检查项名称
+  editForm.itemName = '';
+  editForm.isRandom = '';
+  // 标签
+  editForm.tag = [];
+  // 输入项
+  editForm.hasInput = '';
+  editForm.inputContent = '';
+  // 拍照
+  ishasPhoto.value = false;
+  editForm.hasPhoto = '';
+  editForm.photoPrompt = '';
+  // 检查结果
+  editForm.checkResult = '';
+  editForm.limitScore = '';
+  // 示例图
+  editForm.exampleImage = '';
+  // editForm.exampleImagelist = [];
+  // 富文本内容
+  editForm.checkDescription = '';
+  fileList.value = [];
+};
+
+const handleUpload = ()=>{
+  console.log(fileList.value);
+  
+}
 </script>
 
 <template>
@@ -801,8 +840,9 @@ function handleDrawerOpen() {
                 ? '新增检查项'
                 : ''
       "
-      size="600px"
+      size="700px"
       direction="rtl"
+      @close="closeEditDrawer"
     >
       <ElForm
         ref="editFormRef"
@@ -941,7 +981,7 @@ function handleDrawerOpen() {
             <el-checkbox
               v-model="ishasPhoto"
               @change="
-                (val) => {
+                (val: any) => {
                   val === true ? (editForm.hasPhoto = '1') : '';
                 }
               "
@@ -984,7 +1024,7 @@ function handleDrawerOpen() {
           v-if="editType === 'addcheck' || editType === 'check'"
           label="示例图"
         >
-          <el-icon style="font-size: 16px"><QuestionFilled /></el-icon>
+          <!-- <el-icon style="font-size: 16px;"><QuestionFilled /></el-icon> -->
 
           <el-upload
             v-model:file-list="fileList"
@@ -994,6 +1034,7 @@ function handleDrawerOpen() {
             list-type="picture-card"
             :on-preview="handlePictureCardPreview"
             :on-remove="handleRemove"
+            :on-success="handleUpload"
             :disabled="fileList.length >= 3"
           >
             <template #default>

apps/web-ele/src/views/system/taskDesign/taskTemplate/index.vue

@@ -125,7 +125,6 @@ async function handleView(row: any) {
 async function handleEdit(row: any) {
   try {
     const res = await xiangqigApi(row.id);
-    console.log(res);
     drawerApi
       .setData({
         ...res,

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-data.tsx

@@ -318,6 +318,15 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
   },
   {
     component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+    fieldName: 'isUpdate',
+    formItemClass: 'col-span-2 items-baseline',
+  },
+  {
+    component: 'Input',
     fieldName: 'executePosition',
     dependencies: {
       show: () => false,
@@ -378,10 +387,13 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     component: 'Select',
     fieldName: 'taskType',
     label: '任务类型',
-    componentProps: {
-      placeholder: '请选择任务类型',
-      options: getTaskTypeOptions(),
-      clearable: true,
+    componentProps: (data: any) => {
+      return {
+        placeholder: '请选择任务类型',
+        options: getTaskTypeOptions(),
+        clearable: true,
+        disabled: data.isUpdate,
+      };
     },
     rules: 'required',
     formItemClass: 'col-span-2 items-baseline',
@@ -429,10 +441,13 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     component: 'Select',
     fieldName: 'formType',
     label: '表单类型',
-    componentProps: {
-      placeholder: '请选择表单类型',
-      options: getFormTypeOptions(),
-      clearable: true,
+    componentProps: (data: any) => {
+      return {
+        placeholder: '请选择表单类型',
+        options: getFormTypeOptions(),
+        clearable: true,
+        disabled: data.isUpdate,
+      };
     },
     rules: 'required',
     formItemClass: 'col-span-2 items-baseline',
@@ -668,7 +683,7 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
     fieldName: 'endTimeHour',
     label: '时',
     dependencies: {
-      disabled: (values) =>
+      disabled: (values: any) =>
         Array.isArray(values.endoftheperiod) &&
         values.endoftheperiod.length > 0,
       triggerFields: ['endoftheperiod'],

apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-drawer.vue

@@ -28,7 +28,7 @@ const isCopyRef = ref<boolean>(false);
 const attachments = ref<any[]>([]);
 const selectAllSysStationList = ref([]) as any;
 onMounted(async () => {
-  const res = await selectAllSysStation();
+  const res = await selectAllSysStation({});
   selectAllSysStationList.value = res || [];
   if (selectAllSysStationList.value.length > 0) {
     selectAllSysStationList.value.forEach((item: any) => {
@@ -318,6 +318,8 @@ const [Drawer, drawerApi] = useVbenDrawer({
         const formValues = await formApi.getValues();
         taskFrequency.value = formValues.taskFrequency || '';
       } else {
+        // 新增模式，设置isUpdate为false
+        await formApi.setValues({ isUpdate: false });
         const formValues = await formApi.getValues();
         taskFrequency.value = formValues.taskFrequency || '';
       }