Merge branch 'develop' into featureLua

This commit is contained in:
pengwang 2021-05-24 17:15:53 +08:00
commit 9f6e826dee
8 changed files with 6 additions and 5 deletions

View File

@ -146,6 +146,7 @@ func RouterWeb() {
//删除串口通信接口 //删除串口通信接口
deviceRouter.DELETE("/commSerialInterface", apiDeleteCommSerialInterface) deviceRouter.DELETE("/commSerialInterface", apiDeleteCommSerialInterface)
//调用设备服务
deviceRouter.POST("/service", apiInvokeService) deviceRouter.POST("/service", apiInvokeService)
} }

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,6 @@
"SURVEY_ADDR": "http://47.103.45.84:9004/diaowen/survey!answerSurveryMobile.action?surveyId=", "SURVEY_ADDR": "http://47.103.45.84:9004/diaowen/survey!answerSurveryMobile.action?surveyId=",
"REPORT_ADDR": "http://139.196.207.46:443/", "REPORT_ADDR": "http://139.196.207.46:443/",
"BASE_TITLE": "开源版", "BASE_TITLE": "开源版",
"HOME_TITLE": "openGW系统登录(QQ:1028704210)", "HOME_TITLE": "通用采集器系统登录(QQ:1028704210)",
"OPEN_SOURCE": false "OPEN_SOURCE": false
} }

View File

@ -1 +0,0 @@
.card-panel-icon[data-v-ed3ea624]{float:left;font-size:48px;width:50%;display:block;margin-bottom:10px;color:#f4516c}.text[data-v-ed3ea624]{font-size:14px}.item[data-v-ed3ea624]{margin-bottom:18px;display:-webkit-box;display:-ms-flexbox;display:flex}

View File

@ -0,0 +1 @@
.card-panel-icon[data-v-4331a878]{float:left;font-size:48px;width:50%;display:block;margin-bottom:10px;color:#f4516c}.text[data-v-4331a878]{font-size:14px}.item[data-v-4331a878]{margin-bottom:18px;display:-webkit-box;display:-ms-flexbox;display:flex}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long