Merge branch 'master' of http://58.54.251.155:9090/xiao547607/smart-community-server-portal

src/views/base/alarmInfo-alert-list.vue

@@ -50,7 +50,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
-      <el-table-column prop="message" sort-by="message_" label="报警信息" width="450"></el-table-column>
+      <el-table-column prop="message" sort-by="message_" label="报警信息"></el-table-column>
       <!-- <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>

src/views/base/alarmInfo-fence-list.vue

@@ -50,7 +50,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column prop="createTime" sort-by="create_time" label="报警时间" width="180"></el-table-column>
-      <el-table-column prop="message" sort-by="message_" label="报警信息" width="450"></el-table-column>
+      <el-table-column prop="message" sort-by="message_" label="报警信息"></el-table-column>
       <!-- <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" disabled type="primary" icon="el-icon-video-camera" @click="handleOpenVideo(row)">查看回放</el-button>

src/views/base/rechange-detail.vue

@@ -14,12 +14,17 @@
   >
     <div class="user-panel" v-loading="loading">
       <el-form ref="form" :model="formModel" :rules="ruleValidate" :label-width="'100px'">
-        <el-form-item label="充值度数" prop="buyElectricity">
-          <el-input v-model="formModel.buyElectricity" placeholder="请输入充值度数" style="width:300px"></el-input>
+        <el-form-item label="充值金额" prop="buyAmount">
+          <el-input-number v-model="formModel.buyAmount" 
+          :precision="2" :step="1" :max="100"
+          placeholder="请输入充值金额" size="medium"></el-input-number>元
         </el-form-item>
         <el-form-item label="当前电价" prop="useTypeV">
           <span v-html="formModel.useTypeV" style="margin-right:10px;"></span>元/度
         </el-form-item>
+        <el-form-item label="充值度数" prop="buyElectricity" disabled>
+          <span v-html="formModel.buyElectricity" placeholder="请输入充值度数" style="width:300px"></span>
+        </el-form-item>
         <el-form-item label="用电类型" prop="useTypeN">
           <span v-html="formModel.useTypeN" style="margin-right:10px;"></span>
         </el-form-item>
@@ -40,7 +45,7 @@ export default {
   data() {
     return {
       ruleValidate: {
-        buyElectricity: [
+        buyAmount: [
           { required: true, message: "充值度数不能为空", trigger: "blur" },
           {
             type: "number",
@@ -55,9 +60,26 @@ export default {
       showDialog: true,
       loading: false,
       submitting: false,
-      formModel: {}
+      formModel: {
+        buyAmount : 0,
+        buyElectricity:0,
+        useTypeV: 0,
+        useTypeN: ''
+      }
     };
   },
+  watch: {
+    'formModel.buyAmount' : function(newVal,oldVal) {
+      console.log(`newVal=${newVal},userTypeV=${this.formModel.useTypeV}`);
+
+      if(this.formModel.useTypeV!=null && newVal!=null) {
+        this.formModel.buyElectricity = parseInt(parseFloat(newVal) / parseFloat(this.formModel.useTypeV));
+      }
+      else{
+        this.formModel.buyElectricity = 0;
+      }
+    }
+  },
   methods: {
     closeDialog() {
       this.$emit("close", false);
@@ -106,10 +128,10 @@ export default {
         self.loading = false;
 
         if (jsonData.result) {
-          self.formModel = jsonData.data;
+          //self.formModel = jsonData.data;
           self.formModel.useTypeN = jsonData.data.useTypeN;
           self.formModel.useTypeV = jsonData.data.useTypeV;
-          self.formModel.buyAmount = "0.00";
+          self.formModel.buyAmount = 0;
         } else {
           self.$message.error(jsonData.message + "");
         }