Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

ems-ui/package.json

@@ -50,6 +50,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "js-base64": "^3.7.7",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",

ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -125,7 +125,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="倍率" prop="magnification">
-              <el-input v-model="form.magnification" placeholder="请输入倍率" />
+              <el-input v-model="form.magnification" oninput="value=value.replace(/^0(0+|\d+)|[^\d]+/g,'')" placeholder="请输入倍率" />
             </el-form-item>
             <el-form-item label="规格描述" prop="specDesc">
               <el-input v-model="form.specDesc" placeholder="请输入规格描述" />

ems-ui/src/views/basecfg/powerbox/index.vue

@@ -91,42 +91,44 @@
         </el-form-item>
         <el-form-item label="电气元件" prop="elecEqptList" >
           <el-table v-loading="loading" :data="form.elecEqptList" max-height="200px">
-            <el-table-column label="元件编码" align="center" width="100" prop="eqptCode">
+            <el-table-column label="元件编码" align="center"  prop="eqptCode">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.eqptCode" placeholder="元件编码" />
               </template>
             </el-table-column>
-            <el-table-column label="外系统编码" align="center" width="120" prop="extEqptCode">
+            <el-table-column label="外系统编码" align="center"  prop="extEqptCode">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.extEqptCode" placeholder="外系统编码" />
               </template>
             </el-table-column>
-            <el-table-column label="元件类型" align="center" width="100" prop="eqptName">
+            <el-table-column label="元件类型" align="center"  prop="eqptName">
               <template slot-scope="scope">
-                <el-input size="mini" v-model="scope.row.eqptName" placeholder="元件类型" />
+                <el-select v-model="scope.row.eqptType" size="mini" clearable style="width:100%">
+                  <el-option v-for="item in eqptTypeOptions" :label="item.typeName" :key="item.typeCode" :value="item.typeCode"></el-option>
+                </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="元件型号" align="center" width="100" prop="eqptSpec">
+            <el-table-column label="元件型号" align="center"  prop="eqptSpec">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.eqptSpec" placeholder="元件型号" />
               </template>
             </el-table-column>
-            <el-table-column label="额定电压" align="center" width="100" prop="ratedVoltage">
+            <el-table-column label="额定电压" align="center" prop="ratedVoltage">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.ratedVoltage" placeholder="额定电压" />
               </template>
             </el-table-column>
-            <el-table-column label="额定电流" align="center" width="100" prop="ratedCurrent">
+            <el-table-column label="额定电流" align="center"  prop="ratedCurrent">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.ratedCurrent" placeholder="额定电流" />
               </template>
             </el-table-column>
-            <el-table-column label="上游元件" align="center" width="100" prop="parentEqpt">
+            <el-table-column label="上游元件" align="center"  prop="parentEqpt">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.parentEqpt" placeholder="上游元件" />
               </template>
             </el-table-column>
-            <el-table-column label="计量设备" align="center" width="100" prop="meterDevice">
+            <el-table-column label="计量设备" align="center"  prop="meterDevice">
               <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.meterDevice" placeholder="计量设备" />
               </template>
@@ -155,6 +157,7 @@
 <script>
 import { listPowerBox, getPowerBox, delPowerBox, addPowerBox, updatePowerBox } from '@/api/device/powerbox'
 import { listTotalArea } from '@/api/basecfg/area'
+import {listElecEqptType} from '@/api/basecfg/elecEqptType.js'
 
 export default {
   name: 'Box',
@@ -212,18 +215,31 @@ export default {
       rules: {
         boxCode: [{ required: true, message: '箱柜代码不能为空', trigger: 'blur' }],
         boxType: [{ required: true, message: '箱体类型不能为空', trigger: 'change' }]
-      }
+      },
+      eqptTypeOptions:[]
     }
   },
   created() {
     this.getAreaOptions()
     this.getList()
+    this.getEqptType()
   },
   methods: {
+    getEqptType(){
+      listElecEqptType().then(({rows})=>{
+        this.eqptTypeOptions =rows
+      })
+    },
     addSub() {
       this.form.elecEqptList.push({
-        name: '',
-        code: ''
+        eqptCode: '',
+        extEqptCode: '',
+        eqptType:'',
+        eqptSpec:'',
+        ratedVoltage:'',
+        ratedCurrent:'',
+        parentEqpt:'',
+        meterDevice:'',
       })
     },
     deleteSub(index) {
@@ -284,6 +300,9 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          this.form.elecEqptList.forEach(item=>{
+            item.boxCode = this.form.boxCode
+          })
           if (this.form.id != null) {
             updatePowerBox(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')

ems-ui/src/views/basecfg/tag/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标签模型" prop="tagModel">
+      <el-form-item label="标签分类" prop="tagModel">
         <el-select v-model="queryParams.tagModel">
           <el-option v-for="item in tagModelOptions" :label="item.name" :value="item.code" :key="item.code" />
         </el-select>
@@ -176,7 +176,7 @@ export default {
       // 表单校验
       rules: {
         tagModel: [
-          { required: true, message: "标签模型不能为空", trigger: "blur" }
+          { required: true, message: "标签分类不能为空", trigger: "blur" }
         ],
         tagCode: [
           { required: true, message: "标签代码不能为空", trigger: "blur" }

ems-ui/src/views/mgr/charging.vue

@@ -1,43 +1,28 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeTab" @tab-click="handleTabChange">
-      <el-tab-pane label="总览" name="first">
-        <el-row :gutter="20">
-          <el-col :span="4" :xs="24">
-            <div class="head-container">
-              <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
-                        style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
-                       node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-          <el-col :span="20" :xs="24">
-            <!-- 总览主体界面 -->
-          </el-col>
-        </el-row>
-      </el-tab-pane>
-      <el-tab-pane label="个户" name="second">
-        <el-row :gutter="20">
-          <el-col :span="4" :xs="24">
-            <div class="head-container">
-              <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
-                        style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
-                       node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-          <el-col :span="20" :xs="24">
-            <!-- 总览主体界面 -->
-          </el-col>
-        </el-row>
-      </el-tab-pane>
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container">
+          <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree"
+                   node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <el-tabs v-model="activeTab" @tab-click="handleTabChange">
+          <el-tab-pane label="总览" name="first">
 
-    </el-tabs>
+          </el-tab-pane>
+          <el-tab-pane label="个户" name="second">
 
+          </el-tab-pane>
+
+        </el-tabs>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -45,7 +30,8 @@
 import { areaTreeSelect, areaTreeSelectByTag } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { addMeterReading, getLastRecord, listMeterReadingByParam, updateMeterReading } from '@/api/device/meterRead'
+
+
 export default {
   name: 'Device',
   components: { Treeselect },
@@ -94,10 +80,10 @@ export default {
     }
   },
   created() {
+    this.handleTabChange();
     this.getList()
   },
   methods: {
-    /** 查询计量设备列表 */
     getList() {
 
     },
@@ -106,7 +92,6 @@ export default {
       if (this.activeTab === 'first') {
         this.getAreaTree('Area')
       } else if (this.activeTab === 'second') {
-        // 水表抄表
         this.getAreaTreeByTag('Zoning', 'Area_01')
       }
       this.handleQuery()

ems-ui/src/views/task/report/ReportForm.vue

@@ -38,6 +38,7 @@
 
 <script>
 import { addInspectionReport, getInspectionReport, updateInspectionReport } from '@/api/task/inspectionReport';
+import { Base64 } from 'js-base64';
 
 export default {
   name: 'ReportForm',
@@ -132,7 +133,12 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs['form'].validate(valid => {
+
         if (valid) {
+
+          if (this.form.resultMsg) {
+            this.form.resultMsg = Base64.encode(this.form.resultMsg);
+          }
           if (this.form.id != null) {
             updateInspectionReport(this.form).then(response => {
               this.$modal.msgSuccess('修改成功');

ems-ui/src/views/task/report/index.vue

@@ -183,8 +183,9 @@
 
 <script>
 import {
-  listInspectionReport, getInspectionReport, delInspectionReport, addInspectionReport, updateInspectionReport,
+  addInspectionReport, delInspectionReport, getInspectionReport, listInspectionReport, updateInspectionReport,
 } from '@/api/task/inspectionReport';
+import { Base64 } from 'js-base64';
 
 export default {
   name: 'InspectionReport',
@@ -305,6 +306,9 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
+          if (this.form.resultMsg) {
+            this.form.resultMsg = Base64.encode(this.form.resultMsg);
+          }
           if (this.form.id != null) {
             updateInspectionReport(this.form).then(response => {
               this.$modal.msgSuccess('修改成功');