Merge branch 'dev' into build

package.json

@@ -33,9 +33,6 @@
     "vue-ruler-tool": "^1.2.4",
     "vuedraggable": "^2.24.3"
   },
-  "publishConfig": {
-    "registry": "http://192.168.1.87:4873/"
-  },
   "devDependencies": {
     "@babel/plugin-proposal-logical-assignment-operators": "^7.10.4",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",

vue.config.js

@@ -57,7 +57,7 @@ module.exports = {
     proxy: {
       //设置代理,可解决跨5
       '/lan': {
-        target: 'http://192.168.1.87:9000',
+        target: 'http://dvcp.sinocare.net',
         changeOrigin: true,
         pathRewrite: {
           //地址重写
@@ -97,7 +97,7 @@ module.exports = {
         }
       },
       '/lns': {
-        target: 'http://localhost:12525',
+        target: 'http://dvcp.sinocare.net',
         changeOrigin: true,
         pathRewrite: {
           //地址重写