zxr 3 years ago
parent
commit
f4cb6f4821
2 changed files with 18 additions and 8 deletions
  1. 10 6
      src/views/combatduty/Quantitative/index.vue
  2. 8 2
      src/views/taishi/index.vue

+ 10 - 6
src/views/combatduty/Quantitative/index.vue

@@ -45,7 +45,7 @@
                 一 分 队 人 数
               </div>
               <div class="wrap-top-left-top-item-right2">
-                {{ this.BaseOnDuty.detachmentoneNumber }}人
+                <span> {{ this.BaseOnDuty.detachmentoneNumber }}</span>
               </div>
             </div>
           </div>
@@ -68,7 +68,7 @@
                 二 分 队 人 数
               </div>
               <div class="wrap-top-left-top-item-right2">
-                {{ this.BaseOnDuty.detachmentwoNumber }}人
+                  <span>{{ this.BaseOnDuty.detachmentwoNumber }}</span>
               </div>
             </div>
           </div>
@@ -711,15 +711,19 @@ body {
   height: 100%;
   font-size: 16px;
   line-height: 35px;
-  display: flex;
+  /* display: flex;
   align-items: center;
   justify-content: center;
-  margin-left: 20px;
+  margin-left: 10px; */
+  text-align: center;
   font-family: Source Han Sans CN;
   font-weight: 400;
   color: #30fdff;
-  letter-spacing: 3.5em; /*如果需要y个字两端对齐,则为(x-y)/(y-1),这里是(4-2)/(2-1)=2em */
-  margin-right: -3.5em; /*同上*/
+  letter-spacing: 0.2rem; /*如果需要y个字两端对齐,则为(x-y)/(y-1),这里是(4-2)/(2-1)=2em*/
+  /* margin-right: -3.5em; 同上 */
+}
+.wrap-top-left-top-item-right2 span{
+  margin-right:10px;
 }
 .wrap-top-left-top-head {
   width: 100%;

+ 8 - 2
src/views/taishi/index.vue

@@ -1218,6 +1218,12 @@ export default {
           "#39B3FF",
           "#39B3FF",
           "#39B3FF",
+          "#39B3FF",
+          "#39B3FF",
+          "#39B3FF",
+          "#39B3FF",
+          "#39B3FF",
+          "#39B3FF",
         ];
         const option4 = {
           dataZoom: [
@@ -1229,7 +1235,7 @@ export default {
               show: true,
               yAxisIndex: [0],
               left: "95%",
-              handleColor: "#68789c",
+              handleColor: "#39B3FF",
               startValue: z, //数据窗口范围的起始百分比
               endValue: s,
             },
@@ -1256,7 +1262,7 @@ export default {
               return (
                 params[0].name +
                 "<br/>" +
-                "<span style='display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:rgba(36,207,233,0.9)'></span>" +
+                "<span style='display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:'></span>" +
                 // params[0].seriesName + ' : ' + Number((params[0].value.toFixed(4) / 10000).toFixed(2)).toLocaleString() + ' <br/>'
                 params[0].seriesName +
                 " : " +