seimin 3 years ago
parent
commit
46dbe5728a

+ 1 - 1
proxy.conf.json

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

File diff suppressed because it is too large
+ 2187 - 523
src/app/views/hushijiandan/hushijiandan.component.html


+ 32 - 2
src/app/views/hushijiandan/hushijiandan.component.less

@@ -925,14 +925,44 @@
925 925
               line-height: 60px;
926 926
               cursor: default;
927 927
               overflow: hidden;
928
+              .cur {
929
+                height: 100%;
930
+                border-radius: 10px;
931
+                position: relative;
932
+                background-size: 400% 100%;
933
+                color: #333;
934
+                border: 1px solid #e5e9ed;
935
+                .text {
936
+                  text-align: center;
937
+                  position: absolute;
938
+                  left: 50%;
939
+                  top: 50%;
940
+                  transform: translate(-50%, -50%);
941
+                }
942
+                .arrow {
943
+                  width: 20px;
944
+                  text-align: center;
945
+                  position: absolute;
946
+                  font-size: 30px;
947
+                  top: 45%;
948
+                  transform: translateY(-50%);
949
+                  left: 140px; /* 移动130~150px */
950
+                  /* 调用动画 */
951
+                  animation-name: arrow_move;
952
+                  /* 持续时间 */
953
+                  animation-duration: 1s;
954
+                  /* 无限播放 */
955
+                  animation-iteration-count: infinite;
956
+                }
957
+              }
928 958
 
929 959
               & > div {
930 960
                 padding: 0 8px;
931 961
               }
932 962
 
933 963
               .checked {
934
-                background: #f9fafb;
935
-                border-bottom: 1px solid #e5e9ed;
964
+                background: @primary-color;
965
+                color: #fff;
936 966
               }
937 967
 
938 968
               .btn {

+ 3 - 1
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -162,7 +162,6 @@ export class HushijiandanComponent implements OnInit {
162 162
     this.getDeptTaskType();
163 163
     this.initForm();
164 164
     this.getAdvice();
165
-    this.getHistorySpecimen();
166 165
     this.getOrderSelectList();
167 166
     this.getCheckStatusLis();
168 167
     this.refreshSpecimenWorkOrderMsg();
@@ -2231,6 +2230,9 @@ export class HushijiandanComponent implements OnInit {
2231 2230
   checkedTableType: string = "other";
2232 2231
   checkTable(type) {
2233 2232
     this.checkedTableType = type;
2233
+    if (type === "historySpecimen") {
2234
+      this.getHistorySpecimen();
2235
+    }
2234 2236
   }
2235 2237
 
2236 2238
   // 意见箱表格数据

+ 10 - 0
src/common.less

@@ -327,3 +327,13 @@
327 327
   }
328 328
 }
329 329
 // list模板样式 end
330
+@keyframes arrow_move {
331
+  /* 开始状态 */
332
+  0% {
333
+    left: 140px;
334
+  }
335
+  /* 结束状态 */
336
+  100% {
337
+    left: 150px;
338
+  }
339
+}