Skip to content

Z
zh-baseversion-project
Commit ad8cad1a authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 9149e3c8 555e286b
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 102 deletions
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleInfoServiceImpl.java
View file @ ad8cad1a
......@@ -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
View file @ ad8cad1a
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
View file @ ad8cad1a
......@@ -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
View file @ ad8cad1a
......@@ -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
View file @ ad8cad1a
......@@ -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
View file @ ad8cad1a
......@@ -56,15 +56,15 @@
@click="downloadSuccessDataMethod"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
icon="el-icon-upload2"
size="mini"
@click="handleImport">导入</el-button>
</el-col>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -150,7 +150,7 @@
</el-col>
</el-row>
<el-row>
<el-row>
<el-col :span="11">
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型">
......@@ -158,7 +158,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" v-if="form.userType === '1'">
<el-form-item label="居住区(村、庄)" prop="villageId">
......@@ -167,7 +167,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
</el-row>
......@@ -188,8 +188,8 @@
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="21">
<el-form-item label="经纬度坐标" prop="longitude">
......@@ -218,7 +218,7 @@
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col :span="22">
......@@ -233,8 +233,8 @@
<div class="tableTitle">
<img :src="relationImg" style="width: 24px; height: 25px;position: relative; left: -355px; top: -12px; bottom: 8px;"/>
<span class="midText">安全装置</span>
<el-row :gutter="10" class="mb9">
<el-col :span="1.5">
<el-button
......@@ -244,10 +244,10 @@
size="mini"
@click="dialogFormVisible = true"
>新增</el-button>
</el-col>
</el-col>
</el-row>
</div>
<el-table v-loading="loadings" ref="multipleTable" :data="detailInfoList" tooltip-effect="dark" style="width: 100%" max-height="250">
<el-table-column label="设备名称" align="center" prop="deviceName" />
<el-table-column label="设备型号" align="center" prop="deviceModel" />
......@@ -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>
......@@ -308,53 +308,53 @@
<el-input v-model="formDetailInfo.fIotNo" placeholder="请输入物联网编号" />
</el-form-item>
</el-col>
</el-row>
</el-row>
<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="选择安装时间">
</el-date-picker>
</el-date-picker>
</el-form-item>
</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-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-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>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="insertListDetailInfo">提 交</el-button>
<el-button @click="dialogFormVisible=false">取 消</el-button>
</div>
</el-dialog>
......@@ -366,7 +366,7 @@
@close="dialogcancelFun"
@getPath="getPath"
/>
<!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
......@@ -387,24 +387,24 @@
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
<br>
<br>
<el-divider v-if="this.importError > 0 " content-position="left">错误数据导出分隔</el-divider>
<br>
<el-button
type="danger"
type="danger"
icon="el-icon-download"
size="small"
size="small"
@click="handleImportError"
v-if="this.importError > 0 "
>
下载导入时错误数据
下载导入时错误数据
</el-button>
<el-badge v-if="this.importError > 0 " :value="importError" class="item">
</el-badge>
</el-badge>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
......@@ -414,15 +414,15 @@
</el-dialog>
<!-- 燃气用户错误数据弹出框 -->
<el-dialog :title="importErrorShowTitle" :visible.sync="importErrorShow" width="400px" append-to-body>
<el-dialog :title="importErrorShowTitle" :visible.sync="importErrorShow" width="400px" append-to-body>
<el-form>
<el-form-item>
<div style="width: 100%; text-align: center;">
<el-button type="primary" @click="downloadImportError">下载</el-button>
<el-button type="danger" @click="clearImportErrorMethod">清除错误数据</el-button>
<el-button type="danger" @click="clearImportErrorMethod">清除错误数据</el-button>
</div>
</el-form-item>
</el-form>
</el-form>
</el-dialog>
</div>
......@@ -464,7 +464,7 @@ export default {
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/supervise/user/moreSheetImportExcelLpg" // todo
},
},
importError: null,
importErrorShow: false,
......@@ -580,7 +580,7 @@ export default {
// { min: 0, max: 30, message: "长度30位", trigger: "blur" },
],
},
//关联设备下级数据 表单校验
formDetailInfoRules:{
deviceName:[
......@@ -610,10 +610,10 @@ export default {
this.gasTypeOpers = response.data;
});
this.getNoPageListVillage();
this.countImportError();
},
methods: {
methods: {
// 下载燃气用户错误 按钮
handleImportError() {
......@@ -627,7 +627,7 @@ export default {
}
},
//自定义-模版下载-正确数据导出-燃气用户
downloadSuccessDataMethod() {
this.$showLoading.show()
......@@ -651,16 +651,16 @@ export default {
document.body.removeChild(downloadElement); //下载完成移除元素
window.URL.revokeObjectURL(href); //释放掉blob对象
this.$showLoading.hide()
return true
return true
})
},
// 下载燃气用户错误 按钮
downloadImportError() {
exportErrorData("1").then((res) =>{
downloadImportError() {
exportErrorData("1").then((res) =>{
let blob = new Blob([res], {type: 'data:application/vnd.ms-excel;base64;charset=utf-8'});
......@@ -680,8 +680,8 @@ export default {
window.URL.revokeObjectURL(href); //释放掉blob对象
return true
})
return true
})
this.importErrorShow = false;
......@@ -712,7 +712,7 @@ export default {
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit();
this.$refs.upload.submit();
},
handleImport(){
......@@ -722,7 +722,7 @@ export default {
/** 下载模板操作 */
importTemplate() {
downloadLiquefiedGasTemplate().then((res) =>{
downloadLiquefiedGasTemplate().then((res) =>{
let blob = new Blob([res], {type: 'data:application/vnd.ms-excel;base64;charset=utf-8'});
......@@ -742,9 +742,9 @@ export default {
window.URL.revokeObjectURL(href); //释放掉blob对象
return true
})
},
return true
})
},
// 文件上传处理中
handleFileUploadProgress(event,file,fileList) {
......@@ -756,8 +756,8 @@ export default {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
// this.getDataList();
// this.getDataList();
countImportError("1").then(response => {
this.importError = response.data;
if(this.importError === 0) {
......@@ -769,13 +769,13 @@ export default {
listUser(this.queryParams).then(response => {
this.userList = response.rows;
this.total = response.total;
this.total = response.total;
});
},
/**关联设备已经选中数据删除方法*/
deleteDataListilInfo(row,index){
const deviceIds = row.fSafetyDeviceId;
const deviceIds = row.gasUserSafetyDeviceId;
//判断form表单是否有id来验证是修改的删除还是添加的删除
if (this.form.userId != null) {
deleteSafetyDeviceInfo(deviceIds).then(response => {
......@@ -788,7 +788,7 @@ export default {
}
},
/**关联设备单条删除方法*/
deleteDetailInfo(row){
const deviceIds = row.gasUserSafetyDeviceId;
......@@ -841,7 +841,7 @@ export default {
insertListDetailInfo(){
console.log("this.detailInfoList" + this);
this.detailInfoList.push(this.formDetailInfo);
//数据表单重置
this.formDetailInfo={
relationDeviceType: null,
......@@ -856,8 +856,8 @@ export default {
};
this.dialogFormVisible = false;
},
},
/**关联设备添加方法*/
addSafetyDeviceInfo(){
this.$refs["formDetailInfo"].validate(valid => {
......@@ -903,7 +903,7 @@ export default {
this.safetyDeviceManageLoadings = false;
});
},
/** 下级数据重置按钮操作 搜索框重置*/
resetQueryDate(){
this.dateQueryParams={
......@@ -999,7 +999,7 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loadings = true;
//查询企业名称下拉框数据
selectTEnterprise().then(response => {
......@@ -1015,29 +1015,29 @@ export default {
this.devicePos = [];
} else {
this.devicePos = [response.data.longitude, response.data.latitude];
}
});
}
});
//查询关联设备信息数据
selectSafetyDeviceDetailInfo(userId).then(response => {
this.detailInfoList = response.data;
this.loadings = false;
});
});
},
/** 提交按钮 */
submitForm() {
if (this.form.userType === '1' && this.form.villageId == null ) {
alert("当用户类型是 ‘居民用户’ 时，居住区(村、庄) 必选");
return
return
}
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userId != null) {
var tDeviceInfon={
detectorUser:this.form,
gasuserSafetyDeviceInfoList:this.detailInfoList
......@@ -1046,9 +1046,9 @@ export default {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
});
} else {
var tDeviceInfon={
detectorUser:this.form,
gasuserSafetyDeviceInfoList:this.detailInfoList
......@@ -1128,7 +1128,7 @@ export default {
font-size: 16px;
color: rgba(101, 101, 101, 1);
}
.midText {
position: absolute;
left: 3%;
......@@ -1136,10 +1136,10 @@ export default {
padding: 0 15px;
transform: translateX(-50%) translateY(-50%);
}
.mb9 {
left: -60px;
bottom: 8px;
}
</style>
\ No newline at end of file
</style>
zh-baseversion-web/src/views/space/archive/index.vue
View file @ ad8cad1a
......@@ -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.form.relationDeviceType = '3';
var tConfinedSpaceParam = {
tConfinedSpace: this.form,
tDeviceInfoS: this.datalist
}
updateSpace(JSON.stringify(tConfinedSpaceParam)).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 => {
this.open = false;
this.getList();
});
}
} else {
if (valid) {
const deviceIds = this.ids;
......
zh-baseversion-web/src/views/statistic/hiddenStatisticAnalysis/index.vue
View file @ ad8cad1a
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment