merge master

config/prod.env.js

@@ -3,6 +3,6 @@ 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://mbi.sagacloud.cn"', //线上iframe地址
+    // SSO_SERVER: '"http://sso.sagacloud.cn"'  //正式环境
 }

src/api/scan/httpUtil.js

@@ -35,7 +35,7 @@ export default {
     getJson: function(url, data, success, failed, err) {
         let ProjectId = storage.get("global_project_selected")
         let vm = this;
-        fetch({ url: url, method: 'get', params: data, headers: { 'ProjectId': ProjectId } }).then((response) => {
+        fetch({ url: url, method: 'get', params: data, headers: {'ProjectId': ProjectId}}).then((response) => {
             successResponse(vm, response, success, failed)
         }).catch(error => {
             errorResponse(vm, error, err);
@@ -44,7 +44,7 @@ export default {
     postJson: function(url, data, success, failed, err) {
         let ProjectId = storage.get("global_project_selected")
         let vm = this;
-        fetch({ url: url, method: 'post', data: data, headers: { 'ProjectId': ProjectId } }).then((response) => {
+        fetch({ url: url, method: 'post', data: data, headers: {'ProjectId': ProjectId} }).then((response) => {
             successResponse(vm, response, success, failed)
         }).catch(error => {
             errorResponse(vm, error, err);

src/utils/handsontable/notShow.js

@@ -2,7 +2,7 @@
 import text from "@/utils/handsontable/mainText"
 import tools from "@/utils/scan/tools"
 let InputModeArr = ["A1", "A2", "B1", "C5", "D1", "D2", "E1", "L", "L1", "L2", "F1", "F2", "M", "Own"]
-    //在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
+//在编辑模式下并且勾选隐藏自动填充的信息点不显示的字段
 let noShowArr = [
         "Brand",
         "Specification",
@@ -410,6 +410,7 @@ const showTools = {
             } else {
                 return false
             }
+            
 
 
 

src/utils/scan/tools.js

@@ -452,12 +452,12 @@ tools.formatDataSource = function(data) {
     let arr = []
     try {
         options = JSON.parse(data)
-        if (options) {
-            options.forEach((item) => {
+        if(options) {
+            options.forEach((item) =>{
                 arr.push({
                     Code: item.code,
                     Name: item.name
-                })
+                }) 
             })
             return arr
         } else {
@@ -468,11 +468,11 @@ tools.formatDataSource = function(data) {
     }
 }
 
-tools.isObjectValueEqual = function(a, b) { //判断两个对象的可枚举属性值是否相等(认为null,"",undefinde相等)
+tools.isObjectValueEqual = function (a, b) {//判断两个对象的可枚举属性值是否相等(认为null,"",undefinde相等)
     //取对象a和b的属性名
     var aProps = Object.keys(a)
     var bProps = Object.keys(b)
-        //判断属性名的length是否一致
+    //判断属性名的length是否一致
     if (aProps.length != bProps.length) {
         return false
     }
@@ -480,12 +480,12 @@ tools.isObjectValueEqual = function(a, b) { //判断两个对象的可枚举属
     //循环取出属性名，再判断属性值是否一致
     for (var i = 0; i < aProps.length; i++) {
         var propName = aProps[i]
-        if (!(a[propName] instanceof Object || b[propName] instanceof Object)) {
+        if(!(a[propName] instanceof Object || b[propName] instanceof Object)) {
             if (!(a[propName] == b[propName] || (!a[propName] && !b[propName]))) {
                 return false
             }
         } else {
-            if (!tools.isObjectValueEqual(a[propName], b[propName])) {
+            if(!tools.isObjectValueEqual(a[propName],b[propName])) {
                 return false
             }
         }
@@ -494,34 +494,34 @@ tools.isObjectValueEqual = function(a, b) { //判断两个对象的可枚举属
 
 }
 
-tools.dataForKey = function(data, key) {
+tools.dataForKey = function (data, key) {
     let arr = key.split(".")
     if (arr && arr[0]) {
-        for (let i = 0; i < arr.length; i++) {
-            if (arr[i] && data[arr[i]]) {
-                data = data[arr[i]]
-            } else {
-                return ''
-            }
+      for (let i = 0; i < arr.length; i++) {
+        if (arr[i] && data[arr[i]]) {
+            data = data[arr[i]]
+        } else {
+            return ''
         }
-        return data
+      }
+      return data
     }
 }
 
-tools.setDataForKey = function(data, key, value) {
+tools.setDataForKey = function (data, key, value) {
     let arr = key.split(".")
     if (arr && arr[0]) {
-        for (let i = 0; i < arr.length; i++) {
-            if (!(arr[i] && data[arr[i]])) {
-                data[arr[i]] = {}
-            }
-            if (value !== undefined) {
-                if (i == arr.length - 1) {
-                    data[arr[i]] = value
-                }
+      for (let i = 0; i < arr.length; i++) {
+        if (!(arr[i] && data[arr[i]])) {
+            data[arr[i]] = {}
+        }
+        if (value !== undefined) {
+            if (i == arr.length - 1) {
+                data[arr[i]] = value
             }
-            data = data[arr[i]]
         }
+        data = data[arr[i]]
+      }
     }
 }