diff --git a/app.js b/app.js index 6cb18bcc9..ff5e160b0 100644 --- a/app.js +++ b/app.js @@ -40,20 +40,20 @@ let opts = { } // todo 测试环境 测试使用,生产环境请用nginx带来 -// app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); -// app.use('/app', proxy('http://192.168.100.108:8088', opts)); -// app.use('/ws', createProxyMiddleware({ -// target: 'http://192.168.100.108:8008', -// changeOrigin: true, -// ws: true -// })); +app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); +app.use('/app', proxy('http://192.168.100.108:8088', opts)); +app.use('/ws', createProxyMiddleware({ + target: 'http://192.168.100.108:8008', + changeOrigin: true, + ws: true +})); // todo 本机 开发用,生产环境请用nginx带来 -app.use('/ws', proxy('http://127.0.0.1:8008', opts)); -app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); -app.use('/app', proxy('http://127.0.0.1:8008', opts)); +// app.use('/ws', proxy('http://127.0.0.1:8008', opts)); +// app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); +// app.use('/app', proxy('http://127.0.0.1:8008', opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/components/property/editRoom/editRoom.html b/public/components/property/editRoom/editRoom.html index b0d161c11..5bad8d95b 100644 --- a/public/components/property/editRoom/editRoom.html +++ b/public/components/property/editRoom/editRoom.html @@ -11,7 +11,7 @@
|
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
-
- |
- ||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{visitSetting.settingId}} | -{{visitSetting.typeName}} | -{{visitSetting.faceWay == 'Y'?'是':'否'}} | -{{visitSetting.carNumWay == 'Y'?'是':'否'}} - ({{visitSetting.paNum}}) - | -{{visitSetting.auditWay == 'Y'?'是':'否'}} | -{{visitSetting.flowName}}(设置流程) - | -- | -- {{visitSetting.state == 'C'?'已部署':'待部署'}} - | -- | -{{visitSetting.carFreeTime}}分钟 | -{{visitSetting.visitNumber}} | -{{visitSetting.isNeedReview == '0'?'是':'否'}} | -{{visitSetting.visitorCode == 'true'?'是':'否'}} | -{{visitSetting.remark}} | -
-
-
-
-
- |
+