bugfix

src/views/dashboard/components/mixins.js

@@ -102,6 +102,9 @@ export const DetailMixins = {
       }
     },
     dateFormat(date, format) {
+      if(date == null || date == '-') {
+        return '-'
+      }
       date = new Date(date);
       var o = {
         'M+': date.getMonth() + 1, //month

src/views/dashboard/components/type5.vue

@@ -130,7 +130,7 @@
               </el-col>
               <el-col :span="colspan">
                 <div class="item_data">
-                  {{ form.baseInfo.leakyCableLength }}
+                  {{ form.baseInfo.leakyCableLength }}m
                 </div>
               </el-col>
             </el-row>
@@ -145,7 +145,7 @@
                     clearable
                     placeholder="请输入内容"
                     :disabled="flag"
-                  />
+                  ><template slot="append">dB/m</template></el-input>
                 </div>
               </el-col>
             </el-row>
@@ -155,7 +155,7 @@
                 <div class="item_name">漏缆速度衰减系数</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.reductRatio }}</div>
+                <div class="item_data">{{ form.baseInfo.reductRatio }}Np/m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -163,7 +163,7 @@
                 <div class="item_name">漏缆测试信号发射功率</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.sendPower }}</div>
+                <div class="item_data">{{ form.baseInfo.sendPower }}dB/m</div>
               </el-col>
             </el-row>
             <!-- <el-row class="text" :gutter="24">
@@ -179,7 +179,7 @@
                 <div class="item_name">跳线长度</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.jumperLength }}</div>
+                <div class="item_data">{{ form.baseInfo.jumperLength }}m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -187,7 +187,7 @@
                 <div class="item_name">插入器长度</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.inserterLength }}</div>
+                <div class="item_data">{{ form.baseInfo.inserterLength }}m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -196,7 +196,7 @@
               </el-col>
               <el-col :span="colspan">
                 <div class="item_data">
-                  {{ form.baseInfo.antennaFeederLength }}
+                  {{ form.baseInfo.antennaFeederLength }}m
                 </div>
               </el-col>
             </el-row>
@@ -287,7 +287,7 @@
               </el-col>
               <el-col :span="8">
                 <div class="item_data">
-                  {{ form.baseInfo.hundredMetersLoss }}
+                  {{ form.baseInfo.hundredMetersLoss }}dB/m
                 </div>
               </el-col>
               <el-col :span="6">
@@ -406,6 +406,7 @@ export default {
         for (let i = 0; i < this.statusAlarmfun.length; i++) {
           if (i % 2 !== 0) {
             if (this.statusAlarmfun[i].name === '最后更新时间') {
+              this.statusAlarmfun[i].value = this.dateFormat(this.statusAlarmfun[i].value, 'yyyy-MM-dd HH:mm:ss')
               arr1.push(this.statusAlarmfun[i])
             } else {
               arr2.push(this.statusAlarmfun[i])

src/views/dashboard/components/type6.vue

@@ -124,7 +124,7 @@
               </el-col>
               <el-col :span="colspan">
                 <div class="item_data">
-                  {{ form.baseInfo.feederLength }}
+                  {{ form.baseInfo.feederLength }}m
                 </div>
               </el-col>
             </el-row>
@@ -139,7 +139,8 @@
                     clearable
                     placeholder="请输入内容"
                     :disabled="flag"
-                  />
+                  >
+                  <template slot="append">dB/m</template></el-input>
                 </div>
               </el-col>
             </el-row>
@@ -149,7 +150,7 @@
                 <div class="item_name">天馈线速度衰减系数</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.reductRatio }}</div>
+                <div class="item_data">{{ form.baseInfo.reductRatio }}Np/m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -173,7 +174,7 @@
                 <div class="item_name">跳线长度</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.jumperLength }}</div>
+                <div class="item_data">{{ form.baseInfo.jumperLength }}m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -181,7 +182,7 @@
                 <div class="item_name">插入器长度</div>
               </el-col>
               <el-col :span="colspan">
-                <div class="item_data">{{ form.baseInfo.inserterLength }}</div>
+                <div class="item_data">{{ form.baseInfo.inserterLength }}m</div>
               </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
@@ -271,7 +272,7 @@
               </el-col>
               <el-col :span="8">
                 <div class="item_data">
-                  {{ form.baseInfo.feederLossMeters }}
+                  {{ form.baseInfo.feederLossMeters }}dB/m
                 </div>
               </el-col>
               <el-col :span="6">
@@ -388,6 +389,7 @@ export default {
         for (let i = 0; i < this.statusAlarmfun.length; i++) {
           if (i % 2 !== 0) {
             if (this.statusAlarmfun[i].name === '最后更新时间') {
+              this.statusAlarmfun[i].value = this.dateFormat(this.statusAlarmfun[i].value, 'yyyy-MM-dd HH:mm:ss')
               arr1.push(this.statusAlarmfun[i])
             } else {
               arr2.push(this.statusAlarmfun[i])