YangZhiJie преди 1 година
родител
ревизия
265e9543c5
променени са 5 файла, в които са добавени 25 реда и са изтрити 19 реда
  1. 0 1
      .gitignore
  2. 10 1
      bat/install.bat
  3. 6 8
      package.json
  4. 7 1
      src/router/index.js
  5. 2 8
      webpack.base.js

+ 0 - 1
.gitignore

@@ -13,4 +13,3 @@ yarn-error.log*
 *.njsproj
 *.sln
 /package-lock.json
-/package-lock.json

+ 10 - 1
bat/install.bat

@@ -2,5 +2,14 @@ title install
 set current_path="%~dp0"
 cd %current_path%
 cd ..
-npm install -registry=http://wuzhixin.vip:4873
+
+sudo npm install -g npm --registry=https://registry.npmmirror.com/
+
+npm install --registry=http://wuzhixin.vip:4873
+npm install --registry=https://registry.npmmirror.com/
+yarn install --registry=http://wuzhixin.vip:4873
+yarn install --registry=https://registry.npmmirror.com/
+
+npm cache clean --force
+npm cache ls
 pause

+ 6 - 8
package.json

@@ -1,11 +1,12 @@
 {
   "name": "client-eam-v3",
   "description": "Leanwo Prodog Client",
-  "version": "3.0.79",
+  "version": "3.0.80",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
     "build-lib": "cross-env NODE_ENV=production webpack --progress --config ./webpack.lib.js",
+    "build-es-lib": "cross-env NODE_ENV=production webpack --progress --config ./webpack.es.lib.js",
     "build": "cross-env NODE_ENV=production webpack --mode=production --config ./webpack.prod.js --progress"
   },
   "files": [
@@ -13,7 +14,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "ant-design-vue": "^4.2.1",
+    "ant-design-vue": "^4.2.5",
     "pc-component-v3": "1.0.86",
     "v-tooltip": "^4.0.0-beta.17",
     "vue-select": "^4.0.0-beta.6"
@@ -45,8 +46,8 @@
     "html-webpack-plugin": "^5.5.0",
     "mini-css-extract-plugin": "^2.6.0",
     "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.6",
-    "vue-loader": "^17.0.0",
+    "terser-webpack-plugin": "^5.3.10",
+    "vue-loader": "^17.3.1",
     "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.7.0",
     "webpack-cli": "^4.9.2",
@@ -58,10 +59,7 @@
     "registry": "http://wuzhixin.vip:4873/"
   },
   "repository": {
-    "type": "http",
+    "type": "https",
     "url": "https://a.leanwo.com:3000/prodog-client-2023/client-eam-v3.git"
-  },
-  "dependencies": {
-    "client-eam-v3": "file:"
   }
 }

+ 7 - 1
src/router/index.js

@@ -38,6 +38,7 @@ const RunDataArchive = () => import(/* webpackChunkName: "component-35" */ '../c
 const AssetRfidRecord = () => import('../components/rfidRecord/AssetRfidRecord.vue');
 const BatchUploadImages = () => import('../components/sonicAlbumUpload/index.vue');
 const AssetInstanceFullCalendar = () => import('../customer/AssetInstanceFullCalendar.vue');
+const AddAssets = () => import('../asset-check-create/AddAssets.vue');
 
 const routes = [
 
@@ -308,7 +309,12 @@ const routes = [
   {
     path: '/eam/batchUploadImages', component: BatchUploadImages,
   },
-  { path: '/eam/AssetInstanceFullCalendar', component: AssetInstanceFullCalendar },
+  { 
+    path: '/eam/AssetInstanceFullCalendar', component: AssetInstanceFullCalendar, 
+  },
+  { 
+    path: '/eam/AddAssets', component: AddAssets, 
+  },
 ];
 
 

+ 2 - 8
webpack.base.js

@@ -37,12 +37,6 @@ module.exports = {
         test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files
         type: 'javascript/auto',
         loader: '@intlify/vue-i18n-loader',
-        include: [ // Use `Rule.include` to specify the files of locale messages to be pre-compiled
-          //path.resolve(__dirname, 'src/locales'),
-          path.resolve(__dirname, 'client-base-v3/src/locales'),
-          path.resolve(__dirname, 'client-eam-v3/src/locales'),
-          path.resolve(__dirname, 'client-role-v3/src/locales'),
-        ],
       },
       {
         // webpack5 通过资源模块来处理图片
@@ -54,14 +48,14 @@ module.exports = {
           },
         },
         generator: {
-          filename: './client-base-v3-image/[name][ext][query]',
+          filename: './client-eam-v3-image/[name][ext][query]',
         },
       },
       {
         test: /\.(eot|woff|woff2|ttf)$/,
         type: 'asset/resource',
         generator: {
-          filename: './client-base-v3-font/[name].[ext]?[hash]',
+          filename: './client-eam-v3-font/[name].[ext]?[hash]',
         },
       },
     ],