diff --git a/app.js b/app.js index 4411a5e6d..9a9d0979c 100644 --- a/app.js +++ b/app.js @@ -51,12 +51,14 @@ let opts = { // ws: true // })); - +app.use('/ws', proxy('http://192.168.100.109:8008', opts)); +app.use('/callComponent', proxy('http://192.168.100.109:8008', opts)); +app.use('/app', proxy('http://192.168.100.109:8008', opts)); // 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/inspection/inspectionTaskMap/inspectionTaskMap.js b/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js index 8fdad75cc..1adf0b67c 100644 --- a/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js +++ b/public/components/inspection/inspectionTaskMap/inspectionTaskMap.js @@ -65,6 +65,10 @@ } }); + if($that.inspectionTaskMapInfo.map && $that.inspectionTaskMapInfo.map.hasOwnProperty('height')){ + $that.inspectionTaskMapInfo.map.destroy(); + } + let center = new TMap.LatLng(_lat, _lng) //定义map变量,调用 TMap.Map() 构造函数创建地图 diff --git a/public/components/inspection/routeTask/routeTask.html b/public/components/inspection/routeTask/routeTask.html index fdf068b06..57d7d729b 100644 --- a/public/components/inspection/routeTask/routeTask.html +++ b/public/components/inspection/routeTask/routeTask.html @@ -1,11 +1,12 @@
-
+
    -
  • - {{task.planUserName}}({{task.inspectionPlanName}}) +
  • +
    {{task.planUserName}}({{task.inspectionPlanName}})
    +
    {{task.planInsTime}}
diff --git a/public/css/vc.css b/public/css/vc.css index c827a2c24..6be8e9069 100644 --- a/public/css/vc.css +++ b/public/css/vc.css @@ -189,7 +189,7 @@ margin-bottom: 25px; } -.padding-l-60{ +.padding-l-60 { padding-left: 60px; } @@ -210,7 +210,7 @@ padding-left: 0; } -.padding-l-60{ +.padding-l-60 { padding-left: 60px; } @@ -525,7 +525,7 @@ ul li { font-size: 18px; } -.text-blue{ +.text-blue { color: #007bff; } @@ -922,7 +922,15 @@ nav-link nav-link-breadcrumb active:active { cursor: pointer; } -.vc-org ul li:hover { +.vc-org-hc ul li { + padding-left: 15px; + padding-top: 15px; + padding-bottom: 15px; + cursor: pointer; +} + +.vc-org ul li:hover, +.vc-org-hc ul li:hover { background-color: var(--vc-org-bg-active-color); } @@ -1112,6 +1120,6 @@ nav-link nav-link-breadcrumb active:active { color: #007bff; } -.simplify-acceptance .form-group{ +.simplify-acceptance .form-group { margin-bottom: 0px; -} +} \ No newline at end of file