二次修改

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test46/test46.css

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .box46 .container {
   margin: 50px auto;
   width: 60%;
@@ -102,109 +101,3 @@
 .box46 .floor-dist {
   width: 100%;
 }
-=======
-.box46 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box46 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box46 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box46 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box46 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box46 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box46 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box46 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box46 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box46 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box46 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box46 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box46 .floor-dist {
-  width: 100%;
-}
-}
->>>>>>> a04b695c18c613b06551a317ba5c584a587358c0

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test47/test47.css

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .box47 .container {
   margin: 50px auto;
   width: 60%;
@@ -102,108 +101,3 @@
 .box47 .floor-dist {
   width: 100%;
 }
-=======
-.box47 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box47 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box47 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box47 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box47 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box47 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box47 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box47 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box47 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box47 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box47 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box47 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box47 .floor-dist {
-  width: 100%;
-}
->>>>>>> a04b695c18c613b06551a317ba5c584a587358c0

spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test48/test48.css

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .box48 .container {
   margin: 50px auto;
   width: 60%;
@@ -34,32 +33,11 @@
   border: 1px solid;
   border-color: #bfbfbf #b3b3b3 #9e9e9e;
   border-radius: 1rem;
-  background-image: -webkit-linear-gradient(
-    top,
-    #f0f0f0 0%,
-    #dbdbdb 70%,
-    #cccccc 100%
-  );
-  background-image: -moz-linear-gradient(
-    top,
-    #f0f0f0 0%,
-    #dbdbdb 70%,
-    #cccccc 100%
-  );
-  background-image: -o-linear-gradient(
-    top,
-    #f0f0f0 0%,
-    #dbdbdb 70%,
-    #cccccc 100%
-  );
-  background-image: linear-gradient(
-    to bottom,
-    #f0f0f0 0%,
-    #dbdbdb 70%,
-    #cccccc 100%
-  );
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3),
-    0 1px 2px rgba(0, 0, 0, 0.2);
+  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
+  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 .box48 .progress > span span {
@@ -70,7 +48,7 @@
   text-shadow: 0 1px rgba(255, 255, 255, 0.4);
 }
 .box48 .progress > span::before {
-  content: "";
+  content: '';
   position: absolute;
   top: 0;
   bottom: 0;
@@ -91,220 +69,35 @@
 .box48 .progress .green {
   background: #85c440;
   border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(
-    top,
-    #b7dc8e 0%,
-    #99ce5f 70%,
-    #85c440 100%
-  );
-  background-image: -moz-linear-gradient(
-    top,
-    #b7dc8e 0%,
-    #99ce5f 70%,
-    #85c440 100%
-  );
-  background-image: -o-linear-gradient(
-    top,
-    #b7dc8e 0%,
-    #99ce5f 70%,
-    #85c440 100%
-  );
-  background-image: linear-gradient(
-    to bottom,
-    #b7dc8e 0%,
-    #99ce5f 70%,
-    #85c440 100%
-  );
+  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
+  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
 }
 .box48 .progress .orange {
   background: #f2b63c;
   border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(
-    top,
-    #f8da9c 0%,
-    #f5c462 70%,
-    #f2b63c 100%
-  );
-  background-image: -moz-linear-gradient(
-    top,
-    #f8da9c 0%,
-    #f5c462 70%,
-    #f2b63c 100%
-  );
-  background-image: -o-linear-gradient(
-    top,
-    #f8da9c 0%,
-    #f5c462 70%,
-    #f2b63c 100%
-  );
-  background-image: linear-gradient(
-    to bottom,
-    #f8da9c 0%,
-    #f5c462 70%,
-    #f2b63c 100%
-  );
+  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
+  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
 }
 .box48 .progress .red {
   background: #db3a27;
   border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(
-    top,
-    #ea8a7e 0%,
-    #e15a4a 70%,
-    #db3a27 100%
-  );
-  background-image: -moz-linear-gradient(
-    top,
-    #ea8a7e 0%,
-    #e15a4a 70%,
-    #db3a27 100%
-  );
-  background-image: -o-linear-gradient(
-    top,
-    #ea8a7e 0%,
-    #e15a4a 70%,
-    #db3a27 100%
-  );
-  background-image: linear-gradient(
-    to bottom,
-    #ea8a7e 0%,
-    #e15a4a 70%,
-    #db3a27 100%
-  );
+  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
+  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
 }
 .box48 .progress .blue {
   background: #5aaadb;
   border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(
-    top,
-    #aed5ed 0%,
-    #7bbbe2 70%,
-    #5aaadb 100%
-  );
-  background-image: -moz-linear-gradient(
-    top,
-    #aed5ed 0%,
-    #7bbbe2 70%,
-    #5aaadb 100%
-  );
-  background-image: -o-linear-gradient(
-    top,
-    #aed5ed 0%,
-    #7bbbe2 70%,
-    #5aaadb 100%
-  );
-  background-image: linear-gradient(
-    to bottom,
-    #aed5ed 0%,
-    #7bbbe2 70%,
-    #5aaadb 100%
-  );
+  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
+  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
 }
 .box48 .floor-dist {
   width: 100%;
 }
-=======
-.box48 .container {
-  margin: 50px auto;
-  width: 60%;
-  margin-left: 1.8rem;
-}
-.box48 .container > div {
-  margin-top: 8%;
-  /* margin-bottom: 5%; */
-}
-.box48 .progress {
-  height: 0.09rem;
-  background: #ebebeb;
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-radius: 1rem;
-  position: relative;
-}
-.box48 .progress .proDesc {
-  position: absolute;
-  top: -70% !important;
-  left: -43%;
-  color: #fff;
-}
-.box48 .progress > span {
-  position: relative;
-  float: left;
-  margin: 0 -1px;
-  min-width: 30px;
-  height: 0.09rem;
-  line-height: 0.2rem;
-  text-align: right;
-  background: #cccccc;
-  border: 1px solid;
-  border-color: #bfbfbf #b3b3b3 #9e9e9e;
-  border-radius: 1rem;
-  background-image: -webkit-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -moz-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: -o-linear-gradient(top, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  background-image: linear-gradient(to bottom, #f0f0f0 0%, #dbdbdb 70%, #cccccc 100%);
-  -webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 0, 0.2);
-}
-.box48 .progress > span span {
-  padding: 0 8px;
-  font-weight: bold;
-  color: #404040;
-  color: rgba(0, 0, 0, 0.7);
-  text-shadow: 0 1px rgba(255, 255, 255, 0.4);
-}
-.box48 .progress > span::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1;
-  height: 0.2rem;
-  background: url(../../images/progress.png) 0 0 repeat-x;
-  border-radius: 1rem;
-}
-.box48 .progress .txt {
-  position: absolute;
-  right: -15%;
-  background: none;
-  border: none;
-  color: #fff;
-}
-.box48 .progress .green {
-  background: #85c440;
-  border-color: #78b337 #6ba031 #568128;
-  background-image: -webkit-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -moz-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: -o-linear-gradient(top, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-  background-image: linear-gradient(to bottom, #b7dc8e 0%, #99ce5f 70%, #85c440 100%);
-}
-.box48 .progress .orange {
-  background: #f2b63c;
-  border-color: #f0ad24 #eba310 #c5880d;
-  background-image: -webkit-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -moz-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: -o-linear-gradient(top, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-  background-image: linear-gradient(to bottom, #f8da9c 0%, #f5c462 70%, #f2b63c 100%);
-}
-.box48 .progress .red {
-  background: #db3a27;
-  border-color: #c73321 #b12d1e #8e2418;
-  background-image: -webkit-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -moz-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: -o-linear-gradient(top, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-  background-image: linear-gradient(to bottom, #ea8a7e 0%, #e15a4a 70%, #db3a27 100%);
-}
-.box48 .progress .blue {
-  background: #5aaadb;
-  border-color: #459fd6 #3094d2 #277db2;
-  background-image: -webkit-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -moz-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: -o-linear-gradient(top, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-  background-image: linear-gradient(to bottom, #aed5ed 0%, #7bbbe2 70%, #5aaadb 100%);
-}
-.box48 .floor-dist {
-  width: 100%;
-}
->>>>>>> a04b695c18c613b06551a317ba5c584a587358c0