Browse Source

Merge branch 'dev'

zhangyu 5 years ago
parent
commit
aa31c5852d
3 changed files with 6 additions and 8 deletions
  1. 2 5
      package.json
  2. 3 2
      publish.js
  3. 1 1
      src/views/model/report/index.vue

+ 2 - 5
package.json

@@ -19,9 +19,6 @@
     "publish": "node publish.js"
   },
   "dependencies": {
-    "@sybotan-web/base": "2.1.5",
-    "@sybotan-web/draw": "2.1.56",
-    "@sybotan-web/graphy": "2.1.27",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "element-ui": "^2.11.0",
@@ -34,9 +31,9 @@
     "vuex": "^3.1.0",
     "cad-engine": "2.0.250",
     "@saga-web/base": "2.1.9",
-    "@saga-web/draw": "2.1.71",
+    "@saga-web/draw": "2.1.72",
     "@saga-web/graphy": "2.1.34",
-    "@saga-web/cad-engine": "2.0.522"
+    "@saga-web/cad-engine": "2.0.523"
   },
   "devDependencies": {
     "ajv": "^6.9.1",

+ 3 - 2
publish.js

@@ -2,15 +2,16 @@
  * @Author: zhangyu
  * @Date: 2019-12-18 16:18:30
  * @Info: 自动化部署
- * @LastEditTime: 2019-12-18 16:20:55
+ * @LastEditTime : 2020-01-18 10:47:19
  */
 
 const Client = require("node-ssh");
-const ssh = new Client();
+const ssh = new Client(); 
 
 ssh.connect({
   host: process.env.npm_package_remote_host,
   port: "22",
+  privateKey: `${process.env.HOME}\\.ssh\\id_rsa_2048`,
   username: process.env.npm_package_remote_user,
   password: process.env.npm_package_remote_password
 }).then(() => {

+ 1 - 1
src/views/model/report/index.vue

@@ -188,7 +188,7 @@ export default {
   mounted() { },
   created() {
     this.params = {
-      ProjectId: this.projectId
+      Orders: "Name asc"
     }
     this.getModelFileCount();
     this.getModelFloorCount();