瀏覽代碼

修改系统集成报告0未显示bug;动参错别字等

haojianlong 5 年之前
父節點
當前提交
71f7e7cccf

+ 2 - 2
src/components/point/dynamicdata/autoGroupRelaDialog.vue

@@ -3,10 +3,10 @@
     <div id="autoRelate">
       <p>请选择使用哪个信息点对应原始点位的设备标识:</p>
       <p>
-        <el-radio v-model="autoType" label="objectLocalName">{{TypeName}}实本地名称</el-radio>
+        <el-radio v-model="autoType" label="objectLocalName">{{TypeName}}实本地名称</el-radio>
       </p>
       <p>
-        <el-radio v-model="autoType" label="objectLocalCode">{{TypeName}}本地编码</el-radio>
+        <el-radio v-model="autoType" label="objectLocalCode">{{TypeName}}实例本地编码</el-radio>
       </p>
     </div>
     <span slot="footer" class="dialog-footer">

+ 5 - 6
src/components/point/report/addTabFunNum.vue

@@ -38,8 +38,7 @@ export default {
         Unit: '',//值单位
       },
       //下拉框选项
-      options: [
-      ],
+      options: [],
       //验证规则
       rules: {
         MeterFunc: [
@@ -48,11 +47,11 @@ export default {
         CollectInterval: [
           { required: true, message: '请输入采集间隔时间', trigger: 'blur' }
         ],
-        Unit: [
-          { required: true, message: '请选择值单位', trigger: 'change' }
-        ],
+        // Unit: [
+        //   { required: true, message: '请选择值单位', trigger: 'change' }
+        // ],
         DataRuleContent: [
-          { required: true, message: '请填写取公式', trigger: 'blur' }
+          { required: true, message: '请填写取公式', trigger: 'blur' }
         ]
       }
     }

+ 2 - 2
src/components/point/report/integrateStatistics.vue

@@ -10,9 +10,9 @@
     <div class="statistics-chart" style="border-top:5px solid #eee;min-height: calc(65% - 3px);">
       <div class="chart-title">共包含原始点位:{{ originalPoint }} 个</div>
       <div style="padding:15px 10%;line-height:2;">
-        1点位对多表号功能号:{{ pointData.oneToM }}
+        1点位对多表号功能号:{{ pointData.oneToM.toString() }}
         <br />
-        多点位对1表号功能号:{{ pointData.mToOne }}
+        多点位对1表号功能号:{{ pointData.mToOne.toString() }}
         <!-- 查看表号功能号一对多多对一总览 -->
         <el-button @click="showOverview" type="info" icon="el-icon-arrow-right" circle
           style="margin:-25px 0 0 50px;background:rgb(121, 187, 255);color:rgb(225, 228, 229);border:none;"></el-button>