浏览代码

大屏bug修改

seimin 1 年之前
父节点
当前提交
f72173d446

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.4.241",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 46 - 43
src/app/views/disinfection-supply/disinfection-supply.component.html

@@ -115,56 +115,59 @@
115 115
   </div>
116 116
 </div>
117 117
 <!-- 详情 -->
118
-<div class="detail" *ngIf="detailModel">
119
-  <div class="detail_head">
120
-    <h2>详细信息</h2>
121
-    <img (click)="closeDetail()" src="./../../../assets/images/screen/close.png" alt="">
122
-  </div>
123
-  <div class="detail_body">
124
-    <div class="detail_body_item">
125
-      <div class="detail_body_left">
126
-        <div class="detail_body_title">楼栋:</div>
127
-        <div class="detail_body_title_content">{{order[3]}}</div>
128
-      </div>
118
+<div class="mask" *ngIf="detailModel">
119
+  <div class="detail">
120
+    <div class="detail_head">
121
+      <h2>详细信息</h2>
122
+      <img (click)="closeDetail()" src="./../../../assets/images/screen/close.png" alt="">
129 123
     </div>
130
-    <div class="detail_body_item">
131
-      <div class="detail_body_left">
132
-        <div class="detail_body_title">科室:</div>
133
-        <div class="detail_body_title_content">{{order[6]}}</div>
124
+    <div class="detail_body">
125
+      <div class="detail_body_item">
126
+        <div class="detail_body_left">
127
+          <div class="detail_body_title">楼栋:</div>
128
+          <div class="detail_body_title_content">{{order[3]}}</div>
129
+        </div>
134 130
       </div>
135
-    </div>
136
-    <div class="detail_body_item">
137
-      <div class="detail_body_left">
138
-        <div class="detail_body_title">配送人员:</div>
139
-        <div class="detail_body_title_content">{{order[8]}}</div>
131
+      <div class="detail_body_item">
132
+        <div class="detail_body_left">
133
+          <div class="detail_body_title">科室:</div>
134
+          <div class="detail_body_title_content">{{order[6]}}</div>
135
+        </div>
140 136
       </div>
141
-    </div>
142
-    <div class="detail_body_item">
143
-      <div class="detail_body_left">
144
-        <div class="detail_body_title">工单号:</div>
145
-        <div class="detail_body_title_content">{{order[11]}}</div>
137
+      <div class="detail_body_item">
138
+        <div class="detail_body_left">
139
+          <div class="detail_body_title">配送人员:</div>
140
+          <div class="detail_body_title_content">{{order[8]}}</div>
141
+        </div>
146 142
       </div>
147
-    </div>
148
-    <div class="detail_body_item">
149
-      <div class="detail_body_left">
150
-        <div class="detail_body_title">任务类型:</div>
151
-        <div class="detail_body_title_content">{{taskTypeName}}</div>
143
+      <div class="detail_body_item">
144
+        <div class="detail_body_left">
145
+          <div class="detail_body_title">工单号:</div>
146
+          <div class="detail_body_title_content">{{order[11]}}</div>
147
+        </div>
152 148
       </div>
153
-    </div>
154
-    <div class="detail_body_item">
155
-      <div class="detail_body_left">
156
-        <div class="detail_body_title">工单状态:</div>
157
-        <div class="detail_body_title_content">{{order[7]}}</div>
149
+      <div class="detail_body_item">
150
+        <div class="detail_body_left">
151
+          <div class="detail_body_title">任务类型:</div>
152
+          <div class="detail_body_title_content">{{taskTypeName}}</div>
153
+        </div>
158 154
       </div>
159
-    </div>
160
-    <div class="detail_body_item">
161
-      <div class="detail_body_left">
162
-        <div class="detail_body_title">备注信息:</div>
163
-        <div class="detail_body_title_content">{{order[13]}}</div>
155
+      <div class="detail_body_item">
156
+        <div class="detail_body_left">
157
+          <div class="detail_body_title">工单状态:</div>
158
+          <div class="detail_body_title_content">{{order[7]}}</div>
159
+        </div>
160
+      </div>
161
+      <div class="detail_body_item">
162
+        <div class="detail_body_left">
163
+          <div class="detail_body_title">备注信息:</div>
164
+          <div class="detail_body_title_content">{{order[13]}}</div>
165
+        </div>
164 166
       </div>
165 167
     </div>
166
-  </div>
167
-  <div class="detail_foot">
168
-    <div class="detail_btn" (click)="closeDetail()">知道了</div>
168
+    <div class="detail_foot">
169
+      <div class="detail_btn" (click)="closeDetail()">知道了</div>
170
+    </div>
169 171
   </div>
170 172
 </div>
173
+

+ 1 - 1
src/app/views/disinfection-supply/disinfection-supply.component.less

@@ -436,7 +436,7 @@
436 436
 
437 437
   // 详情
438 438
   .detail{
439
-    position: fixed;
439
+    position: absolute;
440 440
     left: 50%;
441 441
     top: 50%;
442 442
     z-index: 9999;

+ 4 - 3
src/app/views/disinfection-supply/disinfection-supply.component.ts

@@ -131,12 +131,13 @@ export class DisinfectionSupplyComponent implements OnInit, OnDestroy {
131 131
             _this.activeIndex = swiper.realIndex;
132 132
           },
133 133
           click: function(swiper, event){
134
-            console.log(swiper, event.target)
135 134
             const id = (event as any).target.getAttribute('data-id');
136 135
             const screentIndex = (event as any).target.getAttribute('data-screentIndex');
137 136
             const buildingIndex = (event as any).target.getAttribute('data-buildingIndex');
138
-            let department = _this.buildings[screentIndex][buildingIndex].departments.find(v => v.id == id);
139
-            _this.toDetail(department);
137
+            if(id !== null && screentIndex !== null && buildingIndex !== null){
138
+              let department = _this.buildings[screentIndex][buildingIndex].departments.find(v => v.id == id);
139
+              _this.toDetail(department);
140
+            }
140 141
           }
141 142
         },
142 143
       });