XAWDJ0277HWXPT2\Administrator %!s(int64=5) %!d(string=hai) anos
pai
achega
2b7786b60a
Modificáronse 78 ficheiros con 153 adicións e 335 borrados
  1. 0 0
      web/css/chunk-139cf1a1.73cc4659.css
  2. 0 0
      web/css/chunk-27550a72.99e14beb.css
  3. 0 0
      web/css/chunk-28ec4e83.5b343405.css
  4. 0 0
      web/css/chunk-2ef2fac4.6cb2574c.css
  5. 0 0
      web/css/chunk-3520c2d6.5c857fb5.css
  6. 0 0
      web/css/chunk-476b0587.44f35dd8.css
  7. 0 0
      web/css/chunk-565b1914.72fe42eb.css
  8. 0 0
      web/css/chunk-56b2c42d.8b682471.css
  9. 0 0
      web/css/chunk-5bc26c22.aab30c87.css
  10. 0 0
      web/css/chunk-5de518e1.9c953a41.css
  11. 0 0
      web/css/chunk-6b1d2eca.60dd08d9.css
  12. 0 0
      web/css/chunk-749ce008.31687a68.css
  13. 0 0
      web/css/chunk-87aeea08.05975ca9.css
  14. 0 0
      web/css/chunk-e4e87226.9745a476.css
  15. 1 1
      web/index.html
  16. 2 0
      web/js/app.54f92f52.js
  17. 1 0
      web/js/app.54f92f52.js.map
  18. 0 2
      web/js/app.ef22df6f.js
  19. 0 1
      web/js/app.ef22df6f.js.map
  20. 2 0
      web/js/chunk-139cf1a1.aba9c233.js
  21. 1 0
      web/js/chunk-139cf1a1.aba9c233.js.map
  22. 0 2
      web/js/chunk-1d8e8d5c.3f9a019c.js
  23. 0 1
      web/js/chunk-1d8e8d5c.3f9a019c.js.map
  24. 2 0
      web/js/chunk-27550a72.498f1b83.js
  25. 1 0
      web/js/chunk-27550a72.498f1b83.js.map
  26. 2 0
      web/js/chunk-28ec4e83.6f2fce98.js
  27. 1 0
      web/js/chunk-28ec4e83.6f2fce98.js.map
  28. 0 2
      web/js/chunk-2b5ccf4a.3dd1bfaf.js
  29. 0 1
      web/js/chunk-2b5ccf4a.3dd1bfaf.js.map
  30. 0 2
      web/js/chunk-2ce8a93e.5333bad3.js
  31. 0 1
      web/js/chunk-2ce8a93e.5333bad3.js.map
  32. 2 0
      web/js/chunk-2ef2fac4.63acb687.js
  33. 1 0
      web/js/chunk-2ef2fac4.63acb687.js.map
  34. 0 2
      web/js/chunk-338a4208.bf014c23.js
  35. 0 1
      web/js/chunk-338a4208.bf014c23.js.map
  36. 2 0
      web/js/chunk-3520c2d6.b16140ca.js
  37. 1 0
      web/js/chunk-3520c2d6.b16140ca.js.map
  38. 0 2
      web/js/chunk-37b70864.4cc08cd1.js
  39. 0 1
      web/js/chunk-37b70864.4cc08cd1.js.map
  40. 4 0
      web/js/chunk-476b0587.6435832b.js
  41. 1 0
      web/js/chunk-476b0587.6435832b.js.map
  42. 2 0
      web/js/chunk-565b1914.39dedb05.js
  43. 1 0
      web/js/chunk-565b1914.39dedb05.js.map
  44. 2 0
      web/js/chunk-56b2c42d.8cb39693.js
  45. 1 0
      web/js/chunk-56b2c42d.8cb39693.js.map
  46. 2 0
      web/js/chunk-5bc26c22.cb9c2f4d.js
  47. 1 0
      web/js/chunk-5bc26c22.cb9c2f4d.js.map
  48. 0 2
      web/js/chunk-5d0c1dcc.a98da505.js
  49. 0 1
      web/js/chunk-5d0c1dcc.a98da505.js.map
  50. 2 0
      web/js/chunk-5de518e1.ef4c3a78.js
  51. 1 0
      web/js/chunk-5de518e1.ef4c3a78.js.map
  52. 2 2
      web/js/chunk-ef8423b2.24bc9bc2.js
  53. 1 0
      web/js/chunk-6b1d2eca.ee783652.js.map
  54. 0 2
      web/js/chunk-6c55f908.9aa01628.js
  55. 0 1
      web/js/chunk-6c55f908.9aa01628.js.map
  56. 2 0
      web/js/chunk-749ce008.5259658f.js
  57. 1 0
      web/js/chunk-749ce008.5259658f.js.map
  58. 0 2
      web/js/chunk-76707987.d5d29871.js
  59. 0 1
      web/js/chunk-76707987.d5d29871.js.map
  60. 0 2
      web/js/chunk-7a95aa76.fd385be4.js
  61. 0 1
      web/js/chunk-7a95aa76.fd385be4.js.map
  62. 0 4
      web/js/chunk-7bb3a48b.c30e6dd7.js
  63. 0 1
      web/js/chunk-7bb3a48b.c30e6dd7.js.map
  64. 2 2
      web/js/chunk-87dbe6ea.74ef2f72.js
  65. 1 1
      web/js/chunk-87dbe6ea.74ef2f72.js.map
  66. 0 2
      web/js/chunk-9b7bd846.90c0cecb.js
  67. 0 1
      web/js/chunk-9b7bd846.90c0cecb.js.map
  68. 0 2
      web/js/chunk-9efb8bee.b8e721bf.js
  69. 0 1
      web/js/chunk-9efb8bee.b8e721bf.js.map
  70. 2 0
      web/js/chunk-e4e87226.c15cafda.js
  71. 1 0
      web/js/chunk-e4e87226.c15cafda.js.map
  72. 0 1
      web/js/chunk-ef8423b2.24bc9bc2.js.map
  73. 0 63
      web/js/chunk-vendors.4324cab1.js
  74. 0 1
      web/js/chunk-vendors.4324cab1.js.map
  75. 63 0
      web/js/chunk-vendors.96bd5e12.js
  76. 1 0
      web/js/chunk-vendors.96bd5e12.js.map
  77. 0 189
      webConfig/src/api/allUrl.js
  78. 41 34
      webConfig/src/views/projectManagement.vue

web/css/chunk-1d8e8d5c.73cc4659.css → web/css/chunk-139cf1a1.73cc4659.css


web/css/chunk-7a95aa76.99e14beb.css → web/css/chunk-27550a72.99e14beb.css


web/css/chunk-338a4208.5b343405.css → web/css/chunk-28ec4e83.5b343405.css


web/css/chunk-76707987.6cb2574c.css → web/css/chunk-2ef2fac4.6cb2574c.css


web/css/chunk-2b5ccf4a.5c857fb5.css → web/css/chunk-3520c2d6.5c857fb5.css


web/css/chunk-7bb3a48b.44f35dd8.css → web/css/chunk-476b0587.44f35dd8.css


web/css/chunk-37b70864.72fe42eb.css → web/css/chunk-565b1914.72fe42eb.css


web/css/chunk-2ce8a93e.8b682471.css → web/css/chunk-56b2c42d.8b682471.css


web/css/chunk-5d0c1dcc.aab30c87.css → web/css/chunk-5bc26c22.aab30c87.css


web/css/chunk-9b7bd846.9c953a41.css → web/css/chunk-5de518e1.9c953a41.css


web/css/chunk-ef8423b2.60dd08d9.css → web/css/chunk-6b1d2eca.60dd08d9.css


web/css/chunk-6c55f908.31687a68.css → web/css/chunk-749ce008.31687a68.css


web/css/chunk-87dbe6ea.05975ca9.css → web/css/chunk-87aeea08.05975ca9.css


web/css/chunk-9efb8bee.9745a476.css → web/css/chunk-e4e87226.9745a476.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
web/index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/app.54f92f52.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/app.54f92f52.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/app.ef22df6f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/app.ef22df6f.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-139cf1a1.aba9c233.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-139cf1a1.aba9c233.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-1d8e8d5c.3f9a019c.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-1d8e8d5c.3f9a019c.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-27550a72.498f1b83.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-27550a72.498f1b83.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-28ec4e83.6f2fce98.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-28ec4e83.6f2fce98.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-2b5ccf4a.3dd1bfaf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-2b5ccf4a.3dd1bfaf.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-2ce8a93e.5333bad3.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-2ce8a93e.5333bad3.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-2ef2fac4.63acb687.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-2ef2fac4.63acb687.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-338a4208.bf014c23.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-338a4208.bf014c23.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-3520c2d6.b16140ca.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-3520c2d6.b16140ca.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-37b70864.4cc08cd1.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-37b70864.4cc08cd1.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 4 - 0
web/js/chunk-476b0587.6435832b.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-476b0587.6435832b.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-565b1914.39dedb05.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-565b1914.39dedb05.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-56b2c42d.8cb39693.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-56b2c42d.8cb39693.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-5bc26c22.cb9c2f4d.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-5bc26c22.cb9c2f4d.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-5d0c1dcc.a98da505.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-5d0c1dcc.a98da505.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-5de518e1.ef4c3a78.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-5de518e1.ef4c3a78.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
web/js/chunk-ef8423b2.24bc9bc2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-6b1d2eca.ee783652.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-6c55f908.9aa01628.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-6c55f908.9aa01628.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-749ce008.5259658f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-749ce008.5259658f.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-76707987.d5d29871.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-76707987.d5d29871.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-7a95aa76.fd385be4.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-7a95aa76.fd385be4.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 4
web/js/chunk-7bb3a48b.c30e6dd7.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-7bb3a48b.c30e6dd7.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 2
web/js/chunk-87dbe6ea.74ef2f72.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
web/js/chunk-87dbe6ea.74ef2f72.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-9b7bd846.90c0cecb.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-9b7bd846.90c0cecb.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 2
web/js/chunk-9efb8bee.b8e721bf.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-9efb8bee.b8e721bf.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
web/js/chunk-e4e87226.c15cafda.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-e4e87226.c15cafda.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-ef8423b2.24bc9bc2.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 63
web/js/chunk-vendors.4324cab1.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1
web/js/chunk-vendors.4324cab1.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 63 - 0
web/js/chunk-vendors.96bd5e12.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 0
web/js/chunk-vendors.96bd5e12.js.map


+ 0 - 189
webConfig/src/api/allUrl.js

@@ -1,189 +0,0 @@
-const urls={
-	websocket:{
-		ws:'ws://www.inhealth.iotena.com/wss',
-	},
-	login:{
-		get_code_image:'https://www.inhealth.iotena.com/api/common/get_code_image',/*获取验证码图片*/
-		login:'https://www.inhealth.iotena.com/api/common/login',/*登陆*/
-		getCode:'https://www.inhealth.iotena.com/api/common/get_code',/*忘记密码获取邮箱验证码*/
-		chargePassword:'https://www.inhealth.iotena.com/api/common/charge_password',/*忘记密码设置新密码*/
-	},
-	dashboard:{
-		countryList:'https://www.inhealth.iotena.com/api/area/country_list',/*导航栏国家下拉*/
-		provinceList:'https://www.inhealth.iotena.com/api/area/province_list',/*导航栏省份下拉*/
-		cityList:'https://www.inhealth.iotena.com/api/area/city_list',/*导航栏城市下拉*/
-		homeData:'https://www.inhealth.iotena.com/api/home/data',/*首页概览数据*/
-		hotelList:'https://www.inhealth.iotena.com/api/area/hotel_list',/*酒店下拉列表*/
-		hotelView:'https://www.inhealth.iotena.com/api/home/hotel_view',/*酒店概览列表*/
-		alarmInfo:'https://www.inhealth.iotena.com/api/home/alarm_info',/*故障信息*/
-		getHotelWeather:'https://www.inhealth.iotena.com/api/home/get_hotel_weather',/*酒店天气信息*/
-		roomEnvStatus:'https://www.inhealth.iotena.com/api/home/room_env_status',/*首页空气质量跟传感器平均数据*/
-		energyConsumption:'https://www.inhealth.iotena.com/api/home/energy_consumption',/*首页用电量统计信息表*/
-		lightingUseSchedule:'https://www.inhealth.iotena.com/api/home/lighting_use_schedule',/*首页设备工作时间统计信息*/
-		roomTemAvg:'https://www.inhealth.iotena.com/api/home/room_tem_avg',/*房间平均温度统计信息*/
-		homeMap:'https://www.inhealth.iotena.com/api/home/home_map',/*地图酒店*/
-	},
-	room:{
-		buildNav:'https://www.inhealth.iotena.com/api/room/build_nav',/*楼房下拉列表*/
-		floorNav:'https://www.inhealth.iotena.com/api/area/floor_nav',/*楼层下拉列表*/
-		roomList:'https://www.inhealth.iotena.com/api/room/room_list',/*房间列表*/
-		roomNav:'https://www.inhealth.iotena.com/api/room/room_nav',/*房间下拉列表*/
-		roomCmd:'https://www.inhealth.iotena.com/api/room/room_cmd',/*房间指令*/
-		floorBuildImage:'https://www.inhealth.iotena.com/api/area/floor_build_image',/**/
-
-		getPlaneLayoutInfo:'https://www.inhealth.iotena.com/api/area/get_plane_layout_info',/*获取平面布局信息*/
-		setDevLocation:'https://www.inhealth.iotena.com/api/area/set_dev_location',/*修改设备位置信息*/
-		setPlaneLayoutInfo:'https://www.inhealth.iotena.com/api/area/set_plane_layout_info',/*批量添加设备*/
-		getPlaneLayoutDevInfo:'https://www.inhealth.iotena.com/api/area/get_plane_layout_dev_info',/*平面布局设备信息概览*/
-		updateDevInfo:'https://www.inhealth.iotena.com/api/area/update_dev_info',/*编辑设备信息*/
-		setLayoutImage:'https://www.inhealth.iotena.com/api/area/set_layout_image',/*楼层绑定平面图*/
-		getLayoutImage:'https://www.inhealth.iotena.com/api/area/get_layout_image',/*获取楼层平面图*/
-		getInputExcel:'https://www.inhealth.iotena.com/api/area/get_input_excel',/*获取批量导入excel模版下载地址*/
-		batchInput:'https://www.inhealth.iotena.com/api/area/batch_input',/*批量导入绑定设备地址*/
-		copyDevList:'https://www.inhealth.iotena.com/api/area/copy_dev_list',/*拷贝设备*/
-		delDev:'https://www.inhealth.iotena.com/api/area/del_dev',
-		userAuthentication:'https://www.inhealth.iotena.com/api/area/User_authentication',/*验证当前账户*/
-	},
-	roomLight:{
-		lightList:'https://www.inhealth.iotena.com/api/lamp/light_list',/*设备列表*/
-		lightInfo:'https://www.inhealth.iotena.com/api/lamp/light_info',/*设备详情*/
-		lampCmd:'https://www.inhealth.iotena.com/api/lamp/lamp_cmd',/*设备调光调色温*/
-		saveLight:'https://www.inhealth.iotena.com/api/lamp/save_light',/*添加编辑设备*/
-		delLight:'https://www.inhealth.iotena.com/api/lamp/del_light',/*删除设备*/
-		lampLight:'https://www.inhealth.iotena.com/api/lamp/lamp_light',/*单独调光*/
-		lampColor:'https://www.inhealth.iotena.com/api/lamp/lamp_color',/*单独调色温*/
-		// lampColorRgb:'https://www.inhealth.iotena.com/api/lamp/lamp_color_rgb',/*单独设置颜色*/
-		lampReport:'https://www.inhealth.iotena.com/api/lamp/lamp_report',/*设备日志信息*/
-		lampTurn:'https://www.inhealth.iotena.com/api/lamp/lamp_turn',/*开关灯*/
-
-		sensorList:'https://www.inhealth.iotena.com/api/sensor/sensor_list',/*设备列表*/
-		saveSensor:'https://www.inhealth.iotena.com/api/sensor/save_sensor',/*添加编辑设备*/
-		sensorInfo:'https://www.inhealth.iotena.com/api/sensor/sensor_info',/*设备详情*/
-		delSensor:'https://www.inhealth.iotena.com/api/sensor/del_sensor',/*删除设备*/
-		sensorHistory:'https://www.inhealth.iotena.com/api/sensor/sensor_history',/*设备历史记录*/
-		updateSensorInfo:'https://www.inhealth.iotena.com/api/sensor/update_sensor_info',/*更新设备数据*/
-
-		purifierList:'https://www.inhealth.iotena.com/api/purifier/purifier_list',/*设备列表*/
-		savePurifier:'https://www.inhealth.iotena.com/api/purifier/save_purifier',/*添加编辑设备*/
-		purifierInfo:'https://www.inhealth.iotena.com/api/purifier/purifier_info',/*设备详情*/
-		delPurifier:'https://www.inhealth.iotena.com/api/purifier/del_purifier',/*删除设备*/
-		trunOffDevice:'https://www.inhealth.iotena.com/api/purifier/trun_off_device',/*开关空气净化器*/
-		// purifierReport:'https://www.inhealth.iotena.com/api/purifier/purifier_report',/*设备日志信息*/
-		lampLightAsy:'https://www.inhealth.iotena.com/api/lamp/lamp_light_asy',/*批量调光*/
-		lampColorAsy:'https://www.inhealth.iotena.com/api/lamp/lamp_color_asy',/*批量调色温*/
-		lampColorRgb:'https://www.inhealth.iotena.com/api/lamp/lamp_color_rgb',/*批量调颜色*/
-		lightLightStd:'https://www.inhealth.iotena.com/api/light/Light_light_std',/*单通道调光*/
-
-		lampLogList:'https://www.inhealth.iotena.com/api/lamp/log_list',/*设备日志信息列表*/
-		purifierReport:'https://www.inhealth.iotena.com/api/purifier/purifier_report',/*设备日志信息列表*/
-		purifierLogList:'https://www.inhealth.iotena.com/api/purifier/log_list',/*设备日志信息列表*/
-		sensorLogList:'https://www.inhealth.iotena.com/api/sensor/log_list',/*设备日志信息列表*/
-
-		reData:'https://www.inhealth.iotena.com/api/lamp/re_data',/*刷新数据*/
-
-		getHotelEditforecast:'https://www.inhealth.iotena.com/api/light/get_hotel_editforecast',/*修改设备日出时间日落时间*/
-		getHotelPattern:'https://www.inhealth.iotena.com/api/light/get_hotel_pattern',/*模式调光*/
-		getHotelForecast:'https://www.inhealth.iotena.com/api/light/get_hotel_forecast',/*获取酒店默认日出日落时间*/
-
-		excelList:'https://www.inhealth.iotena.com/api/light/excelList',/*显示当前用户上传的文件列表*/
-		CirExcel:'https://www.inhealth.iotena.com/api/light/CirExcel',/*上传计划*/
-		del:'https://www.inhealth.iotena.com/api/light/del',/*删除计划*/
-		load:'https://www.inhealth.iotena.com/api/light/load',/*下载计划*/
-		plan:'https://www.inhealth.iotena.com/api/light/plan',/*计划下拉列表*/
-		addplan:'https://www.inhealth.iotena.com/api/light/addplan',/*绑定计划*/
-		download:'https://www.inhealth.iotena.com/api/light/download',/*下载模板*/
-
-		newTime:'https://www.inhealth.iotena.com/api/light/new_time',/*初始化时间*/
-		lightTest:'https://www.inhealth.iotena.com/api/light/test',/*run两分钟测试*/
-		sleepOpen:'https://www.inhealth.iotena.com/api/light/sleepOpen',/*起床睡觉模式*/
-
-		lightLampLight:'https://www.inhealth.iotena.com/api/light/lamp_light',/*调光*/
-		lightLampColor:'https://www.inhealth.iotena.com/api/light/lamp_color',/*调色温*/
-	},
-	gateway:{
-		getlist:'https://www.inhealth.iotena.com/api/network/getlist',/*网关列表*/
-		addRoomNet:'https://www.inhealth.iotena.com/api/network/addRoomNet',/*添加网关*/
-		delRoomNet:'https://www.inhealth.iotena.com/api/network/delRoomNet',/*删除网关*/
-		getLamp:'https://www.inhealth.iotena.com/api/network/getLamp',/*获取设备列表*/
-		addNetLamp:'https://www.inhealth.iotena.com/api/network/addNetLamp',/*设备绑定网关*/
-		statusControl:'https://www.inhealth.iotena.com/api/network/statusControl',/*灯闪*/
-		inspecTimeNav:'https://www.inhealth.iotena.com/api/network/inspec_time_nav',/*获取巡检时间下拉*/
-
-		checkUpdate:'https://www.inhealth.iotena.com/api/network/check_update',/*检查更新*/
-		updateFire:'https://www.inhealth.iotena.com/api/network/update_fire',/*固件升级*/
-
-		getWifiName:'https://www.inhealth.iotena.com/api/network/get_wifi_name',/*获取网关绑定的wifi名称*/
-		setWifi:'https://www.inhealth.iotena.com/api/network/set_wifi',/*设置wifi*/
-		getWifiList:'https://www.inhealth.iotena.com/api/network/get_wifi_list',/*获取wifi列表*/
-
-	},
-	service:{
-		getList:'https://www.inhealth.iotena.com/api/alarm/get_list',/*故障信息列表*/
-		delAlarm:'https://www.inhealth.iotena.com/api/alarm/del_alarm',/*删除故障*/
-		alarmInfo:'https://www.inhealth.iotena.com/api/alarm/alarm_info',/*故障详情*/
-		repairGetList:'https://www.inhealth.iotena.com/api/repair/get_list',/*维修人员信息列表*/
-		saveRepair:'https://www.inhealth.iotena.com/api/repair/save_repair',/*添加编辑维修人员*/
-		delRepair:'https://www.inhealth.iotena.com/api/repair/del_repair',/*删除维修人员*/
-		repairAuthList:'https://www.inhealth.iotena.com/api/repair/repair_auth_list',/*获取维修人员酒店权限*/
-		setRepairAuth:'https://www.inhealth.iotena.com/api/repair/set_repair_auth',/*设置维修人员酒店权限*/
-		repairStatis:'https://www.inhealth.iotena.com/api/alarm/repair_statis',/*故障统计信息*/
-		repairNav:'https://www.inhealth.iotena.com/api/repair/repair_nav',/*维修人员下拉*/
-		repairDispatch:'https://www.inhealth.iotena.com/api/repair/repair_dispatch',/*维修调度*/
-		repairDeal:'https://www.inhealth.iotena.com/api/repair/repair_deal',/*维修调度*/
-
-		hotelNav:'https://www.inhealth.iotena.com/api/alarm/hotel_nav',/*酒店侧栏列表*/
-		sendUserList:'https://www.inhealth.iotena.com/api/alarm/send_user_list',/*告警推送人员列表*/
-		addSendList:'https://www.inhealth.iotena.com/api/alarm/add_send_list',/*添加告警推送人员下拉列表*/
-		addSendUser:'https://www.inhealth.iotena.com/api/alarm/add_send_user',/*添加告警推送人员*/
-		delSendUser:'https://www.inhealth.iotena.com/api/alarm/del_send_user',/*删除告警推送人员*/
-		setSendUserStatus:'https://www.inhealth.iotena.com/api/alarm/set_send_user_status',/*启动禁用告警推送人员*/
-	},
-	activityHistory:{
-		logList:'https://www.inhealth.iotena.com/api/operation/log_list',/*获取日志信息列表*/
-		delLog:'https://www.inhealth.iotena.com/api/operation/del_log',/*删除日志信息*/
-	},
-	alarmProfile:{
-		getList:'https://www.inhealth.iotena.com/api/alarmProfle/get_list',/*数据列表*/
-		saveAlarmProfile:'https://www.inhealth.iotena.com/api/alarmProfle/save_alarm_profle',/*添加编辑*/
-		getInfo:'https://www.inhealth.iotena.com/api/alarmProfle/get_info',/*详情*/
-		delAlarmProfile:'https://www.inhealth.iotena.com/api/alarmProfle/del_alarm_profle',/*删除*/
-		setAlarmProfile:'https://www.inhealth.iotena.com/api/alarmProfle/set_alarm_profle',/*设置*/
-	},
-	userManagement:{
-		userNav:'https://www.inhealth.iotena.com/api/user/user_nav',/*用户下拉列表*/
-		userList:'https://www.inhealth.iotena.com/api/user/user_list',/*用户列表*/
-		saveUser:'https://www.inhealth.iotena.com/api/user/save_user',/*添加编辑用户*/
-		userInfo:'https://www.inhealth.iotena.com/api/user/user_info',/*获取用户详情*/
-		delUser:'https://www.inhealth.iotena.com/api/user/del_user',/*删除用户*/
-		getUserPermission:'https://www.inhealth.iotena.com/api/user/get_user_permission',/*获取用户权限列表*/
-		setUserPermission:'https://www.inhealth.iotena.com/api/user/set_user_permission',/*修改用户权限*/
-		userManage:'https://www.inhealth.iotena.com/api/user/user_manage',/*用户概览信息*/
-		updateFile:'https://www.inhealth.iotena.com/api/common/update_file',/*图片上传*/
-		setUserStatus:'https://www.inhealth.iotena.com/api/user/set_user_status',/*启用禁用用户状态*/
-	},
-	siteManagement:{
-		getCountry:'https://www.inhealth.iotena.com/api/common/get_country',/*添加酒店国家下拉*/
-		getProvince:'https://www.inhealth.iotena.com/api/common/get_province',/*添加酒店省份下拉*/
-		getCity:'https://www.inhealth.iotena.com/api/common/get_city',/*添加酒店城市下拉*/
-		hotelNavList:'https://www.inhealth.iotena.com/api/area/hotel_nav_list',/*酒店侧栏下拉*/
-		saveHotel:'https://www.inhealth.iotena.com/api/area/save_hotel',/*添加编辑酒店*/
-		hotelInfo:'https://www.inhealth.iotena.com/api/area/hotel_info',/*酒店详情*/
-		delHotel:'https://www.inhealth.iotena.com/api/area/del_hotel',/*删除酒店*/
-
-		saveFloor:'https://www.inhealth.iotena.com/api/area/save_floor',/*添加楼层*/
-		delFloor:'https://www.inhealth.iotena.com/api/area/del_floor',/*删除楼层*/
-		updateFloor:'https://www.inhealth.iotena.com/api/area/update_floor',
-
-		saveBuild:'https://www.inhealth.iotena.com/api/area/save_build',/*添加编辑楼房*/
-		delBuild:'https://www.inhealth.iotena.com/api/area/del_build',/*删除楼房*/
-		buildInfo:'https://www.inhealth.iotena.com/api/area/build_info',/*楼房详情*/
-
-		roomList:'https://www.inhealth.iotena.com/api/area/room_list',/*酒店管理房间列表*/
-		saveRoom:'https://www.inhealth.iotena.com/api/room/save_room',/*添加编辑房间*/
-		roomInfo:'https://www.inhealth.iotena.com/api/room/room_info',/*获取房间详细信息*/
-		delRoom:'https://www.inhealth.iotena.com/api/room/del_room',/*删除房间*/
-
-		updateHotelLogo:'https://www.inhealth.iotena.com/api/area/update_hotel_logo',/*修改酒店logo*/
-	}
-}
-export default urls

+ 41 - 34
webConfig/src/views/projectManagement.vue

@@ -1389,7 +1389,7 @@
                 loadParametersListENNew:[
                     {model:'intell_power',label:'SpecialPowerCtrl',unit:'',type:'select',option:'intell_powerEN'},
                     // {model:'begin_voltage',label:'AutoPowerStartUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
-                    {model:'light_type',label:'Lamp control mode',unit:'(V)',type:'select',option:'light_type_en'},
+                    {model:'light_type',label:'Lamp control mode',unit:'',type:'select',option:'light_type_en'},
                     // {model:'end_voltage',label:'AutoPowerStopUser1Volt',unit:'(V)',type:'select',option:'intell_powerV'},
                     // {model:'end_current',label:'AutoPowerStopUser1Power',unit:'(A)',type:'select',option:'intell_powerC'},
                     
@@ -1407,24 +1407,24 @@
                     {model:'second_light_unman_power',label:'LoadSensorOffPower2',unit:'(%)',type:'select',option:'light_power'},
 
                     {model:'third_light_time',label:'LoadTime3',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'third_light_human_power',label:'LoadSensorOnPower3',unit:'%',type:'select',option:'light_power'},
-                    {model:'third_light_unman_power',label:'LoadSensorOffPower3',unit:'%',type:'select',option:'light_power'},
+                    {model:'third_light_human_power',label:'LoadSensorOnPower3',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'third_light_unman_power',label:'LoadSensorOffPower3',unit:'(%)',type:'select',option:'light_power'},
 
                     {model:'fourth_light_time',label:'LoadTime4',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'fourth_light_human_power',label:'LoadSensorOnPower4',unit:'%',type:'select',option:'light_power'},
-                    {model:'fourth_light_unman_power',label:'LoadSensorOffPower4',unit:'%',type:'select',option:'light_power'},
+                    {model:'fourth_light_human_power',label:'LoadSensorOnPower4',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'fourth_light_unman_power',label:'LoadSensorOffPower4',unit:'(%)',type:'select',option:'light_power'},
 
                     {model:'fifth_light_time',label:'LoadTime5',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'fifth_light_human_power',label:'LoadSensorOnPower5',unit:'%',type:'select',option:'light_power'},
-                    {model:'fifth_light_unman_power',label:'LoadSensorOffPower5',unit:'%',type:'select',option:'light_power'},
+                    {model:'fifth_light_human_power',label:'LoadSensorOnPower5',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'fifth_light_unman_power',label:'LoadSensorOffPower5',unit:'(%)',type:'select',option:'light_power'},
 
                     {model:'sixth_light_time',label:'LoadTime6',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'sixth_light_human_power',label:'LoadSensorOnPower6',unit:'%',type:'select',option:'light_power'},
-                    {model:'sixth_light_unman_power',label:'LoadSensorOffPower6',unit:'%',type:'select',option:'light_power'},
+                    {model:'sixth_light_human_power',label:'LoadSensorOnPower6',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'sixth_light_unman_power',label:'LoadSensorOffPower6',unit:'(%)',type:'select',option:'light_power'},
 
                     {model:'seventh_light_time',label:'LoadTime7',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'seventh_light_human_power',label:'LoadSensorOnPower7',unit:'%',type:'select',option:'light_power'},
-                    {model:'seventh_light_unman_power',label:'LoadSensorOffPower7',unit:'%',type:'select',option:'light_power'},
+                    {model:'seventh_light_human_power',label:'LoadSensorOnPower7',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'seventh_light_unman_power',label:'LoadSensorOffPower7',unit:'(%)',type:'select',option:'light_power'},
 
                     // {model:'eighth_light_time',label:'LoadTime8',unit:'(HH:MM)',type:'timeSelect'},
                     // {model:'eighth_light_human_power',label:'LoadSensorOnPower8',unit:'%',type:'select',option:'light_power'},
@@ -1435,8 +1435,8 @@
                     // {model:'ninth_light_unman_power',label:'LoadSensorOffPower9',unit:'%',type:'select',option:'light_power'},
 
                     {model:'tenth_light_time',label:'LoadMorningLightTime',unit:'(HH:MM)',type:'timeSelect'},
-                    {model:'tenth_light_human_power',label:'LoadMornLightSensorOnPower',unit:'%',type:'select',option:'light_power'},
-                    {model:'tenth_light_unman_power',label:'LoadMornLightSensorOffPower',unit:'%',type:'select',option:'light_power'},
+                    {model:'tenth_light_human_power',label:'LoadMornLightSensorOnPower',unit:'(%)',type:'select',option:'light_power'},
+                    {model:'tenth_light_unman_power',label:'LoadMornLightSensorOffPower',unit:'(%)',type:'select',option:'light_power'},
                 ],
                 monitorDialog:false,
                 projectLoadDialog:false,
@@ -1899,22 +1899,22 @@
                     }else{
                         this.option.induction_delay.push({
                             id:i*5+'',
-                            name:'Delay'+i*5+'seconds',
+                            name:'Delay '+i*5+' seconds',
                         });
                         this.option.light_delay.push({
                             id:i*5,
-                            name:'Delay'+i*5+'seconds',
+                            name:'Delay '+i*5+' seconds',
                         });
                     }
                 }else if(i<72){
                     j++;
                     this.option.light_delay.push({
                         id:j*60,
-                        name:'Delay'+j+'minutes',
+                        name:'Delay '+j+' minutes',
                     });
                     this.option.induction_delay.push({
                         id:j*60+'',
-                        name:'Delay'+j+'minutes',
+                        name:'Delay '+j+' minutes',
                     });
                 }
                 /*智能电压*/
@@ -1975,14 +1975,14 @@
                     }else{
                         this.option.light_delay_time.push({
                             id:i*10,
-                            name:'Delay'+i*10+'seconds',
+                            name:'Delay '+i*10+' seconds',
                         });
                     }
                 }else if(i<72){
                     j++;
                     this.option.light_delay_time.push({
                         id:j*60,
-                        name:'Delay'+j+'minutes',
+                        name:'Delay '+j+' minutes',
                     });
                 }
                 
@@ -2039,7 +2039,7 @@
                 if(i_1==0){
                     this.option.balan_char_interval.push({
                         id:i_1,
-                        name:this.version == '0'?'禁止均衡功能':'Prohibited Equilibrium Function',
+                        name:'Prohibited Equilibrium Function',
                     });
                 }else{
                     this.option.balan_char_interval.push({
@@ -2692,19 +2692,11 @@
                             });
                         }
                     }else if(this.lampcontrolOperationType == '-1'){
-                        if(this.version == 0){
-                            this.$message({
-                              showClose: true,
-                              message:'Please select the modified type first',
-                              type: 'warning'
-                            });
-                        }else{
-                            this.$message({
-                              showClose: true,
-                              message:'Please select the modification type',
-                              type: 'warning'
-                            });
-                        }
+                        this.$message({
+                          showClose: true,
+                          message:'Please select the modification type',
+                          type: 'warning'
+                        });
                     }else if(this.lampcontrolOperationType == 'strategy'){
                         if(this.multipleSelection.length == 0){
                             this.$message({
@@ -2835,6 +2827,21 @@
                     }
                 }
             },
+            lampcontrolGetData(type,callback){
+                baseApi.ajax_post(
+                    allUrl.project.lampcontrolGetData,
+                    {
+                        username:this.username,
+                        client_key:this.client_key,
+                        token:this.token,
+                        type:type,
+                    },
+                    {},
+                    data =>{
+                        callback(data)
+                    },
+                this)
+            },
             GMTToZero2(time){
                 let now = new Date(time);
                 let hour = now.getHours();//得到小时
@@ -3869,7 +3876,7 @@
                                             }else{
                                                 this_.$message({
                                                   showClose: true,
-                                                  message: this_.version==0?'无法识别,请更改搜索内容':'Unrecognized, please change the search content',
+                                                  message: 'Unrecognized, please change the search content',
                                                   type: 'warning'
                                                 });
                                                 this_.positionPicker.start()