Merge branch 'master' of http://git.shengws.com/csx/Vue_New

config/dev.env.js

@@ -6,8 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API:'"http://localhost:9531"',
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  BASE_API:'"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host:'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/workforce/appointment.vue

@@ -635,10 +635,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1]) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1]) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -656,6 +656,8 @@
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
+
+
         var total_zones = []
         var total_device_number = []
 
@@ -678,11 +680,11 @@
           }
         }
 
-        console.log(deviceNumber)
-        console.log(total_device_number)
+
 
         for (let i = 0; i < deviceNumber.length; i++) {
           if (!total_device_number.includes(deviceNumber[i])) {
+            console.log(deviceNumber[i])
             is_device_number = false
           }
         }

src/xt_pages/workforce/template.vue

@@ -532,10 +532,10 @@
         let deviceNumber = []
 
         for (let i = 0; i < results.length; i++) {
-          if (results[i + 1] && results[i + 1]['区号'] != undefined) {
+          if (results[i + 1] ) {
             zones.push(results[i + 1]['区号'])
           }
-          if (results[i + 1] && results[i + 1]['机号'] != undefined) {
+          if (results[i + 1] ) {
             deviceNumber.push(results[i + 1]['机号'])
           }
 
@@ -552,6 +552,9 @@
           obj2[next] ? '' : obj2[next] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        console.log("1111111111")
+        console.log(deviceNumber)
+        console.log("1111111111")
 
         var total_zones = []
         var total_device_number = []