Explorar el Código

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

shaun-sheep hace 4 años
padre
commit
ca78c8e895

+ 3 - 3
package.json

@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.9",
-    "@saga-web/cad-engine": "2.0.548",
+    "@saga-web/cad-engine": "2.0.560",
     "@saga-web/draw": "2.1.75",
-    "@saga-web/graphy": "2.1.45",
-    "@saga-web/topology": "1.0.53",
+    "@saga-web/graphy": "2.1.47",
+    "@saga-web/topology": "1.0.76",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

BIN
src/views/business_space/dataUtil/1.jpg


BIN
src/views/business_space/dataUtil/2.jpg


BIN
src/views/business_space/dataUtil/3.jpg


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 161 - 15
src/views/business_space/dataUtil/topology.vue


+ 1 - 1
src/views/point/config_point/steps/step1.vue

@@ -256,7 +256,7 @@
                     var blob = new Blob([res.data], {
                         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
                     });
-                    var fileName = res.headers['content-disposition'];
+                    var fileName = decodeURI(res.headers['content-disposition']);
                     if (fileName)
                         fileName = fileName.substring(fileName.indexOf('=') + 1);
                     if ('download' in document.createElement('a')) { // 非IE下载