Sfoglia il codice sorgente

物料流转创建任务。

jiaxiaoqiang 9 mesi fa
parent
commit
77ed31061f

+ 3 - 3
.env.development

@@ -8,12 +8,12 @@ VITE_APP_PORT = 3005
 VITE_APP_BASE_API = '/dev-api'
 
 # 上传文件接口地址
-VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
+VITE_APP_UPLOAD_URL = 'http://10.88.11.201:9000'
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://10.88.19.222:8079'
+VITE_APP_API_URL = 'http://10.88.20.188:8079'
 # Websocket地址
-VITE_WEBSOCKET_URL = 'ws://10.88.19.222:8079'
+VITE_WEBSOCKET_URL = 'ws://10.88.20.188:8079'
 ``
 # 是否启用 Mock 服务
 VITE_MOCK_DEV_SERVER = false

+ 2 - 2
.env.production

@@ -5,10 +5,10 @@ NODE_ENV='production'
 VITE_APP_BASE_API = '/client-server'
 
 # 上传文件接口地址
-VITE_APP_UPLOAD_URL = 'http://10.88.19.201:9000'
+VITE_APP_UPLOAD_URL = ''
 
 # 开发接口地址
-VITE_APP_API_URL = 'http://10.88.19.200:8079'
+VITE_APP_API_URL = ''
 
 
 # Websocket地址

+ 1 - 0
.gitignore

@@ -5,6 +5,7 @@ docker/dist
 dist-ssr
 *.local
 .history
+dist
 
 # Editor directories and files
 .idea

+ 2 - 5
src/views/login/index.vue

@@ -388,13 +388,10 @@ onMounted?.(() => {
 </script>
 
 <style lang="scss" scoped>
-html.dark .login-container {
-  background: url("@/assets/images/login-bg.png") no-repeat center right;
-}
-
 .login-container {
   overflow-y: auto;
-  background: url("@/assets/images/login-bg.png") no-repeat center right;
+  background: url("@/assets/images/login-bg.png");
+  background-position: center;
   background-size: cover;
   position: relative;
 

+ 5 - 9
src/views/material-flow/creatTask.vue

@@ -193,7 +193,7 @@ onMounted(() => {
         boxDetail.value = res.data;
       }
     );
-  },1500);
+  }, 1500);
 });
 
 onBeforeUnmount(() => {
@@ -204,12 +204,12 @@ const createTask = () => {
   const params = {
     circulationDetail: [...materialList.value],
     // coordinate: "",
-    houseNo: "",
+    houseNo: "1",
     // locationNo: "",
-    stationId: 0,
+    stationId: "",
     targetType: "",
-    vehicleCode: "",
-    vehicleId: 0,
+    vehicleCode: boxDetail.value.rfid,
+    // vehicleId: 0,
     vehicleName: "",
   };
   params.targetType = currentDestination.value.targetType;
@@ -221,10 +221,6 @@ const createTask = () => {
     params.stationId = currentDestination.value.id;
   }
 
-  params.vehicleId = boxDetail.value.id;
-  params.vehicleCode = boxDetail.value.code;
-  params.vehicleName = boxDetail.value.name;
-
   addMaterialFlow(params).then((res) => {
     ElMessage.success("创建成功");
 

+ 5 - 4
src/views/pro-operation/call-materiel/components/materiel-box-detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      id="custom-dialog"
+      id="custom-dialog-wuliao"
       v-model="visible"
       :close-on-click-modal="false"
       :title="null"
@@ -90,12 +90,12 @@ defineExpose({
   border-radius: 16px;
 }
 
-#custom-dialog {
+#custom-dialog-wuliao {
   background: #f1f3f5;
   box-shadow: 0px 0px 80px 10px rgba(0, 0, 0, 0.25);
   border-radius: 16px 16px 16px 16px;
   width: 924px;
-  max-height: 80vh;
+  height: 600px;
 
   .top-title {
     width: 100%;
@@ -116,7 +116,7 @@ defineExpose({
   .center-content {
     margin-top: 24px;
     width: 100%;
-    height: 500px;
+    height: 300px;
 
     font-size: 24px;
     overflow-y: auto;
@@ -159,6 +159,7 @@ defineExpose({
   padding-left: 30px;
   padding-right: 20px;
   height: 80px;
+  margin-top: 15px;
 }
 
 .item-header {

+ 5 - 6
vite.config.ts

@@ -1,6 +1,6 @@
 import vue from "@vitejs/plugin-vue";
 import vueJsx from "@vitejs/plugin-vue-jsx";
-import { UserConfig, ConfigEnv, loadEnv, defineConfig } from "vite";
+import { ConfigEnv, defineConfig, loadEnv, UserConfig } from "vite";
 
 import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
@@ -14,13 +14,12 @@ import mockDevServerPlugin from "vite-plugin-mock-dev-server";
 import UnoCSS from "unocss/vite";
 import { resolve } from "path";
 import {
-  name,
-  version,
-  engines,
   dependencies,
   devDependencies,
+  engines,
+  name,
+  version,
 } from "./package.json";
-import { directiveHooks } from "@vueuse/core";
 
 /** 平台的名称、版本、运行所需的`node`版本、依赖、构建时间的类型提示 */
 const __APP_INFO__ = {
@@ -199,7 +198,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
     },
     // 构建配置
     build: {
-      chunkSizeWarningLimit: 2000, // 消除打包大小超过500kb警告
+      chunkSizeWarningLimit: 4000, // 消除打包大小超过500kb警告
       minify: "terser", // Vite 2.6.x 以上需要配置 minify: "terser", terserOptions 才能生效
       terserOptions: {
         compress: {