luobang 6 месяцев назад
Родитель
Сommit
85d2efcbbb
2 измененных файлов с 17 добавлено и 14 удалено
  1. 13 13
      cors.js
  2. 4 1
      package.json

+ 13 - 13
cors.js

@@ -114,22 +114,22 @@ module.exports = {
         '^/icore.icp.web/pass/mqtt/v1': '/'
       }
     },
-    '/icore.icp.web/pass/baseManagement/v1': {
-      target: 'http://localhost:9002/v1', // 正式
-      // target: 'http://192.168.3.165:9002/v1', // 加https
-      // target: 'https://jclims.steerinfo.com/v1',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/baseManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替
-        // 比如我要调用'https://0.0:300/user/add',直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
     // '/icore.icp.web/pass/baseManagement/v1': {
-    //   target: 'http://172.16.4.162', // 正式
+    //   target: 'http://localhost:9002/v1', // 正式
     //   // target: 'http://192.168.3.165:9002/v1', // 加https
     //   // target: 'https://jclims.steerinfo.com/v1',
-    //   changeOrigin: true
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/baseManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址,组件中我们调接口时直接用/api代替
+    //     // 比如我要调用'https://0.0:300/user/add',直接写‘/api/user/add’即可 代理后地址栏显示/
+    //   }
     // },
+    '/icore.icp.web/pass/baseManagement/v1': {
+      target: 'http://172.16.4.162', // 正式
+      // target: 'http://192.168.3.165:9002/v1', // 加https
+      // target: 'https://jclims.steerinfo.com/v1',
+      changeOrigin: true
+    },
     '/icore.icp.web/pass/systemBase/v1': {
       // target: 'http://168.168.45.55:9002/v1',
       // target: 'http://192.168.3.38:9004/v1',
@@ -206,6 +206,6 @@ module.exports = {
   // devModules: ['index', 'reportForm','workFlow', 'systemConfig', 'demo', 'taskManagement', 'batchManagement', 'programManagement', 'entrustedManagement', 'screeningTests','sampleManagement', 'sampleManager', 'samplePreparationTask','approveManagement','weightingManagement','testAnalysis','decideManagement','commodityInspection', 'exceptionManagement', 'certificateManagement', 'standardManagement', 'resourceManager']
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
 //  devModules: ['all']
- devModules:['index', 'standardManagement']
+ devModules:['all']
 //  devModules:['all']
 }

+ 4 - 1
package.json

@@ -12,14 +12,17 @@
     "test": "npm run unit && npm run e2e",
     "lint": "eslint --ext .js,.vue src node_modules/icore-icp/test/unit node_modules/icore-icp/test/e2e/specs",
     "build": "node node_modules/icore-icp/build/build.js",
-    "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"  },
+    "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"
+  },
   "dependencies": {
+    "@tinymce/tinymce-vue": "^3.2.8",
     "codemirror": "5.65.5",
     "docx-preview": "^0.1.11",
     "echarts": "^5.3.2",
     "icore-icp": "1.0.0-bh.21.1",
     "icore-sdk": "1.0.1-alpha.66",
     "jsbarcode": "^3.11.3",
+    "mammoth": "^1.6.0",
     "marked": "^5.0.5",
     "moment-immutable-methods": "^1.0.9",
     "save": "^2.4.0",