fix conflict for merging code

js/index.js

@@ -64,7 +64,7 @@ jQuery(document).ready(function ($) {
                 console.log('updateWOStatus:' + val.target.value);
                 var url = "/work/ws/update";
                 var data = JSON.stringify({
-                    "woStatus": val.target.value,
+                    "userStatus": val.target.value,
                     "statusDisplay": "",
                     "userId": 1
                 });
@@ -82,7 +82,7 @@ jQuery(document).ready(function ($) {
             }
         },
         data: {
-            woStates: [
+        	woStates: [
             	{value: 1, text: '空闲中'},
                 {value: 2, text: '下班'},
                 {value: 3, text: '接待中'},
@@ -91,7 +91,7 @@ jQuery(document).ready(function ($) {
             ]
         }
     })
-
+   
 
     // 数据提示条
     var numCount = new Vue({