Selaa lähdekoodia

更改默认页数,总览Data为空处理,新建成功关闭弹窗

LXXXY 5 vuotta sitten
vanhempi
commit
96fab14dcd

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增表号-功能号 -->
   <div id="addTabFunNum">
-    <el-form :model='form' label-width="150px" ref="ruleForm" :rules="rules" style="height:500px;overflow:auto;">
+    <el-form :model='form' label-width="150px" ref="ruleForm" :rules="rules" style="height:300px;overflow:auto;">
       <el-form-item label="表号-功能号" prop="MeterFunc">
         <el-input v-model="form.MeterFunc"></el-input>
       </el-form-item>
@@ -14,7 +14,7 @@
       <el-form-item label="取直公式" prop="DataRuleContent">
         <el-input type="textarea" placeholder="请输入取值公式" v-model="form.DataRuleContent"></el-input>
       </el-form-item>
-      <el-form-item label="">
+      <el-form-item label="" style="text-align:right;">
         <el-button type="primary" @click="add()">新增</el-button>
         <el-button @click="$emit('closeDrawer')">取消</el-button>
       </el-form-item>
@@ -67,7 +67,10 @@ export default {
         if (valid) {
           this.form.Unit = this.form.Unit.toString();
           addTabFunNum(this.form, res => {
-
+            if(res.Result && res.Result=="success"){
+              
+              this.$emit('closeDrawer');
+            }
           });
         } else {
           console.log('error submit!!');

+ 4 - 4
src/components/point/report/tabFunNumOverview.vue

@@ -21,13 +21,13 @@
         <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop='Data.Data' label='对应值(单位)' show-overflow-tooltip min-width="90">
           <template slot-scope="scope">
-            <span>{{ scope.row.Data.Data }}</span>
+            <span>{{ scope.row.Data? scope.row.Data.Data : '' }}</span>
             <i @click="handleDrawer(scope.row, 0)" class="el-icon-s-data"></i>
           </template>
         </el-table-column>
         <el-table-column prop='Data.Time' label='获取时间' show-overflow-tooltip min-width="130">
           <template slot-scope="scope">
-            <span>{{ scope.row.Data.Time }}</span>
+            <span>{{ scope.row.Data? scope.row.Data.Time: '' }}</span>
             <i class="el-icon-refresh" @click="refreshThisRow(scope.row)"></i>
           </template>
         </el-table-column>
@@ -93,7 +93,7 @@ export default {
       },
       allTableData: [],//所有表格数据
       pageSizes: [10, 20, 50, 100],
-      pageSize: 10,
+      pageSize: 50,
       currentPage: 1,
       loading: false,//加载
       tabFunNum: null,//表号功能号
@@ -113,7 +113,7 @@ export default {
       if (index != 3)
         this.drawers[index].objId = row.MeterFunc;
       if (index == 2)
-        this.drawers[index].value = row.Data.Data;
+        this.drawers[index].value = row.Data? row.Data.Data : '';
       this.drawers[index].drawer = true;
     },
     //获取统计数据