mod:

apps/web-ele/src/app.vue

@@ -1,9 +1,13 @@
 <script lang="ts" setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+
+// @ts-ignore
+import { useVbenModal } from '@vben/common-ui';
 import { useElementPlusDesignTokens } from '@vben/hooks';
+
 import { ElConfigProvider } from 'element-plus';
+
 import { elementLocale } from '#/locales';
-// @ts-ignore
-import { useVbenModal } from '@vben/common-ui';
 
 defineOptions({ name: 'App' });
 
@@ -13,15 +17,116 @@ const [AIModal, AIModalApi] = useVbenModal({
   title: 'AI Assistant',
   showCancelBtn: false,
 });
-const handleAIModal = () => {
+const handleAIModal = (e: MouseEvent) => {
+  // 如果是拖动操作，不触发点击事件
+  if (shouldPreventClick.value) {
+    shouldPreventClick.value = false;
+    return;
+  }
   AIModalApi.open();
 };
+
+// 拖动相关状态
+const isDragging = 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; // 拖动阈值，超过此值不触发点击
+
+// 初始化位置
+onMounted(() => {
+  // 默认位置：右下角
+  if (aiIconRef.value) {
+    const rect = aiIconRef.value.getBoundingClientRect();
+    position.value = {
+      x: window.innerWidth - rect.width - 30,
+      y: window.innerHeight - rect.height - 30,
+    };
+  }
+});
+
+// 鼠标按下事件
+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;
+  }
+};
+
+// 鼠标移动事件
+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 onMouseUp = () => {
+  isDragging.value = false;
+};
+
+// 添加和移除全局事件监听器
+onMounted(() => {
+  document.addEventListener('mousemove', onMouseMove);
+  document.addEventListener('mouseup', onMouseUp);
+});
+
+onUnmounted(() => {
+  document.removeEventListener('mousemove', onMouseMove);
+  document.removeEventListener('mouseup', onMouseUp);
+});
 </script>
 
 <template>
   <ElConfigProvider :locale="elementLocale">
     <RouterView />
-    <div class="ai-icon" @click="handleAIModal">
+    <div
+      ref="aiIconRef"
+      class="ai-icon"
+      @click="handleAIModal"
+      @mousedown="onMouseDown"
+      :style="{
+        left: `${position.x}px`,
+        top: `${position.y}px`,
+      }"
+    >
       <img src="/AIimgs.gif" alt="AI Assistant" />
     </div>
     <AIModal />
@@ -31,8 +136,6 @@ const handleAIModal = () => {
 <style scoped lang="scss">
 .ai-icon {
   position: fixed;
-  bottom: 30px;
-  right: 30px;
   z-index: 9999;
   width: 100px;
   height: 100px;
@@ -42,6 +145,11 @@ const handleAIModal = () => {
   align-items: center;
   justify-content: center;
   cursor: pointer;
+  user-select: none;
+  /* 拖动时的光标样式 */
+  &:active {
+    cursor: grabbing;
+  }
 }
 
 .ai-icon img {

apps/web-ele/src/views/oilstation/gasgun/gasgun-data.tsx

@@ -125,7 +125,7 @@ export const drawerFormSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    component: 'ApiSelect',
+    component: 'Input',
     fieldName: 'gunName',
     label: '油枪名称',
     componentProps: {

apps/web-ele/src/views/schedule/detail/drawer/tankWater/config-data.tsx

@@ -91,8 +91,9 @@ export const defautTableColumns: VxeGridProps['columns'] = [
           edit: (data: any) => {
             const change = () => {
               const { row } = data;
-              row.heightDifference =
-                row.manualTankOilHeightH2 - row.levelGaugeOilHeightH1;
+              row.heightDifference = (
+                row.manualTankOilHeightH2 - row.levelGaugeOilHeightH1
+              ).toFixed(2);
             };
             return (
               <ElInputNumber
@@ -152,8 +153,9 @@ export const defautTableColumns: VxeGridProps['columns'] = [
           edit: (data: any) => {
             const change = () => {
               const { row } = data;
-              row.heightDifference =
-                row.manualTankOilHeightH2 - row.levelGaugeOilHeightH1;
+              row.heightDifference = (
+                row.manualTankOilHeightH2 - row.levelGaugeOilHeightH1
+              ).toFixed(2);
             };
             return (
               <ElInputNumber

apps/web-ele/src/views/schedule/work/class/component/addandedit.vue

@@ -52,6 +52,8 @@ const executorRef: any = ref(null);
 watch(
   () => executorRef.value?.selectedItems,
   (newSelectedItems) => {
+    // console.log(newSelectedItems, 'newSelectedItems');
+    if (querydata?.Detailsid) return;
     tableData.value = newSelectedItems.map((item: any) => ({
       ...item,
       employeeIdName: item.name || '',
@@ -85,7 +87,7 @@ const queryscheduleClassOpeningApifn = async () => {
         employeeIdName: item.employeeIdName || '',
         positionName: item.positionName || '',
         shiftName: res?.shiftId,
-        //第一次
+        // 第一次
         // firstStartTime: new Date(item.firstWorkRecords?.startTime.split(' ')[1]?.slice(0,5))  || '',
         // firstEndTime: new Date(item.firstWorkRecords?.endTime.split(' ')[1]?.slice(0,5))  || '',
         firstStartTime:
@@ -93,21 +95,21 @@ const queryscheduleClassOpeningApifn = async () => {
         firstEndTime:
           item.firstWorkRecords?.endTime.split(' ')[1]?.slice(0, 5) || '',
         firstWorkContent: item.firstWorkRecords?.workContent,
-        //第二次
+        // 第二次
         secondStartTime:
           item.secondWorkRecords?.startTime.split(' ')[1]?.slice(0, 5) || '',
         secondEndTime:
           item.secondWorkRecords?.endTime.split(' ')[1]?.slice(0, 5) || '',
         secondWorkContent: item.secondWorkRecords?.workContent,
       }));
-      console.log(tableData.value);
+      console.log(tableData.value, 'adfasdf');
       const userIds = res.workRecords.map((item: any) =>
         Number(item.employeeId),
       );
       modelValue.value = userIds;
     }
-  } catch (err) {
-    console.log(err);
+  } catch (error) {
+    console.log(error);
   }
 };
 const queryrclassesApilistfn = async () => {
@@ -119,8 +121,8 @@ const queryrclassesApilistfn = async () => {
         label: item.shiftName,
       }));
     }
-  } catch (err) {
-    console.log(err);
+  } catch (error) {
+    console.log(error);
   }
 };
 const queryGasStationListfn = async () => {
@@ -129,8 +131,8 @@ const queryGasStationListfn = async () => {
     if (res.length > 0) {
       stationName.value = res?.[0]?.stationName || '';
     }
-  } catch (err) {
-    console.log(err);
+  } catch (error) {
+    console.log(error);
   }
 };
 

apps/web-ele/src/views/system/role/config-data.tsx

@@ -156,9 +156,9 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 130,
   },
   {
-    field: 'postIds',
+    field: 'rolePostIdsName',
     title: '岗位',
-    slots: { default: 'postIds' },
+    // slots: { default: 'postIds' },
     minWidth: 130,
   },
   {