Explorar el Código

1.0.53 移除 client-dictionary-v3

liuyanpeng hace 2 años
padre
commit
96f2694ffb
Se han modificado 5 ficheros con 9 adiciones y 32 borrados
  1. 2 3
      package.json
  2. 1 1
      src/main.js
  3. 2 2
      src/routes/index.js
  4. 4 1
      src/routes/route-base-v4.js
  5. 0 25
      src/routes/route-dictionary-v3.js

+ 2 - 3
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.51",
+  "version": "1.0.53",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -18,9 +18,8 @@
     "ant-design-vue": "^3.2.15",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "3.0.60",
+    "client-base-v4": "3.0.61",
     "client-dic-v3": "^3.0.9",
-    "client-dictionary-v3": "^3.0.4",
     "client-eam-v3": "^3.0.35",
     "client-role-v3": "^3.0.8",
     "client-wms-v3": "^3.0.4",

+ 1 - 1
src/main.js

@@ -30,7 +30,7 @@ import 'client-base-v4/dist/client-base-v4.css';
 
 
 import 'client-role-v3/dist/client-role-v3.css';
-import 'client-dictionary-v3/dist/client-dictionary-v3.css';
+// import 'client-dictionary-v3/dist/client-dictionary-v3.css';
 import 'client-dic-v3/dist/client-dic-v3.css';
 
 import 'client-eam-v3/dist/client-eam-v3.css';

+ 2 - 2
src/routes/index.js

@@ -2,7 +2,7 @@ import { createRouter, createWebHashHistory } from 'vue-router';
 
 import routes0 from './route-base-v4.js';
 import routes1 from './route-role-v3.js';
-import routes2 from './route-dictionary-v3.js';
+// import routes2 from './route-dictionary-v3.js';
 import routes3 from './route-dic-v3.js';
 import routes5 from './route-eam-v3.js';
 import routes6 from './route-wms-v3.js';
@@ -11,7 +11,7 @@ import routes7 from './route-trace-v3.js';
 import merge from '../merge.js';
 
 let routes = merge.mergeArray(routes0, routes1);
-routes = merge.mergeArray(routes, routes2);
+// routes = merge.mergeArray(routes, routes2);
 routes = merge.mergeArray(routes, routes3);
 routes = merge.mergeArray(routes, routes5);
 routes = merge.mergeArray(routes, routes6);

+ 4 - 1
src/routes/route-base-v4.js

@@ -52,7 +52,8 @@ import {
     DateExcelReport,
     DelegationReport,
     PrintTemp,
-    PrintCard
+    PrintCard,
+    DataArchive,
 } from 'client-base-v4/dist/client-base-v4.js';
 
 
@@ -238,6 +239,8 @@ const router = [
             { path: '/desktop/PrintCard', component: PrintCard },
             // 归档
             { path: 'archive', component: Archive },
+            // 归档
+            { path: '/desktop/dataArchive', component: DataArchive },
 
             //用户搜索
             { path: 'userSearch', component: UserSearch },

+ 0 - 25
src/routes/route-dictionary-v3.js

@@ -1,25 +0,0 @@
-
-import {
-    Login as dictionaryLogin,
-    SystemManagement,
-    ClientInit,
-    InitDataSource,
-    DataSourceEdit,
-    SystemSettings
-} from 'client-dictionary-v3';
-
-const routes = [
-    // 系统管理
-    {
-        path: '/dictionary', component: SystemManagement,
-        children: [
-            { path: 'login', component: dictionaryLogin },
-            { path: 'ClientInit', component: ClientInit },
-            { path: 'InitDataSource', component: InitDataSource },
-            { path: 'DataSourceEdit', component: DataSourceEdit },
-            { path: 'SystemSettings', component: SystemSettings },
-        ],
-    },
-];
-
-export default routes;