Browse Source

merge master

haojianlong 5 years ago
parent
commit
43a5e28c67

+ 4 - 4
config/prod.env.js

@@ -1,8 +1,8 @@
 'use strict'
 module.exports = {
     NODE_ENV: '"production"',
-    BASE_URL: '"http://172.16.0.239"', //测试iframe地址
-    SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
-    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
+    // BASE_URL: '"http://172.16.0.239"', //测试iframe地址
+    // SSO_SERVER: '"http://192.168.20.101:8004"' //测试环境
+    BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+    SSO_SERVER: '"http://sso.sagacloud.cn"' //正式环境
 }

+ 1 - 1
src/components/business_space/dialogs/changeRea.vue

@@ -233,7 +233,7 @@ export default {
         data: {
           directOnly: false,
           criteria: {
-            EquipLocalName: [this.search],
+            EquipLocalName: [this.search == ""? null: this.search],
             id: "",
             type: [],
             exclude: [{

+ 2 - 1
src/components/config_point/step3_point/steps3_main.vue

@@ -123,7 +123,8 @@
                 } else {
                     //不是空的情况查询点位列表
                     console.log(param)
-                    if (param && param.EquipmentMark) {
+                    // if (param && param.EquipmentMark) {
+                    if (param) {// 临时修改
                         queryPoint({
                             data: {
                                 Filters: {

+ 1 - 1
src/components/dialogs/changeRea.vue

@@ -248,7 +248,7 @@ export default {
         data: {
           directOnly: false,
           criteria: {
-            EquipLocalName: [this.search],
+            EquipLocalName: [this.search == ""? null: this.search],
             id: "",
             type: [],
             exclude: [{

+ 13 - 12
src/framework/style/layout.scss

@@ -157,6 +157,7 @@ body {
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
+    overflow: hidden;
     .page-bar {
         flex-grow: 0;
         flex-shrink: 0;
@@ -199,20 +200,20 @@ body {
         // margin-top: 10px;
     }
     >.data-table-pagination {
-    //     z-index: 99999;
+        //     z-index: 99999;
         margin-top: 10px;
-    //     flex-grow: 0;
-    //     flex-shrink: 0;
-    //     display: flex;
-    //     justify-content: flex-end;
+        //     flex-grow: 0;
+        //     flex-shrink: 0;
+        //     display: flex;
+        //     justify-content: flex-end;
         text-align: right;
-    //     position: fixed;
-    //     bottom: 0;
-    //     background: #f2f2f2;
-    //     left: 242px;
-    //     right: 0;
-    //     padding-top: 10px;
-    //     padding-bottom: 10px;
+        //     position: fixed;
+        //     bottom: 0;
+        //     background: #f2f2f2;
+        //     left: 242px;
+        //     right: 0;
+        //     padding-top: 10px;
+        //     padding-bottom: 10px;
     }
 }
 

+ 8 - 0
src/utils/handsontable/fillterField.js

@@ -0,0 +1,8 @@
+const data = {
+  equipment: {
+    read: {
+      show: [],
+      hidden: []
+    }
+  }
+}

+ 3 - 2
src/utils/handsontable/notShow.js

@@ -366,7 +366,8 @@ const showTools = {
                     item.InputMode == "B1" ||
                     item.InputMode == "L" ||
                     item.InputMode == "L1" ||
-                    item.InputMode == "L2"
+                    item.InputMode == "L2" ||
+                    item.InputMode == "M"
                 ) {
                     return {
                         data: "Infos." + item.InfoPointCode
@@ -419,7 +420,7 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (!!typeArr && typeArr.indexOf(item.InputMode) > -1) {
+            if (onlyRead || (!!typeArr && typeArr.indexOf(item.InputMode) > -1)) {
                 return undefined
             }
             if (item.Visible || !allMess) {

+ 8 - 7
src/views/point/config_point/edit_origin/index.vue

@@ -55,14 +55,15 @@
             return {
                 passWordArr: ['mqtt', 'amqp', 'opc'],
                 formData: {
-                    "ProtocolType": "", //协议类型
-                    "Name": "",
+                    ProtocolType: "", //协议类型
+                    ProtocolStandarded: true,
+                    Name: "",
                     ProtocolInfo: {
-                        "Ip": "", //ip
-                        "Port": "", //端口号,有些协议类型没有该信息
-                        "User": "", //用户名
-                        "Password": "", //密码
-                        "ProgId": "", //progId
+                        Ip: "", //ip
+                        Port: "", //端口号,有些协议类型没有该信息
+                        User: "", //用户名
+                        Password: "", //密码
+                        ProgId: "", //progId
                     },
                     Description: ""
                 },

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

@@ -233,6 +233,7 @@
                     },
                     responseType: 'blob'
                 }).then(function(res) {
+                    console.log(res)
                     var blob = new Blob([res.data], {
                         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
                     });

+ 1 - 1
src/views/point/dynamicdata/index.vue

@@ -315,7 +315,7 @@ export default {
     }
   }
   .table-area {
-    width: calc(100% - 2px);
+    width: 100%;
     height: calc(100% - 215px);
     td div {
       white-space: nowrap;