Commit 242ca58183f1f7499433e078a442e60d9104bd35

Authored by ljq
2 parents 3c9ec5b6 ec1404c6

Merge remote-tracking branch 'origin/lggj' into lggj

# Conflicts:
#	src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/main.css
... ... @@ -1048,6 +1048,64 @@ option.oil_station_opt {
1048 1048  
1049 1049  
1050 1050  
  1051 +
  1052 +.multi_plat_msg_pops .tests {
  1053 + display: block;
  1054 +}
  1055 +
  1056 +
  1057 +/** 智能调度 */
  1058 +.multi_plat_msg_pop_zndd {
  1059 + position: absolute;
  1060 + right: 12px;
  1061 + bottom: 12px;
  1062 + z-index: 99;
  1063 +}
  1064 +
  1065 +/** 催發 */
  1066 +.multi_plat_msg_pop_cf {
  1067 + position: absolute;
  1068 + right: 12px;
  1069 + bottom: 12px;
  1070 + z-index: 99;
  1071 + background: #ffffff
  1072 +}
  1073 +
  1074 + .multi_plat_msg_pops {
  1075 + color: grey;
  1076 + margin: 7px 0;
  1077 + padding: 7px 12px;
  1078 + cursor: pointer;
  1079 + min-width: 200px;
  1080 + box-sizing: border-box;
  1081 + min-height: 60px;
  1082 + border-radius: 5px;
  1083 + background-color: #e0effd;
  1084 +}
  1085 +
  1086 +
  1087 +.multi_plat_msg_pops .desc {
  1088 + display: block;
  1089 + font-size: 12px;
  1090 + color: #ff9d9d;
  1091 + text-align: right;
  1092 + margin-right: 5px;
  1093 +}
  1094 +.multi_plat_msg_pops .time {
  1095 + display: block;
  1096 + font-size: 12px;
  1097 + color: darkgray;
  1098 + margin-right: 5px;
  1099 +}
  1100 +.multi_plat_msg_pops .reminder {
  1101 + display: block;
  1102 + font-size: 15px;
  1103 + color: red;
  1104 + margin-right: 5px;
  1105 +}
  1106 +
  1107 +
  1108 +
1051 1109 /** 嵌入表单modal滚动条样式 */
1052 1110 #formFragmentModal::-webkit-scrollbar {
1053 1111 width: 10px;
... ...