浏览代码

BUG最终解决版本

347617796@qq.com 4 年之前
父节点
当前提交
9d163090a4
共有 9 个文件被更改,包括 48 次插入60 次删除
  1. 1 11
      .env.development
  2. 2 11
      .env.production
  3. 23 23
      new_file.json
  4. 3 0
      public/index.html
  5. 8 6
      src/api/axios.js
  6. 2 0
      src/components/EmployeeSelector.vue
  7. 6 6
      src/index.vue
  8. 1 1
      src/main.js
  9. 2 2
      src/views/rule.vue

+ 1 - 11
.env.development

@@ -1,12 +1,2 @@
 NODE_ENV="development"
-VUE_APP_BASE_API="https://test-ding.g107.com/"
-VUE_APP_NAME="功道云"
-VUE_APP_VER="7.0"
-VUE_APP_WEBSOCKET_API="https://mwth.jifen.g107.com:543"
-VUE_APP_COPYRIGHT_CN="功道云 版权所有"
-VUE_APP_COPYRIGHT_EN="Copyright ©2015-2020 Kung Dao Cloud All Rights Reserved."
-VUE_APP_ALIOSS_URL="https://integralsys.oss-cn-shenzhen.aliyuncs.com"
-VUE_APP_ALIOSS_CDN_URL="http://cdn.intesys.g107.com"
-VUE_APP_ID="os_base"
-VUE_APP_WEB_LINK="http://192.168.31.11:8089"
-VUE_APP_DOWNDOAD_URL="https://m.intesys.cms.g107.com/app_download/"
+VUE_APP_BASE_API="https://ding.insys.g107.com/"

+ 2 - 11
.env.production

@@ -1,13 +1,4 @@
 NODE_ENV="production"
-VUE_APP_BASE_API="https://test-ding.g107.com/"
-VUE_APP_NAME="功道云-绩效版"
-VUE_APP_VER="7.0"
-VUE_APP_WEBSOCKET_API="https://ws.g107.com:543"
-VUE_APP_COPYRIGHT_CN="功道云 版权所有"
-VUE_APP_COPYRIGHT_EN="Copyright ©2015-2020 Kung Dao Cloud All Rights Reserved."
-VUE_APP_ALIOSS_URL="https://integralsys.oss-cn-shenzhen.aliyuncs.com"
-VUE_APP_ALIOSS_CDN_URL="http://cdn.intesys.g107.com"
-VUE_APP_ID="os_base"
-VUE_APP_WEB_LINK="https://oa.g107.com/m"
-VUE_APP_DOWNDOAD_URL="https://m.intesys.cms.g107.com/app_download/"
+VUE_APP_BASE_API="https://ding.insys.g107.com/"
+
 

+ 23 - 23
new_file.json

@@ -23,7 +23,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6ImdQM08ycG5FY1I3Qkw1Tm0iLCJzdWIiOjEsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.dtaCwjR6i8dyttE1bB4Oy2T3NCE0qXvRySZV7IQj9H0"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IldBVUxuM0RuSlBoeUZWeHMiLCJzdWIiOjEsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.D34IWIuJjyUe3n6Sg-OtoYyjN0VVFZuLwIoZ0QDFl18"
 	}, {
 		"employee": {
 			"id": 2,
@@ -46,7 +46,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IndjelpldVZ6ZnlOdHRQYmgiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.zdDyluo2f4Ilk1EDwZ2fd0Fr_tuhqwMoTXkfzRRrWWk"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IlFjbXpTM0NlZVRGU0pXcU4iLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.5w9jMZkAu0mlIBxWccJjEXv28VY2RM6tp40eOnQRmio"
 	}, {
 		"employee": {
 			"id": 3,
@@ -69,7 +69,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6Ild2V2hncmUxMHV3eEt2bUwiLCJzdWIiOjMsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.AN1hJmizcmJwb4MKYCbBvUVdmUMYsTa-9ExvCcs89wg"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6InJTaFh1VmpYYzlTR1dhbDgiLCJzdWIiOjMsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.IclK48wdxe8SM_G7g7A0WkWAhxifSMQH3WypgWlKfAM"
 	}, {
 		"employee": {
 			"id": 4,
@@ -92,7 +92,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IjN1WkNSSGg2T3BndFdWSWYiLCJzdWIiOjQsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.qSMTM_ll9Njvc_PKMp3aVUg0y-X-peoXXRqKSSO18qI"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6ImJCUkpZV0xzZlFkRE12MlEiLCJzdWIiOjQsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.TWziZlrDEI7HxUvUN9n_NCz5MwstZRgNvj6E7XDAPY0"
 	}, {
 		"employee": {
 			"id": 5,
@@ -115,7 +115,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IkVyMjN5bFhsVDY0RW5WWWoiLCJzdWIiOjUsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.e9OFeL_xifw68a-nVNcvkOwnqOV1KF2OVAjBUWIwSPI"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IjBIcEVpRmtGdWFQWHY3bUkiLCJzdWIiOjUsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.MBFcqGPwPbi5bMNyQnd5oOE-oSPBw0y2R2geycZYZks"
 	}, {
 		"employee": {
 			"id": 6,
@@ -138,7 +138,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6ImJEZDhpWnJneU9Sa1lpanciLCJzdWIiOjYsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.88uhxYQ_SK149W9U5T48rDYs0a2D-mlMXbzM4gj019k"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IjF4QVkzZXJMbE0xR1pVRUIiLCJzdWIiOjYsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.QEXtUsJVyqv7z_49tIQrArRSLLjuWSmK45rkfGiEBeg"
 	}, {
 		"employee": {
 			"id": 7,
@@ -155,13 +155,13 @@
 			"letter_index": "C",
 			"lang": "cn",
 			"try_user": 0,
-			"is_official": 0,
+			"is_official": 1,
 			"create_time": "1593747069",
-			"update_time": "1597732348",
+			"update_time": "1598596182",
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IjFKT05KU1NTRjYycUt4dGQiLCJzdWIiOjcsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.eR7CjtpI903gBOJLASY9LrlUqamARpuJMQTNzK_5xuE"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6Im56T1Vmbk1NbVFzNlgwSWIiLCJzdWIiOjcsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.KQvrLdwRYP5Zyrj4RUZiRdki3pG7weKmtx_Jm7o4Js8"
 	}, {
 		"employee": {
 			"id": 8,
@@ -184,7 +184,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IlM1NkFSYm42Zkxvd1l5ZlUiLCJzdWIiOjgsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.gEkwwN6r992KUEMPsCljSg2DOHyoCpw-ScbANb3PfK4"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IkhxOGFqcDZaN2VWRVdGdnoiLCJzdWIiOjgsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.wPmeumLgSb_m0Km641hTELrr8j26PrdZRpgPe86T0K8"
 	}, {
 		"employee": {
 			"id": 9,
@@ -203,11 +203,11 @@
 			"try_user": 0,
 			"is_official": 0,
 			"create_time": "1593747073",
-			"update_time": "1597732560",
+			"update_time": "1598594542",
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IlFRNG82WXFmWWlGMkFSZjQiLCJzdWIiOjksInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.sxg5Stt_EtUtnTN8M6AxRFJARX9c7jqaEV2kGWPIphs"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IjdRb1cyWW5wWVNNNXBKVmQiLCJzdWIiOjksInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.S4Wf9Uge9ze0tTb5K9qP5C-Q1X7eTTnC2j4fkrKJO2w"
 	}, {
 		"employee": {
 			"id": 10,
@@ -230,7 +230,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6ImlBdkY4NkNNY1hsZGppMU4iLCJzdWIiOjEwLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.NxSKha7NoykG1TApU5zq6F4nXwrM33Avry6Fy-pIWTY"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6Imk5SXdLY2o3c3d5Z1gxSkgiLCJzdWIiOjEwLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.1ThrTHnJwA-15TWH2TNH536jHka_zZi0m1yCnQz3Bac"
 	}, {
 		"employee": {
 			"id": 11,
@@ -253,7 +253,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6ImdsRHNSbjFWMVp5Z1VCWnciLCJzdWIiOjExLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.Q-fn-fKNDqJL_NXIdNyhJ8L81sKivOlDykJ5rAOeqqY"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IjNYdlFub2ZuV2xZWUdtTEIiLCJzdWIiOjExLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.xkz8vXvuXgQwDU1LZWSkt-X_50gokDR2nDdB2_JPNxU"
 	}, {
 		"employee": {
 			"id": 12,
@@ -276,7 +276,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IlI3bjB2cVFWNFZrMElnZlkiLCJzdWIiOjEyLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.Q6y0L95tek6YLVDRBAoIz7YqB40SwFUYKhd_MFwriRM"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6Ik5SZWxFQ1VqTld0bllqZjMiLCJzdWIiOjEyLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.B9hWa4nHrwgJMXWolbRr9BLK6rxAGhce3I8jFWywLYg"
 	}, {
 		"employee": {
 			"id": 13,
@@ -299,7 +299,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IlZjdENmZDg1S3dzUE13ZzciLCJzdWIiOjEzLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.8jQGKEwL9PX1iIqgbBSEY-fgMJsPRUBjHuN26LTqMrk"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6InZJWDZPSmpHV3BneE5oZzkiLCJzdWIiOjEzLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.vLuBnjk8n9atyibJfKDon_wYgeQZg1YK2YqMduUtiAg"
 	}, {
 		"employee": {
 			"id": 14,
@@ -322,7 +322,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IjViYjdoSWR2UEJnVnlJYVQiLCJzdWIiOjE0LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.FaNEHrw5pUEh6X0lG4biDI0KpYONGPM5v8eQJVxf-gs"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IkszaDlaTG1sR0RVeXloaEUiLCJzdWIiOjE0LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.U-tHqDEx6f7f9h9AjnQfadkOPgF6lrdHH2uvw1Gf1YE"
 	}, {
 		"employee": {
 			"id": 15,
@@ -345,7 +345,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6ImV5U0puam9pb2hKdnZaeW8iLCJzdWIiOjE1LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.9B08r_Hlz72qiX4Zxgd9aI2jn2xuILv_aE_FxpUTU3I"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IkpNYk9CZ3Q4YkpsenhVT2IiLCJzdWIiOjE1LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.8roZXOxYiWs1cr313yZ7-tYxzyQEwECjp1R6ugWCzRY"
 	}, {
 		"employee": {
 			"id": 16,
@@ -368,7 +368,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IjVpcHhvd05xNWNkSHlDVWEiLCJzdWIiOjE2LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.krFUQqTKu8iI_mkqQDp63QXj1cQnufbKuAwIVlr1hwg"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IktDTlR2SnBQcDAxam5KbjYiLCJzdWIiOjE2LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.Xm009pXnuJ3PjcuSy2z848wi8g-al9Yw_mRpNF1gmhw"
 	}, {
 		"employee": {
 			"id": 17,
@@ -391,7 +391,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IkFpbWhGNWlYZHljS2g4ZjgiLCJzdWIiOjE3LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.NlGk0fVRev0s0HY_LZyUlBLxV6MFbxRDsdY1cgIig8I"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6InBkZlVSc202TkR3RVpaWWwiLCJzdWIiOjE3LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.KLdaMoQ6hsEYhz7F5SuAn0OCH07PBD2DQFuHSSVxpu0"
 	}, {
 		"employee": {
 			"id": 18,
@@ -414,7 +414,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IkxzdjBTN202c3hMS3loaE0iLCJzdWIiOjE4LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.30IEAWRu7ZJuMYNAgVercnVa48vexw4DzC1R3eVY93w"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IlpQZmVWeU50NEU1eWdnWWsiLCJzdWIiOjE4LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.R392geJSe_tcyXScT376PayBkxVFxbR4901Powicbpo"
 	}, {
 		"employee": {
 			"id": 19,
@@ -437,7 +437,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IjBoVm9wMmZhZXpVeTh0OFkiLCJzdWIiOjE5LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.q4K2rvIgRyQYJtYacdPi0Mq0ZFsQine4ZxwE4kvMzQM"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IlZlakY3VDVVV0M4bnJJMXoiLCJzdWIiOjE5LCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.xFU3dZXatbitKICLvU7hZCEF4Syxgq5FGDPFtx3zb7s"
 	}, {
 		"employee": {
 			"id": 20,
@@ -460,7 +460,7 @@
 			"delete_time": null,
 			"status_remark": "\u5728\u804c"
 		},
-		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6Ikk4TjdFWnoxa1RrSjFaOEMiLCJzdWIiOjIwLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.DxwU_TS5mabs8LuRZxi6sIquLWX2PxhorJckzqpYwfU"
+		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6Im5jN2xkRmRCRlBaWDhhVEIiLCJzdWIiOjIwLCJwcnYiOiJjYTY0ODlkNTBmMjQwN2E2NzgzMGU4MDkwZDAxNDg4MzU2ODU5NjJiIiwicm9sZSI6ImVtcGxveWVlIn0.02YiGeYnIepDRpdydR9ilKSkXGv31V1c1InUbwpaUvo"
 	}],
 	"refresh_token": ""
 }

+ 3 - 0
public/index.html

@@ -5,6 +5,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+<!-- 	<link rel="Bookmark" type="image/x-icon" href="b/img/icon/favicon.ico" />
+	<link rel="icon" type="image/x-icon" href="b/img/icon/favicon.ico" />
+	<link rel="shortcut icon" type="image/x-icon" href="b/img/icon/favicon.ico" /> -->
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>

+ 8 - 6
src/api/axios.js

@@ -8,7 +8,7 @@ import qs from 'qs'
 
 const service = axios.create({
 	baseURL: process.env.VUE_APP_BASE_API, // api的base_url
-	timeout: 10000,
+	timeout: 5000,
 	headers: {
 		'Content-Type': 'application/x-www-form-urlencoded'
 	},
@@ -19,10 +19,10 @@ const service = axios.create({
 
 service.interceptors.request.use(
 	config => {
-		// if (getToken()) {
-		// 	config.headers['A-Token'] = getToken()
-			config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IndjelpldVZ6ZnlOdHRQYmgiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.zdDyluo2f4Ilk1EDwZ2fd0Fr_tuhqwMoTXkfzRRrWWk'
-		// }
+		if (getToken()) {
+			config.headers['A-Token'] = getToken()
+			// config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5OTQ1NzExNCwiZXhwIjoxNjAwMDU3MTE0LCJuYmYiOjE1OTk0NTcxMTQsImp0aSI6IlFjbXpTM0NlZVRGU0pXcU4iLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.5w9jMZkAu0mlIBxWccJjEXv28VY2RM6tp40eOnQRmio'
+		}
 		return config
 	},
 	error => {
@@ -34,7 +34,9 @@ service.interceptors.request.use(
 service.interceptors.response.use(
 	response => {
 		if (response.data.code === 1) {
-			if (response.data.refresh_token) {
+			if(response.data.data.token){
+				setToken(response.data.data.token);
+			}else if (response.data.refresh_token) {
 				if (response.data.refresh_token !== getToken()) {
 					setToken(response.data.refresh_token);
 				}

+ 2 - 0
src/components/EmployeeSelector.vue

@@ -465,7 +465,9 @@
         this.table_loading = true;
         var _this=this;
         var employee_selected_list=this.employee_selected_list;
+		
 		var my_id=this.$getUserData().id;
+		
         if (this.employee_list.length > 0) {
           let list = this.employee_list
 

+ 6 - 6
src/index.vue

@@ -45,13 +45,13 @@ export default {
 		this.routers = this.$router.options.routes[0].children;
 	},
 	mounted() {
-		// var url = window.location.href;
-		// var str = this.GetRequest(url).corpId || '123';
-		// var corpId = str.split('#')[0];
-		// if (corpId) {
-		// 	this.login(corpId);
+		var url = window.location.href;
+		var str = this.GetRequest(url).corpId || '123';
+		var corpId = str.split('#')[0];
+		if (corpId) {
+			this.login(corpId);
 			this.getTypes();
-		// }
+		}
 	},
 	methods: {
 		tz(){},

+ 1 - 1
src/main.js

@@ -15,7 +15,7 @@ Vue.component('userImage', userImage)
 
 Vue.use(ElementUI);
 // if (process.env.NODE_ENV === 'development') {
-//   new VConsole()
+  new VConsole()
 // }
 
 Vue.prototype.$dd=dd;

+ 2 - 2
src/views/rule.vue

@@ -170,7 +170,7 @@
 							:data="{ type: 'rule_item' }"
 							ref="upload"
 							:limit="1"
-							action="https://test-ding.g107.com/api/upload/excel"
+							action="https://ding.insys.g107.com/api/upload/excel"
 							:on-preview="handlePreview"
 							:on-remove="handleRemove"
 							:on-success="handleSuccess"
@@ -297,8 +297,8 @@ export default {
 		noData
 	},
 	created() {
-		this.getData();
 		this.point_types = this.$getTyps();
+		this.getData();
 	},
 	mounted() {
 		this.$nextTick(function() {