Merge remote-tracking branch 'origin/dev' into dev

data-ui/src/views/data/housingconstruction/log/index.vue

@@ -80,6 +80,11 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
       <el-table-column label="储罐名称" align="center" prop="storagetankName"/>
+      <el-table-column label="当前储量" align="center" prop="storageCapacity">
+        <template slot-scope="scope">
+          <span>{{ scope.row.storageCapacity }} L</span>
+        </template>
+      </el-table-column>
       <el-table-column label="液体液位" align="center" prop="level">
         <template slot-scope="scope">
           <span :class="getColumnClass(scope.row, 'level')">{{ scope.row.level }} m</span>
@@ -108,14 +113,6 @@
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-<!--          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['housingconstruction:log:edit']"
-          >修改
-          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -189,6 +186,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="当前储量" prop="storageCapacity">
+              <el-input v-model="form.storageCapacity" placeholder="请输入内部气压(单位: L)"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -257,6 +261,9 @@ export default {
         runState: [
           {required: true, message: "运行状态不能为空", trigger: "blur"}
         ],
+        storageCapacity: [
+          {required: true, message: "当前储量不能为空", trigger: "blur"}
+        ],
       }
     };
   },
@@ -311,7 +318,8 @@ export default {
         pressure: null,
         gasLeak: null,
         securityState: null,
-        runState: null
+        runState: null,
+        storageCapacity: null
       };
       this.resetForm("form");
     },
@@ -390,7 +398,7 @@ export default {
         level: '1',
         heat: '2',
         pressure: '3',
-        gasLeak: '4'
+        gasLeak: '4',
       };
       return runState.includes(columnMappings[columnProp]) ? 'red-font' : '';
     }

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetankLog.java

@@ -46,6 +46,12 @@ public class CenterdataTHousingconstructionStoragetankLog extends BaseBusinessEn
     private String storagetankName;
 
     /**
+     * 当前储量
+     */
+    @Excel(name = "当前储量")
+    private String storageCapacity;
+
+    /**
      * 液体液位
      */
     @Excel(name = "液体液位(单位: m)")

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionStoragetankLogMapper.xml

@@ -17,6 +17,7 @@
         <result property="deptName" column="dept_name"/>
         <result property="storagetankId" column="storagetank_id"/>
         <result property="storagetankName" column="storagetank_name"/>
+        <result property="storageCapacity" column="storage_capacity"/>
         <result property="level" column="level"/>
         <result property="heat" column="heat"/>
         <result property="pressure" column="pressure"/>
@@ -43,7 +44,8 @@
                a.pressure,
                a.gas_leak,
                a.security_state,
-               a.run_state
+               a.run_state,
+               a.storage_capacity
         from centerdata_t_housingconstruction_storagetank_log a
     </sql>
 
@@ -67,6 +69,7 @@
             a.gas_leak,
             a.security_state,
             a.run_state,
+            a.storage_capacity,
             hs.enterprise_name
         from centerdata_t_housingconstruction_storagetank_log a
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
@@ -102,6 +105,7 @@
             <if test="deptName != null">dept_name,</if>
             <if test="storagetankId != null">storagetank_id,</if>
             <if test="storagetankName != null">storagetank_name,</if>
+            <if test="storageCapacity != null">storage_capacity,</if>
             <if test="level != null">level,</if>
             <if test="heat != null">heat,</if>
             <if test="pressure != null">pressure,</if>
@@ -121,6 +125,7 @@
             <if test="deptName != null">#{deptName},</if>
             <if test="storagetankId != null">#{storagetankId},</if>
             <if test="storagetankName != null">#{storagetankName},</if>
+            <if test="storageCapacity != null">#{storageCapacity},</if>
             <if test="level != null">#{level},</if>
             <if test="heat != null">#{heat},</if>
             <if test="pressure != null">#{pressure},</if>
@@ -144,6 +149,7 @@
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="storagetankId != null">storagetank_id = #{storagetankId},</if>
             <if test="storagetankName != null">storagetank_name = #{storagetankName},</if>
+            <if test="storageCapacity != null">storage_capacity = #{storageCapacity},</if>
             <if test="level != null">level = #{level},</if>
             <if test="heat != null">heat = #{heat},</if>
             <if test="pressure != null">pressure = #{pressure},</if>

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -323,6 +323,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.enterprise_name enterpriseName,
             a.id storagetankId,
             a.name storagetankName,
+            b.storage_capacity storageCapacity,
             b.level,
             b.heat,
             b.pressure,
@@ -332,6 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from centerdata_t_housingconstruction_storagetank a
         left join (SELECT
                     b.storagetank_id,
+                    b.storage_capacity,
                     b.level,
                     b.heat,
                     b.pressure,