Merge remote-tracking branch 'origin/master'

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleInfoServiceImpl.java

@@ -164,6 +164,7 @@ public class THiddenTroubleInfoServiceImpl implements ITHiddenTroubleInfoService
         tHiddenDangerStandingBook.setBeyondEnterpriseId(hiddenTroubleInfo.getBeyondEnterpriseId());
         tHiddenDangerStandingBook.setCreateTime(new Date());
         tHiddenDangerStandingBook.setHiddenTroubleType(hiddenTroubleInfo.getHiddenTroubleType());
+        tHiddenDangerStandingBook.setDealPlanUrl(hiddenTroubleInfo.getDealUrl());
         tHiddenDangerStandingBookMapper.insertTHiddenDangerStandingBook(tHiddenDangerStandingBook);
         return tHiddenTroubleInfoMapper.updateTHiddenTroubleInfo(tHiddenTroubleInfo);
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TStaEnterpriseInforServiceImpl.java

 package com.zehong.system.service.impl;
 
 import java.util.List;
+
+import com.zehong.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TStaEnterpriseInforMapper;
@@ -52,6 +54,7 @@ public class TStaEnterpriseInforServiceImpl implements ITStaEnterpriseInforServi
     @Override
     public int insertTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor)
     {
+        tStaEnterpriseInfor.setfCreateTime(DateUtils.getNowDate());
         return tStaEnterpriseInforMapper.insertTStaEnterpriseInfor(tStaEnterpriseInfor);
     }
 

zh-baseversion-system/src/main/resources/mapper/system/TInsSpotRecInforMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fMethod != null  and fMethod != ''"> and spot.f_method = #{fMethod}</if>
             <if test="govUploadState != null  and govUploadState != ''"> and spot.f_gov_upload_state = #{govUploadState}</if>
         </where>
+        order by spot.f_ins_spot_rec_infor_id desc
     </select>
     
     <select id="selectTInsSpotRecInforById" parameterType="Long" resultMap="TInsSpotRecInforResult">

zh-baseversion-system/src/main/resources/mapper/system/TStaEnterpriseInforMapper.xml

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isReport != null "> and is_report = #{isReport}</if>
             <if test="fYear != null "> and f_year = #{fYear}</if>
         </where>
+        order by f_create_time  desc
     </select>
 
     <select id="selectTStaEnterpriseInforById" parameterType="Long" resultMap="TStaEnterpriseInforResult">

zh-baseversion-system/src/main/resources/mapper/system/TTrainManageMapper.xml

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="publishTime != null "> and publish_time = #{publishTime}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTTrainManageById" parameterType="Long" resultMap="TTrainManageResult">

zh-baseversion-web/src/views/lpgRegulation/liqgasuser/index.vue

@@ -283,22 +283,22 @@
 
         <el-row>
         <el-col :span="11">
-          <el-form-item label="设备名称" prop="fDeviceName">
-            <el-input v-model="formDetailInfo.fDeviceName" placeholder="请输入设备名称" autocomplete="off"></el-input>
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model="formDetailInfo.deviceName" placeholder="请输入设备名称" autocomplete="off"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="11">
-        <el-form-item label="设备型号" prop="fDeviceModel">
-           <el-input v-model="formDetailInfo.fDeviceModel" placeholder="请输入设备型号" />
+        <el-form-item label="设备型号" prop="deviceModel">
+           <el-input v-model="formDetailInfo.deviceModel" placeholder="请输入设备型号" />
          </el-form-item>
         </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="11">
-          <el-form-item label="设备类型"  prop="fRelationDeviceType">
-              <el-input v-model="formDetailInfo.fRelationDeviceType" placeholder="请输入设备类型"> 
+          <el-form-item label="设备类型"  prop="relationDeviceType">
+              <el-input v-model="formDetailInfo.relationDeviceType" placeholder="请输入设备类型">
               </el-input>
           </el-form-item>
           </el-col>
@@ -312,9 +312,9 @@
 
         <el-row>
           <el-col :span="11">
-            <el-form-item label="设备安装时间"  prop="fDeviceInstallTime"> 
+            <el-form-item label="设备安装时间"  prop="deviceInstallTime">
               <el-date-picker clearable size="small"
-                v-model="formDetailInfo.fDeviceInstallTime"
+                v-model="formDetailInfo.deviceInstallTime"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择安装时间">
@@ -323,31 +323,31 @@
           </el-col>
 
           <el-col :span="11">
-          <el-form-item label="安装位置" prop="fDeviceInstallPosition" >
-                  <el-input v-model="formDetailInfo.fDeviceInstallPosition" placeholder="请输入安装位置" />
+          <el-form-item label="安装位置" prop="deviceInstallPosition" >
+                  <el-input v-model="formDetailInfo.deviceInstallPosition" placeholder="请输入安装位置" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="11">
-          <el-form-item label="负责人"  prop="fHead">
-              <el-input v-model="formDetailInfo.fHead" placeholder="请输入负责人"> 
+          <el-form-item label="负责人"  prop="head">
+              <el-input v-model="formDetailInfo.head" placeholder="请输入负责人">
               </el-input>
           </el-form-item>
           </el-col>
 
           <el-col :span="11">
-          <el-form-item label="联系电话" prop="fPhone" >
-                  <el-input v-model="formDetailInfo.fPhone" placeholder="请输入联系电话" />
+          <el-form-item label="联系电话" prop="phone" >
+                  <el-input v-model="formDetailInfo.phone" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="22">
-            <el-form-item label="探测介质" prop="fDetectionMedium" >
-              <el-input v-model="formDetailInfo.fDetectionMedium" placeholder="请输入探测介质" />
+            <el-form-item label="探测介质" prop="detectionMedium" >
+              <el-input v-model="formDetailInfo.detectionMedium" placeholder="请输入探测介质" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -775,7 +775,7 @@ export default {
 
     /**关联设备已经选中数据删除方法*/
     deleteDataListilInfo(row,index){
-      const deviceIds = row.fSafetyDeviceId;
+      const deviceIds = row.gasUserSafetyDeviceId;
       //判断form表单是否有id来验证是修改的删除还是添加的删除
       if (this.form.userId != null) {
         deleteSafetyDeviceInfo(deviceIds).then(response => {

zh-baseversion-web/src/views/space/archive/index.vue

@@ -75,7 +75,7 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -84,7 +84,7 @@
           :loading="exportLoading"
           @click="handleExport"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -697,23 +697,16 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSpace(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-            if (this.datalist != null && this.datalist.length > 0) {
             this.form.relationDeviceType = '3';
             var tConfinedSpaceParam = {
               tConfinedSpace: this.form,
               tDeviceInfoS: this.datalist
             }
-              //重新绑定修改后的关联设备
-              updateDetailInfoLists(JSON.stringify(tConfinedSpaceParam)).then(response => {
+            updateSpace(JSON.stringify(tConfinedSpaceParam)).then(response => {
+              this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
-            }
           } else {
             if (valid) {
               const deviceIds = this.ids;

zh-baseversion-web/src/views/statistic/hiddenStatisticAnalysis/index.vue

@@ -63,7 +63,7 @@
           <span
             class="dbtn"
             @click="checkFile(scope.row.dealPlanUrl)"
-            v-if="scope.row.dealPlan != ''"
+            v-if="scope.row.dealPlanUrl != '' && scope.row.dealPlanUrl != null"
           >
             <i class="el-icon el-icon-view"></i>查看/下载
           </span>
@@ -129,7 +129,7 @@
               <el-row>
                 <el-col :span="23">
                   <el-form-item label="处理方案:">
-                    <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
+                    <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlanUrl != '' && detailForm.dealPlanUrl != null">
                       <i class="el-icon el-icon-view"></i>查看/下载
                     </span>
                     <span v-else><el-input disabled/></span>