shaun-sheep 4 jaren geleden
bovenliggende
commit
ab627a740e
2 gewijzigde bestanden met toevoegingen van 23 en 21 verwijderingen
  1. 20 18
      package.json
  2. 3 3
      src/components/data_admin/buildTask/draw/drawModel.vue

+ 20 - 18
package.json

@@ -4,38 +4,37 @@
     "description": "A Vue.js project",
     "author": "yaoll <yaolinlin@sagacloud.cn>",
     "private": true,
+    "remote": {
+        "host": "192.168.20.236",
+        "path": "/opt/nginx/ibms/dist",
+        "user": "root",
+        "password": "saga",
+        "local": "dist"
+    },
     "scripts": {
         "i": "npm install",
         "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
         "start": "npm run dev",
-        "build": "node build/build.js"
+        "build": "node build/build.js",
+        "publish": "node publish.js"
     },
     "dependencies": {
-        "@sybotan-web/base": "2.1.5",
-        "@sybotan-web/draw": "2.1.56",
-        "@sybotan-web/graphy": "2.1.27",
+        "@saga-web/base": "2.1.9",
+        "@saga-web/cad-engine": "2.0.561",
+        "@saga-web/draw": "2.1.75",
+        "@saga-web/graphy": "2.1.47",
+        "@saga-web/topology": "1.0.83",
         "axios": "^0.18.0",
         "echarts": "^4.1.0",
-        "element-ui": "^2.11.0",
+        "el-cascader-multi": "^1.1.8",
+        "element-ui": "^2.11.1",
         "font-awesome": "^4.7.0",
         "handsontable-pro": "^3.0.0",
         "jquery": "^3.3.1",
         "vue": "^2.5.2",
         "vue-axios": "^2.1.4",
         "vue-router": "^3.0.1",
-        "vuex": "^3.1.0",
-        "cad-engine": "2.0.250",
-<<<<<<< HEAD
-        "@saga-web/base": "2.1.9",
-        "@saga-web/draw": "2.1.58",
-        "@saga-web/graphy": "2.1.30",
-        "@saga-web/cad-engine": "2.0.366"
-=======
-        "@saga-web/base": "2.1.8",
-        "@saga-web/draw": "2.1.56",
-        "@saga-web/graphy": "2.1.28",
-        "@saga-web/cad-engine": "2.0.275"
->>>>>>> 2098857d48253e551fdc444edf39d3fa5a9fd69c
+        "vuex": "^3.1.0"
     },
     "devDependencies": {
         "ajv": "^6.9.1",
@@ -60,6 +59,7 @@
         "less-loader": "^4.1.0",
         "node-notifier": "^5.1.2",
         "node-sass": "^4.11.0",
+        "node-ssh": "^6.0.0",
         "optimize-css-assets-webpack-plugin": "^3.2.0",
         "ora": "^1.2.0",
         "portfinder": "^1.0.13",
@@ -70,11 +70,13 @@
         "sass-loader": "^7.1.0",
         "semver": "^5.3.0",
         "shelljs": "^0.7.6",
+        "spark-md5": "^3.0.0",
         "stompjs": "^2.3.3",
         "swiper": "^4.0.0",
         "uglifyjs-webpack-plugin": "^1.1.1",
         "url-loader": "^0.5.8",
         "vue-loader": "^13.3.0",
+        "vue-simple-uploader": "^0.7.4",
         "vue-style-loader": "^3.0.1",
         "vue-template-compiler": "^2.5.2",
         "webpack": "^3.6.0",

+ 3 - 3
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -9,7 +9,7 @@
 
 <script>
 import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib"
-import { SColor, SPoint } from "@sybotan-web/draw/lib";
+// import { SColor, SPoint } from "@sybotan-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
 import { floorQuery } from "@/api/scan/request";
 export default {
@@ -94,8 +94,8 @@ export default {
       let id = `floorCanvas${this.id}`;
       this.view = new FloorView(id)
     },
-    canvasClick(item, eventObj) {//点击平面图事件 
-      this.$emit("changeButtonContent",this.drawMainScene.getSelectedSpaces().length?"通过模型空间创建":"通过模型创建") 
+    canvasClick(item, eventObj) {//点击平面图事件
+      this.$emit("changeButtonContent",this.drawMainScene.getSelectedSpaces().length?"通过模型空间创建":"通过模型创建")
     },
     getGraphtSuc(res) {
       this.showTools = true;