pengjing 1 年之前
父节点
当前提交
ff5a6e765b

二进制
YLShipBuildLandMap.Web/wwwroot/app/main/images/back.png


+ 1 - 1
YLShipBuildLandMap.Web/wwwroot/app/main/index.html

@@ -69,7 +69,7 @@
     <script src="app.js?v=v07.20.1"></script>
 
 </head>
-<body ng-app="ylmis" class="theme-blue" style="overflow-y: hidden;">
+<body ng-app="ylmis" class="theme-blue" style="overflow-y: hidden;" oncontextmenu=self.event.returnValue=false>
     <div ui-view>
     </div>
 </body>

+ 21 - 4
YLShipBuildLandMap.Web/wwwroot/app/main/map-index.html

@@ -4,7 +4,7 @@
     </div>
     <div class="search_panel">
         <div class="search_label">
-            <input type="text" style="" ng-model="searchInput" id="searchInput" ng-change="searchBuilding()" placeholder="输入部门/服务点名称查询"/>
+            <input type="text" style="" ng-model="searchInput" id="searchInput" ng-change="searchBuilding()" placeholder="输入部门/服务点名称查询" />
             <img src="images/search3.png" ng-click="searchBuilding()" />
         </div>
     </div>
@@ -39,9 +39,9 @@
                     <p ng-repeat="it in roomList | filter:{BuildingFloorId:floor.BuildingFloorId}" ng-click="showRoom(it)" style="height:40px;font-size:14px;cursor:pointer;margin:0px;display:flex;align-items:center;" ng-class="isHightlight(it)?'hightlight':''">
                         {{it.RoomName}}&nbsp;&nbsp;{{it.DepartmentOrServiceName}}
                     </p>
-                    <hr ng-if="!$last" style="margin:10px 0px;"/>
+                    <hr ng-if="!$last" style="margin:10px 0px;" />
                 </div>
-                
+
             </div>
         </div>
     </div>
@@ -51,7 +51,7 @@
         <button type="button" class="close bcak_btn" ng-click="coloseRoom()">返回</button>
         <div class="top_img">
             <!--<img src="images/test.png" />-->
-            <img ng-if="roomModel.ImgUrl" ng-src="{{roomModel.ImgUrl}}"/>
+            <img ng-if="roomModel.ImgUrl" ng-src="{{roomModel.ImgUrl}}" />
         </div>
         <div class="detail_content">
             <div style="font-size:16px;font-weight:bold;">
@@ -83,6 +83,9 @@
         </div>
     </div>
 </div>
+<div class="back_btn" ng-click="backMap()">
+    <img src="images/back.png" />
+</div>
 <style type="text/css">
     .map_page {
         display: flex;
@@ -96,6 +99,7 @@
             z-index: 1000;
             top: 50px;
         }
+
             .map_page .search_panel .search_label {
                 border: 1px solid #1692f6;
                 border-radius: 20px;
@@ -333,4 +337,17 @@
     .hightlight {
         color: #1692f6;
     }
+
+    .back_btn {
+        position: absolute;
+        z-index: 1000;
+        top:30px;
+        left:50px;
+        cursor:pointer;
+    }
+
+        .back_btn img {
+            width: 30px;
+            height: 30px;
+        }
 </style>

+ 4 - 0
YLShipBuildLandMap.Web/wwwroot/app/main/map-index.js

@@ -194,6 +194,10 @@
             // touch end event handler code here
         });
 
+        $scope.backMap = function () {
+            $state.go("map");
+        };
+
         //加载列表数据
         $scope.getBuildingXYAxisList = function () {
             $http