修改十率六量异常

src/views/combatduty/Quantitative/index.vue

@@ -84,7 +84,7 @@
               </div>
             </div>
             <div class="wrap-top-left-top-item">
-              <div class="wrap-top-left-top-item-left">机 要 值 班 员</div>
+              <div class="wrap-top-left-top-item-left">机要值班员</div>
               <div class="wrap-top-left-top-item-right" style="margin-left:22px">
                 {{ this.GreatDuty1.confidentialName }}
               </div>
@@ -116,8 +116,9 @@
                 <!-- 值&nbsp;&nbsp;&nbsp;&nbsp; 班&nbsp;&nbsp;&nbsp;&nbsp; 分&nbsp;&nbsp;&nbsp;&nbsp; 队 -->
                 <span style="margin-right:10px">值</span><span style="margin-right:10px">班</span><span style="margin-right:10px">分</span><span>队</span>
               </div>
-              <div class="wrap-top-left-top-item-right">
+              <div class="wrap-top-left-top-item-right3">
                 {{ this.GreatDuty1.detachmentName }}
+                <!-- 发射一营 -->
               </div>
             </div>
           </div>
@@ -518,6 +519,12 @@ export default {
 };
 </script>
 <style scoped>
+.wrap-top-left-top-item-right3{
+  width: 100%;
+  text-align: center;
+  color: #30FDFF;
+  line-height: 35px;
+}
 #app {
   width: 100%;
   height: 100%;

src/views/combatduty/RateOfTen/index.vue

@@ -851,6 +851,13 @@ export default {
                 // console.log(data[1].value)
                 // 设置满编率
                 // var n = data[0].value / (data[1].value + data[0].value);
+                if (_this.form.bzrs == 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|满编率}`;
+                  return s;
+                } else {
                 var n = _this.form.bzrs / _this.form.sjrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
@@ -858,6 +865,7 @@ export default {
                   "\n" +
                   `{name|满编率}`;
                 return s;
+                }
               },
             },
             normal: {
@@ -889,15 +897,15 @@ export default {
       // 在位率
       var data2 = [
         {
-          value: _this.form.bzrs,
+          value: _this.form.zwrs,
           name: "在位人数",
         },
         {
-          value: _this.form.bzrs,
+          value: _this.form.zwrs,
           name: "未在位人数",
         },
       ];
-      data2[1].value = this.form.bzrs - this.form.zwrs;
+      data2[1].value = this.form.bzrs - data2[0].value;
       let data22 = this.form.zwrs;
 
       var data3 = [
@@ -906,11 +914,11 @@ export default {
           name: "指挥员/参谋员/专业技术人员/主战专业军士实际专业对口",
         },
         {
-          value: 2,
-          name: "不对口人数",
+          value: this.form.dkrs,
+          name: "实际人数",
         },
       ];
-      data3[1].value = this.form.sjrs - this.form.dkrs;
+      data3[1].value = this.form.sjrs - data3[0].value;
       // console.log(data3[1].value)
       var data4 = [
         {
@@ -922,7 +930,7 @@ export default {
           name: "未出动率",
         },
       ];
-      data4[1].value = this.form.bzrs - this.form.cdrs;
+      data4[1].value = this.form.bzrs - data4[0].value;
       let data44 = this.form.cdrs;
       var data5 = [
         {
@@ -1036,16 +1044,28 @@ export default {
               },
               formatter: function (params) {
                 if (_this.form.zwrs == 0) {
-                  var s = `异常`;
+                  var s = `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|在位率}`;
                   return s;
                 } else {
                   var n = _this.form.zwrs / _this.form.bzrs;
-                  var s =
+                  if(_this.form.bzrs==0){
+                    var s = `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|在位率}`;
+                  return s;
+                  }else{
+                    var s =
                     `{value|${(n * 100).toFixed()}%}` +
                     "\n" +
                     "\n" +
                     `{name|在位率}`;
                   return s;
+                  }
+                  
                 }
               },
             },
@@ -1071,9 +1091,9 @@ export default {
                 data3[0].value +
                 ")" +
                 ":" +
-                data[0].name +
+                data3[1].name +
                 "(" +
-                data[0].value +
+                data11 +
                 ")"
               );
             } else {
@@ -1083,9 +1103,9 @@ export default {
                 data3[0].value +
                 ")" +
                 ":" +
-                data[0].name +
+                data3[1].name +
                 "(" +
-                data[0].value +
+                data11 +
                 ")"
               );
             }
@@ -1112,8 +1132,11 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                if (_this.form.sjrs == 0) {
-                  var s = `异常`;
+                if (_this.form.dkrs == 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|对口率}`;
                   return s;
                 } else {
                   var n = _this.form.dkrs / _this.form.sjrs;
@@ -1172,7 +1195,10 @@ export default {
               },
               formatter: function (params) {
                 if (_this.form.cdrs == 0) {
-                  var s = `异常`;
+                  var s = `{value|${(0).toFixed()}%}` +
+                    "\n" +
+                    "\n" +
+                    `{name|出动率}`;
                   return s;
                 } else {
                   var n = _this.form.cdrs / _this.form.bzrs;
@@ -1232,6 +1258,13 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
+                 if (data5[0].value== 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|称职率}`;
+                  return s;
+                } else {
                 var n = data5[0].value / _this.form.zwrs;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
@@ -1239,6 +1272,7 @@ export default {
                   "\n" +
                   `{name|称职率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {
@@ -1286,13 +1320,21 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = data6[0].value / (data6[1].value + data6[0].value);
+                 if (_this.zhuangbei.zbsy== 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|装备满编率}`;
+                  return s;
+                } else {
+                var n = _this.zhuangbei.zbsy / _this.zhuangbei.zbbz;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
                   "\n" +
                   `{name|装备满编率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {
@@ -1350,6 +1392,13 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
+                if (_this.zhuangbei.zbky== 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|装备可用率}`;
+                  return s;
+                } else {
                 var n = _this.zhuangbei.zbky / _this.zhuangbei.zbsy;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
@@ -1357,6 +1406,7 @@ export default {
                   "\n" +
                   `{name|装备可用率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {
@@ -1415,6 +1465,13 @@ export default {
               },
               formatter: function (params) {
                 // var n = data8[0].value / (data8[1].value + data8[0].value);
+                 if (_this.zhuangbei.sjpt== 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|装备配套率}`;
+                  return s;
+                } else {
                 var n = _this.zhuangbei.sjpt / _this.zhuangbei.bzpt;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
@@ -1422,6 +1479,7 @@ export default {
                   "\n" +
                   `{name|装备配套率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {
@@ -1495,13 +1553,21 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                var n = data9[0].value / (data9[1].value + data9[0].value);
+                if (_this.zhuangbei.cczb== 0) {
+                  var s = `{value|${(0).toFixed()}%}` +
+                  "\n" +
+                  "\n" +
+                  `{name|装备战备储存率}`;;
+                  return s;
+                } else {
+                var n = _this.zhuangbei.cczb/ _this.zhuangbei.zbsy;
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
                   "\n" +
                   "\n" +
                   `{name|装备战备储存率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {
@@ -1559,6 +1625,13 @@ export default {
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
+                   if (_this.zhuangbei.zbcd== 0) {
+                  var s = `{value|${(0).toFixed()}%}`+
+                  "\n" +
+                  "\n" +
+                  `{name|装备出动率}`;
+                  return s;
+                } else {
                 var n = data10[0].value / (data10[1].value + data10[0].value);
                 var s =
                   `{value|${(n * 100).toFixed()}%}` +
@@ -1566,6 +1639,7 @@ export default {
                   "\n" +
                   `{name|装备出动率}`;
                 return s;
+                }
               },
             },
             // itemStyle: {