修改mes

src/api/produce/index.js

@@ -103,6 +103,12 @@ export async function getWarehouseList() {
     }
     return Promise.reject(new Error(res.data.message));
   }
+  export async function factoryworkstationPage(data) {
+    const res = await request.get(`/main/factoryworkstation/page`, { params: data });
+    if (res.data.code == '0') {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  }
   
-
   // http://localhost:8084/api/main/asset/pdaPage?categoryLevelId=9&keyWord=&pageNum=1&size=100&taskId=1894207928134549506

src/views/outsourcing/components/details.vue

@@ -39,7 +39,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="工序:" prop="status">
+                    <el-form-item label="状态:" prop="status">
                         <el-tag>{{ row.status == 1 ? '已发布' : '未发布' }}</el-tag>
                     </el-form-item>
                 </el-col>

src/views/outsourcing/index.vue

@@ -4,32 +4,17 @@
       <search @search="reload" ref="searchRef"> </search>
 
       <!-- 数据表格 -->
-      <ele-pro-table
-        ref="table"
-        :columns="columns"
-        :datasource="datasource"
-        cache-key="workOrderTable"
-      >
-      <template v-slot:code="{ row }">
-          <el-link
-              type="primary"
-              :underline="false"
-              @click="handleDetails(row)"
-              >{{ row.code }}</el-link
-            >
+      <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="workOrderTable">
+        <template v-slot:code="{ row }">
+          <el-link type="primary" :underline="false" @click="handleDetails(row)">{{ row.code }}</el-link>
         </template>
         <template v-slot:requireDeliveryTime="{ row }">
           <span v-if="row.deliveryMethod == 1">{{
             row.requireDeliveryTime
           }}</span>
 
-          <el-link
-            v-if="row.deliveryMethod == 2"
-            type="primary"
-            :underline="false"
-            @click.native="handleMethod(row)"
-            >分批时间</el-link
-          >
+          <el-link v-if="row.deliveryMethod == 2" type="primary" :underline="false"
+            @click.native="handleMethod(row)">分批时间</el-link>
         </template>
 
         <template v-slot:type="{ row }">
@@ -44,31 +29,26 @@
           <el-tag>{{ row.status == 1 ? '已发布' : '未发布' }}</el-tag>
         </template>
 
+
+        <template v-slot:outsourceScene="{ row }">
+
+          <span>{{ row.outsourceScene | outsourceSceneText }}</span>
+        </template>
+
+
         <template v-slot:technicalDrawings="{ row }">
           <div v-if="row.technicalDrawings && row.technicalDrawings?.length">
-            <el-link
-              v-for="link in row.technicalDrawings"
-              :key="link.id"
-              type="primary"
-              :underline="false"
-              @click="downloadFile(link)"
-            >
-              {{ link.name }}</el-link
-            >
+            <el-link v-for="link in row.technicalDrawings" :key="link.id" type="primary" :underline="false"
+              @click="downloadFile(link)">
+              {{ link.name }}</el-link>
           </div>
         </template>
 
         <template v-slot:files="{ row }">
           <div v-if="row.files && row.files?.length">
-            <el-link
-              v-for="link in row.files"
-              :key="link.id"
-              type="primary"
-              :underline="false"
-              @click="downloadFile(link)"
-            >
-              {{ link.name }}</el-link
-            >
+            <el-link v-for="link in row.files" :key="link.id" type="primary" :underline="false"
+              @click="downloadFile(link)">
+              {{ link.name }}</el-link>
           </div>
         </template>
 
@@ -81,21 +61,11 @@
             详情
           </el-link> -->
 
-          <el-link
-            type="primary"
-            v-if="row.status == 1"
-            :underline="false"
-            @click="handleFlow(row)"
-          >
+          <el-link type="primary" v-if="row.status == 1" :underline="false" @click="handleFlow(row)">
             流程
           </el-link>
 
-          <el-link
-            type="primary"
-            v-if="row.status != 1"
-            :underline="false"
-            @click="handleRelease(row)"
-          >
+          <el-link type="primary" v-if="row.status != 1" :underline="false" @click="handleRelease(row)">
             发布
           </el-link>
         </template>
@@ -111,209 +81,230 @@
 </template>
 
 <script>
-  import { getList } from '@/api/outsourcing/index.js';
-  import flow from './components/flow.vue';
-  import search from './components/search.vue';
-  import release from './components/release.vue';
-  import Detail from './components/details.vue';
-  import timeDialog from './components/timeDialog.vue';
-  import { getFile } from '@/api/system/file';
-  export default {
-    components: {
-      search,
-      flow,
-      release,
-      Detail,
-      timeDialog
+import { getList } from '@/api/outsourcing/index.js';
+import flow from './components/flow.vue';
+import search from './components/search.vue';
+import release from './components/release.vue';
+import Detail from './components/details.vue';
+import timeDialog from './components/timeDialog.vue';
+import { getFile } from '@/api/system/file';
+export default {
+  components: {
+    search,
+    flow,
+    release,
+    Detail,
+    timeDialog
+  },
+  data() {
+    return {
+      loading: false
+    };
+  },
+  filters: {
+    outsourceSceneText(text) {
+      switch (text) {
+        case 1:
+          return '首工序委外'
+        case 2:
+          return '单工序'
+        case 3:
+          return '多工序'
+        case 4:
+          return '首工序及多工序'
+        default : 
+          return ''
+      }
+    }
+  },
+  computed: {
+    // 表格列配置
+    columns() {
+      return [
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+
+        {
+          prop: 'batchNo',
+          label: '批次号',
+          align: 'center',
+          minWidth: 100
+        },
+        {
+          slot: 'code',
+          prop: 'code',
+          label: '委外单编码',
+          align: 'center'
+        },
+        {
+          prop: 'name',
+          label: '委外单名称',
+          align: 'center'
+        },
+
+        {
+
+          prop: 'workOrderCode',
+          label: '工单编码',
+          align: 'center'
+        },
+
+        {
+          prop: 'taskName',
+          label: '工序',
+          align: 'center'
+        },
+
+        {
+          prop: 'totalCount',
+          label: '委外数量',
+          align: 'center'
+        },
+
+        {
+          prop: 'totalWeight',
+          label: '委外重量',
+          align: 'center'
+        },
+
+        {
+          slot: 'type',
+          label: '委外类型',
+          align: 'center'
+        },
+        {
+          prop: 'outsourceScene',
+          slot: 'outsourceScene',
+          label: '委外场景',
+          align: 'center'
+        },
+        {
+          prop: 'remark',
+          label: '备注',
+          align: 'center'
+        },
+
+        {
+          slot: 'requireDeliveryTime',
+          label: '预计到货日期',
+          align: 'center',
+          width: 100
+        },
+
+        {
+          prop: 'produceRoutingName',
+          label: '工艺路线',
+          align: 'center'
+        },
+
+        {
+          prop: 'warehouseName',
+          label: '仓库',
+          align: 'center'
+        },
+
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          width: 100
+        },
+
+        {
+          slot: 'status',
+          label: '状态',
+          align: 'center'
+        },
+
+        {
+          label: '图片附件',
+          slot: 'technicalDrawings',
+          action: 'technicalDrawings',
+          minWidth: 100
+        },
+
+        {
+          label: '附件',
+          slot: 'files',
+          action: 'files',
+          minWidth: 100
+        },
+
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 140,
+          align: 'center',
+          resizable: false,
+          fixed: 'right',
+          slot: 'action',
+          showOverflowTooltip: true
+        }
+      ];
     },
-    data() {
-      return {
-        loading: false
-      };
+
+    clientEnvironmentId() {
+      return this.$store.state.user.info.clientEnvironmentId;
+    }
+  },
+  created() { },
+
+  methods: {
+    statusFormatter(status) {
+      const obj = this.statusOpt.find((i) => i.value == status);
+      return obj && obj.label;
     },
-    computed: {
-      // 表格列配置
-      columns() {
-        return [
-          {
-            columnKey: 'index',
-            label: '序号',
-            type: 'index',
-            width: 55,
-            align: 'center',
-            showOverflowTooltip: true,
-            fixed: 'left'
-          },
-
-          {
-            prop: 'batchNo',
-            label: '批次号',
-            align: 'center',
-            minWidth: 100
-          },
-          {
-            slot: 'code',
-            prop: 'code',
-            label: '委外单编码',
-            align: 'center'
-          },
-          {
-            prop: 'name',
-            label: '委外单名称',
-            align: 'center'
-          },
-
-          {
-           
-            prop: 'workOrderCode',
-            label: '工单编码',
-            align: 'center'
-          },
-
-          {
-            prop: 'taskName',
-            label: '工序',
-            align: 'center'
-          },
-
-          {
-            prop: 'totalCount',
-            label: '委外数量',
-            align: 'center'
-          },
-
-          {
-            prop: 'totalWeight',
-            label: '委外重量',
-            align: 'center'
-          },
-
-          {
-            slot: 'type',
-            label: '委外类型',
-            align: 'center'
-          },
-
-          {
-            prop: 'remark',
-            label: '备注',
-            align: 'center'
-          },
-
-          {
-            slot: 'requireDeliveryTime',
-            label: '预计到货日期',
-            align: 'center',
-            width: 100
-          },
-
-          {
-            prop: 'produceRoutingName',
-            label: '工艺路线',
-            align: 'center'
-          },
-
-          {
-            prop: 'warehouseName',
-            label: '仓库',
-            align: 'center'
-          },
-
-          {
-            prop: 'createTime',
-            label: '创建时间',
-            align: 'center',
-            width: 100
-          },
-
-          {
-            slot: 'status',
-            label: '状态',
-            align: 'center'
-          },
-
-          {
-            label: '图片附件',
-            slot: 'technicalDrawings',
-            action: 'technicalDrawings',
-            minWidth: 100
-          },
-
-          {
-            label: '附件',
-            slot: 'files',
-            action: 'files',
-            minWidth: 100
-          },
-
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 140,
-            align: 'center',
-            resizable: false,
-            fixed: 'right',
-            slot: 'action',
-            showOverflowTooltip: true
-          }
-        ];
-      },
-
-      clientEnvironmentId() {
-        return this.$store.state.user.info.clientEnvironmentId;
-      }
+    /* 表格数据源 */
+    datasource({ page, limit, where }) {
+      return getList({
+        pageNum: page,
+        size: limit,
+        ...where
+      });
     },
-    created() {},
-
-    methods: {
-      statusFormatter(status) {
-        const obj = this.statusOpt.find((i) => i.value == status);
-        return obj && obj.label;
-      },
-      /* 表格数据源 */
-      datasource({ page, limit, where }) {
-        return getList({
-          pageNum: page,
-          size: limit,
-          ...where
-        });
-      },
-
-      downloadFile(file) {
-        getFile({ objectName: file.storePath }, file.name);
-      },
-
-      handleFlow(row) {
-        if(!row.processInstanceId) {
-           return this.$message.warning('暂无流程图')
-        }
-        this.$refs.flowRef.open(row.processInstanceId);
-      },
-
-      handleDetails(row) {
-        this.$refs.detailsRef.open(row);
-      },
-
-      handleMethod(row) {
-        this.$refs.timeDialogRef.open(row, 'details');
-      },
-
-      handleRelease(row) {
-        this.$refs.releaseRef.open(row);
-      },
-
-      /* 刷新表格 */
-      reload(where) {
-        this.$nextTick(() => {
-          this.$refs.table.reload({ page: 1, where });
-        });
-      },
-
-      releaseRefresh() {
-        this.$refs.table.reload();
+
+    downloadFile(file) {
+      getFile({ objectName: file.storePath }, file.name);
+    },
+
+    handleFlow(row) {
+      if (!row.processInstanceId) {
+        return this.$message.warning('暂无流程图')
       }
+      this.$refs.flowRef.open(row.processInstanceId);
+    },
+
+    handleDetails(row) {
+      this.$refs.detailsRef.open(row);
+    },
+
+    handleMethod(row) {
+      this.$refs.timeDialogRef.open(row, 'details');
+    },
+
+    handleRelease(row) {
+      this.$refs.releaseRef.open(row);
+    },
+
+    /* 刷新表格 */
+    reload(where) {
+      this.$nextTick(() => {
+        this.$refs.table.reload({ page: 1, where });
+      });
+    },
+
+    releaseRefresh() {
+      this.$refs.table.reload();
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss" scoped></style>

src/views/produce/index.vue

@@ -21,9 +21,12 @@
               v-bind="$attrs"
               :default-expand-all="defaultExpandAll" -->
           </el-tab-pane>
-          <el-tab-pane label="设备" name="second">
-            <AssetTree @handleNodeClick="handleNodeClickNew" @setRootId="setRootId" id="0" :paramsType="'type'"
-              ref="treeList" eqDevice="sb" />
+          <el-tab-pane label="工位" name="second">
+            <!-- <AssetTree @handleNodeClick="handleNodeClickNew" @setRootId="setRootId" id="0" :paramsType="'type'"
+              ref="treeList" eqDevice="sb" /> -->
+              <el-tree :data="factoryworkstationList" :props="defaultPropsTow" node-key="id" :highlight-current="true"
+              @node-click="handleNodeClick">
+            </el-tree>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -128,7 +131,7 @@ import jobBooking from './components/jobBooking/index.vue';
 import warehousing from './components/warehousing/index.vue';
 import outsourceList from './components/outsourcing/outsourceList.vue';
 
-import { getByTaskId, pcCheckOutsource, getTaskInstanceById, checkOutsourceMaterial, listTask } from '@/api/produce/index';
+import { getByTaskId, pcCheckOutsource, getTaskInstanceById, checkOutsourceMaterial, listTask,factoryworkstationPage } from '@/api/produce/index';
 
 export default {
   components: {
@@ -153,6 +156,8 @@ export default {
       loading: false,
       operationType: null,
       workListIds: [],
+      factoryworkstationList: [],
+
       produceTaskList: [],
       isType: '',
       isStep: true,
@@ -163,6 +168,11 @@ export default {
       defaultProps: {
         children: 'children',
         label: 'newName'
+      },
+      defaultPropsTow:{
+        children: 'children',
+        label: 'name',
+        value:'code'
       }
     };
   },
@@ -178,6 +188,7 @@ export default {
     this.init()
 
     this.getTaskList();
+    this.getFactoryworkstationPageList();
 
     this.operationType = null;
     this.workListIds = [];
@@ -215,17 +226,26 @@ export default {
     // 获取工序列表
     getTaskList() {
       listTask().then((res) => {
-
-        console.log(res, 'res');
         res.map(v=>{
           v.newName = `${v.workCenterName}-${v.name}`
         })
         this.produceTaskList = res;
+        // newName
+      });
+    },
+
+    // 获取工位
+    getFactoryworkstationPageList() {
+
+      factoryworkstationPage({pageNum:1,size:99999999}).then((res) => {
+        console.log(res, 'res');
+        this.factoryworkstationList = res.list;
 
 
         // newName
       });
     },
+    
 
 
     closeForm() {
@@ -415,6 +435,7 @@ export default {
   padding: 5px;
   height: calc(100vh - 73px);
   background-color: #fff;
+  overflow-y: auto;
 }
 
 .footBtn {

src/views/workOrderList/components/details/index.vue

@@ -1,51 +1,27 @@
 <template>
   <div>
-    <el-drawer
-      title=""
-      :visible.sync="drawer"
-      :custom-class="isFullscreen ? 'not-fullscreen' : 'is-fullscreen'"
-      :before-close="handleClose"
-      :with-header="false"
-    >
+    <el-drawer title="" :visible.sync="drawer" :custom-class="isFullscreen ? 'not-fullscreen' : 'is-fullscreen'"
+      :before-close="handleClose" :with-header="false">
       <!-- 自定义头部 -->
       <div class="custom-drawer-header">
         <div> </div>
         <div class="rx-ec">
-          <el-button
-            icon="el-icon-full-screen"
-            type="text"
-            @click="handleFull"
-            >{{ isFullscreen ? '全屏' : '缩小' }}</el-button
-          >
-          <el-button
-            icon="el-icon-circle-close"
-            type="text"
-            @click="handleClose"
-            >关闭</el-button
-          >
+          <el-button icon="el-icon-full-screen" type="text" @click="handleFull">{{ isFullscreen ? '全屏' : '缩小'
+            }}</el-button>
+          <el-button icon="el-icon-circle-close" type="text" @click="handleClose">关闭</el-button>
         </div>
       </div>
 
       <div class="drawer_content">
         <!-- //详细信息 -->
         <!-- <Info :workOrderInfo="workOrderInfo"></Info> -->
-        <btnlist ></btnlist>
-
-  
-        <el-steps
-          :active="activeIndex"
-          space="20px"
-          align-center
-          style="margin-top: 18px"
-        >
-          <el-step
-            v-for="(item, index) in routeList"
-            :key="index"
-            :title="item.taskTypeName"
-            @click.native="handIdx(index, item)"
-            :description="desIndex == index ? '此处' : ''"
-            :class="desIndex == index?'active':''"
-          ></el-step>
+        <btnlist></btnlist>
+
+
+        <el-steps :active="activeIndex" space="20px" align-center style="margin-top: 18px">
+          <el-step v-for="(item, index) in routeList" :key="index" :title="item.taskTypeName"
+            @click.native="handIdx(index, item)" :description="desIndex == index ? '此处' : ''"
+            :class="desIndex == index ? 'active' : ''"></el-step>
         </el-steps>
 
         <el-tabs type="border-card">
@@ -57,167 +33,167 @@
           </el-tab-pane>
 
           <el-tab-pane label="投料详情">
-            <feedDetails
-              :routeObj="routeObj"
-              :curTaskObj="curTaskObj"
-            ></feedDetails
-          ></el-tab-pane>
+            <feedDetails :routeObj="routeObj" :curTaskObj="curTaskObj"></feedDetails>
+          </el-tab-pane>
 
           <el-tab-pane label="报工详情">
-            <jobDetails
-              :routeObj="routeObj"
-              :curTaskObj="curTaskObj"
-              :newId = "newId"
-            ></jobDetails>
+            <jobDetails :routeObj="routeObj" :curTaskObj="curTaskObj" :newId="newId"></jobDetails>
           </el-tab-pane>
-
-          
-          
         </el-tabs>
       </div>
     </el-drawer>
+
+    
   </div>
 </template>
 
 <script>
-  import Info from './info.vue';
-
-  import feedDetails from '@/views/produce/components/feeding/details.vue';
-  import jobDetails from '@/views/produce/components/jobBooking/details.vue';
-  import basicDetails from '../basicDetails.vue';
-  import productionDetails from '../productionDetails.vue';
-
-  
-  import btnlist from '../btnlist.vue';
-  import { getTaskInstanceList } from '@/api/produce/job';
-
-  export default {
-    components: {
-      Info,
-      feedDetails,
-      jobDetails,
-      basicDetails,
-      btnlist,
-      productionDetails
+import Info from './info.vue';
+
+import feedDetails from '@/views/produce/components/feeding/details.vue';
+import jobDetails from '@/views/produce/components/jobBooking/details.vue';
+import basicDetails from '../basicDetails.vue';
+import productionDetails from '../productionDetails.vue';
+
+
+import btnlist from '../btnlist.vue';
+import { getTaskInstanceList } from '@/api/produce/job';
+
+export default {
+  components: {
+    Info,
+    feedDetails,
+    jobDetails,
+    basicDetails,
+    btnlist,
+    productionDetails
+  },
+  data() {
+    return {
+      drawer: false,
+      isFullscreen: true,
+
+      workOrderInfo: {},
+
+      routeList: [],
+      activeIndex: 0,
+      desIndex: 0,
+      curTaskObj: null,
+      newId: '',
+      routeObj: {
+        id: null
+      }
+    };
+  },
+
+  methods: {
+    operate() {
+      console.log(2)
     },
-    data() {
-      return {
-        drawer: false,
-        isFullscreen: true,
-
-        workOrderInfo: {},
-
-        routeList: [],
-        activeIndex: 0,
-        desIndex: 0,
-        curTaskObj: null,
-        newId:'',
-        routeObj: {
-          id: null
-        }
-      };
+
+    refresh() {
+      console.log(1)
+      this.getInfo()
     },
 
-    methods: {
-      operate(){
-        console.log(2)
-      },
-
-      refresh() {
-				console.log(1)
-				this.getInfo()
-			},
-
-      handleClose() {
-        this.activeIndex = 0;
-        this.drawer = false;
-      },
-
-      handleFull() {
-        this.isFullscreen = !this.isFullscreen;
-        this.$forceUpdate();
-      },
-
-      open(row) {
-        
-        this.workOrderInfo = row;
-        this.routeObj.id = this.workOrderInfo.id;
-        this.getTaskFn();
-        this.drawer = true;
-      },
-
-      getTaskFn() {
-        getTaskInstanceList(this.workOrderInfo.id).then((res) => {
-          this.routeList = res;
-
-          // 使用findIndex方法查找
-          const index = this.routeList.findIndex(
-            (item) => Number(item.taskId) == Number(this.workOrderInfo.taskId)
-          );
-
-          
-          this.desIndex = index;
-          console.log(this.routeList,'888888');
-          this.newId = this.routeList[this.desIndex].taskId||'';
-
-          if (this.workOrderInfo.taskId != -2) {
-            this.curTaskObj = JSON.parse(JSON.stringify(this.routeObj));
-          } else {
-            this.curTaskObj = JSON.parse(JSON.stringify(this.routeList[0]));
-            this.desIndex = 0;
-          }
-          this.activeIndex = index;
-        });
-      },
-
-      handIdx(index, item) {
-        this.curTaskObj = JSON.parse(JSON.stringify(item));
-
-        if (item.taskId == -2) {
-          this.$message.info('完结状态不能点击');
+    handleClose() {
+      this.activeIndex = 0;
+      this.drawer = false;
+    },
+
+    handleFull() {
+      this.isFullscreen = !this.isFullscreen;
+      this.$forceUpdate();
+    },
+
+    open(row) {
+
+      this.workOrderInfo = row;
+      this.routeObj.id = this.workOrderInfo.id;
+      this.getTaskFn();
+      this.drawer = true;
+    },
+
+    getTaskFn() {
+      getTaskInstanceList(this.workOrderInfo.id).then((res) => {
+        this.routeList = res;
+
+        // 使用findIndex方法查找
+        const index = this.routeList.findIndex(
+          (item) => Number(item.taskId) == Number(this.workOrderInfo.taskId)
+        );
+
+
+        this.desIndex = index;
+        console.log(this.routeList, '888888');
+        this.newId = this.routeList[this.desIndex].taskId || '';
+
+        if (this.workOrderInfo.taskId != -2) {
+          this.curTaskObj = JSON.parse(JSON.stringify(this.routeObj));
         } else {
-          this.desIndex = index;
-          this.newId = this.routeList[this.desIndex].taskId||'';
+          this.curTaskObj = JSON.parse(JSON.stringify(this.routeList[0]));
+          this.desIndex = 0;
         }
+        this.activeIndex = index;
+      });
+    },
+
+    handIdx(index, item) {
+      this.curTaskObj = JSON.parse(JSON.stringify(item));
+
+      if (item.taskId == -2) {
+        this.$message.info('完结状态不能点击');
+      } else {
+        this.desIndex = index;
+        this.newId = this.routeList[this.desIndex].taskId || '';
       }
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss" scoped>
-  /* 自定义全屏样式 */
-  ::v-deep .is-fullscreen {
-    width: 100vw !important;
-    height: 100vh !important;
-    overflow: hidden !important; /* 隐藏滚动条 */
-  }
-  ::v-deep .not-fullscreen {
-    width: calc(100vw - 260px) !important;
-    height: 100vh !important;
-    overflow: hidden !important; /* 隐藏滚动条 */
-  }
-
-  .custom-drawer-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 4px 15px;
-    background-color: #f5f7fa; /* 自定义背景色 */
-    border-bottom: 1px solid #ebeef5; /* 自定义边框，与抽屉内容分隔 */
-  }
-
-  .drawer_content {
-    margin: 10px 20px;
-    box-sizing: border-box;
-  }
-
-  .drawer_content {
-    margin: 10px 20px;
-    box-sizing: border-box;
-  }
-  ::v-deep .active .is-text {
-    background: #FFA929; /* 背景色 */
-    border-color: #FFA929;
-    color: #ffffff; /* 图标文字颜色 */
-  }
+/* 自定义全屏样式 */
+::v-deep .is-fullscreen {
+  width: 100vw !important;
+  height: 100vh !important;
+  overflow: hidden !important;
+  /* 隐藏滚动条 */
+}
+
+::v-deep .not-fullscreen {
+  width: calc(100vw - 260px) !important;
+  height: 100vh !important;
+  overflow: hidden !important;
+  /* 隐藏滚动条 */
+}
+
+.custom-drawer-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 4px 15px;
+  background-color: #f5f7fa;
+  /* 自定义背景色 */
+  border-bottom: 1px solid #ebeef5;
+  /* 自定义边框，与抽屉内容分隔 */
+}
+
+.drawer_content {
+  margin: 10px 20px;
+  box-sizing: border-box;
+}
+
+.drawer_content {
+  margin: 10px 20px;
+  box-sizing: border-box;
+}
+
+::v-deep .active .is-text {
+  background: #FFA929;
+  /* 背景色 */
+  border-color: #FFA929;
+  color: #ffffff;
+  /* 图标文字颜色 */
+}
 </style>

vue.config.js

@@ -35,8 +35,6 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',
-
-        
         target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {