Skip to content

G
gassafety-progress
Commit 2a6c7f92 authored by 王晓倩's avatar 王晓倩
Browse files
Options

新增修改详情页布局调整，从业人员新增修改时照片累加问题，用户加装安全装置详情页的装置类型显示问题

parent 434c4f60
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 350 deletions
gassafetyprogress-system/src/main/java/com/zehong/system/domain/TComplainDeal.java
View file @ 2a6c7f92
......@@ -37,7 +37,7 @@ public class TComplainDeal extends BaseEntity
@Excel(name = "转办记录")
private String transferRecord;
@Excel(name = "反馈事件")
@Excel(name = "反馈时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dealTime;
/** 办理情况 */
......
gassafetyprogress-web/src/views/complainDeal/index.vue
View file @ 2a6c7f92
......@@ -159,7 +159,7 @@
<el-input v-model="form.complainName" placeholder="请输入投诉人姓名" :disabled="readonly"/>
</el-form-item>
<el-form-item label="指派单位" prop="complainAssignEnterproseId" >
<el-select style="width: 100%" v-model="form.complainAssignEnterproseName" placeholder="请选择预案等级" @change="qiyechang" :disabled="readonly">
<el-select style="width: 100%" v-model="form.complainAssignEnterproseName" placeholder="请选择指派单位" @change="qiyechang" :disabled="readonly">
<el-option
v-for = "dict in enterpriseList"
:key = "dict.enterpriseId"
......@@ -176,7 +176,7 @@
<el-input v-model="form.complainPhone" placeholder="请输入投诉人电话" :disabled="readonly"/>
</el-form-item>
<el-form-item label="指派人" prop="complainAssignManId">
<el-select v-model="form.complainAssignMan" placeholder="请选择预案等级" clearable style = "width: 100%" @change="manChang" :disabled="readonly">
<el-select v-model="form.complainAssignMan" placeholder="请选择指派人" clearable style = "width: 100%" @change="manChang" :disabled="readonly">
<el-option
v-for = "dict in peopleList"
:key = "dict.id"
......@@ -191,6 +191,16 @@
<el-form-item label="投诉事项" prop="complainMatter">
<el-input v-model="form.complainMatter" type = "textarea" placeholder="请输入投诉事项" :disabled="readonly"/>
</el-form-item>
<el-form-item label="反馈时间" prop="dealTime" :style="display">
<el-date-picker clearable size="small"
v-model="form.dealTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择反馈时间"
:disabled="readonly"
style="width: 280px">
</el-date-picker>
</el-form-item>
<el-form-item label="反馈内容" prop="dealCondition" :style="display">
<el-input v-model="form.dealCondition" type = "textarea" placeholder="请输入办理情况" :disabled="readonly"/>
</el-form-item>
......@@ -479,7 +489,7 @@ export default {
getComplainDeal(complainDealId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改投诉处置";
this.title = "投诉处置详情";
var statusName = this.selectDictLabel(this.taskStateOptions, row.complainStatus);
this.form.complainStatus=statusName;
});
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue
View file @ 2a6c7f92
......@@ -176,17 +176,17 @@
/>
<!-- 添加或修改燃气任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" @closed="dialogClose" @open="dialogOpen" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="800px" @closed="dialogClose" @open="dialogOpen" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item label="任务标题" prop="workTitle">
<el-input v-model="form.workTitle" placeholder="请输入任务标题" :disabled="isDetail"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务类型" prop="workType">
<el-select v-model="form.workType" placeholder="请选择任务类型" style="width: 350px" :disabled="isDetail">
<el-select v-model="form.workType" placeholder="请选择任务类型" style="width: 100%" :disabled="isDetail">
<el-option label="入户安检" value="1" />
<el-option label="巡检" value="2" />
<!--<el-option label="报警巡查" value="3" />-->
......@@ -195,16 +195,19 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="任务内容" prop="workContent">
<!--<editor v-model="form.workContent" :min-height="192" :readOnly="!s"/>-->
<editor v-if="isOpen" v-model="form.workContent" :min-height="192" :readOnly="isDetail"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item label="指派单位" prop="workAssignEnterproseId">
<!--<el-input v-model="form.workAssignEnterproseName" placeholder="请输入指派单位名称" />-->
<el-select v-model="form.workAssignEnterproseId" placeholder="请选择指派单位名称" style="width: 350px" @change="selectworkAssignEnterprose($event)" :disabled="isDetail || isEnterproser">
<el-select v-model="form.workAssignEnterproseId" placeholder="请选择指派单位名称" style="width: 100%" @change="selectworkAssignEnterprose($event)" :disabled="isDetail || isEnterproser">
<el-option
v-for="item in enterprises"
:key="item.enterpriseId"
......@@ -217,7 +220,7 @@
<el-col :span="12">
<el-form-item label="指派人" prop="workAssignMan">
<!--<el-input v-model="form.workAssignManId" placeholder="请输入指派人" />-->
<el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 350px" @change="selectInspection($event,'edit')" :disabled="isDetail" clearable>
<el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 100%" @change="selectInspection($event,'edit')" :disabled="isDetail" clearable>
<el-option
v-for="item in inspectors"
:key="item.userId "
......@@ -229,8 +232,8 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12" v-show="isDetail">
<el-form-item label="创建单位" prop="inspectionDate">
<el-col :span="11" v-show="isDetail">
<el-form-item label="创建单位" prop="workCreateEnterpriseName">
<el-input v-model="form.workCreateEnterpriseName" placeholder="请输入创建单位名称" :disabled="isDetail"/>
</el-form-item>
</el-col>
......@@ -240,21 +243,34 @@
v-model="form.inspectionDate"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择巡检时间" style="width: 350px" :disabled="isDetail">
placeholder="选择巡检时间" style="width: 100%" :disabled="isDetail">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="巡检路线" prop="inspectionRoute" v-show="form.workType=='2'">
<el-input v-model="form.inspectionRoute" type="textarea" placeholder="请输入巡检路线" :disabled="isDetail"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="问题描述" prop="problemDescription" v-show="form.workType=='3'">
<el-input v-model="form.problemDescription" type="textarea" placeholder="请输入问题描述" :disabled="isDetail"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="整改方案" prop="rectificationPlan" v-show="form.workType=='3' && isDetail && (form.workStatus =='2' || form.workStatus =='3')">
<el-input v-model="form.rectificationPlan" type="textarea" placeholder="请输入整改方案" :disabled="isDetail"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="反馈图片" prop="iconUrl" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3') && form.iconUrl !='' && form.iconUrl != null">
<!--<MyFileUpload
listType="picture-card"
......@@ -268,11 +284,17 @@
<el-image :src="form.iconUrl" :preview-src-list="[form.iconUrl]" style="width: auto;height: auto;" :z-index= "3000"></el-image>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="反馈信息" prop="rectificationResult" v-show="isDetail && (form.workStatus =='2' || form.workStatus =='3')">
<el-input v-model="form.rectificationResult" type="textarea" placeholder="请输入整改结果" :disabled="isDetail"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="11">
<el-form-item label="责任单位" prop="responsibleUnit">
<el-input v-model="form.responsibleUnit" placeholder="请输入责任单位" :disabled="isDetail"/>
</el-form-item>
......@@ -283,15 +305,18 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="截止日期" prop="expiryDate">
<el-date-picker clearable size="small"
v-model="form.expiryDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择截止日期" style="width: 350px" :disabled="isDetail">
placeholder="选择截止日期" style="width: 100%" :disabled="isDetail">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if="hiddenInfoList.length > 0">
<div class="hiddenInfo">隐患信息</div>
......
gassafetyprogress-web/src/views/regulation/device/index.vue
View file @ 2a6c7f92
......@@ -25,15 +25,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="所在地址" prop="deviceAddr">-->
<!-- <el-input-->
<!-- v-model="queryParams.deviceAddr"-->
<!-- placeholder="请输入所在地址"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button
type="primary"
......@@ -283,17 +274,6 @@
>新增</el-button
>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['device:device:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
......@@ -306,17 +286,6 @@
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- :loading="exportLoading"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['device:device:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getDataList"
......@@ -456,7 +425,7 @@
</el-dialog>
<!-- 添加或修改设备信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
......@@ -468,7 +437,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="设备编号" prop="deviceCode">
<el-input
v-model="form.deviceCode"
......@@ -489,7 +458,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="设备型号" prop="deviceModel">
<el-input
v-model="form.deviceModel"
......@@ -509,7 +478,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="权属单位" prop="beyondEnterpriseId">
<el-select
v-model="form.beyondEnterpriseId"
......@@ -517,6 +486,7 @@
maxlength="255"
:disabled="false"
clearable
style="width: 100%"
>
<el-option
v-for="item in test"
......@@ -530,30 +500,16 @@
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="经度" prop="longitude">-->
<!-- <el-input v-model="form.longitude" placeholder="请输入经度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="纬度" prop="latitude">-->
<!-- <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="21">
<el-col :span="23">
<el-form-item label="经纬度坐标" prop="longitude">
<el-col :span="9">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-col>
<el-col :span="9" style="margin-left: 15px">
<el-col :span="9" style="margin-left: 10px">
<el-input v-model="form.latitude" placeholder="请输入纬度" />
</el-col>
<el-col :span="3" style="margin-left: 35px">
<el-col :span="3" style="margin-left: 30px">
<el-button type="primary" plain @click="MapdialogFun"
>选择经纬度</el-button
>
......@@ -563,7 +519,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="上传照片">
<FileUpload
listType="picture"
......@@ -583,7 +539,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
......@@ -605,7 +561,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="最后巡检时间" prop="inspectionTime">
<el-date-picker
clearable
......@@ -614,6 +570,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择最后巡检时间"
style="width: 100%"
>
</el-date-picker>
</el-form-item>
......@@ -621,7 +578,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input
v-model="form.remarks"
......
gassafetyprogress-web/src/views/regulation/gasuser/index.vue
View file @ 2a6c7f92
......@@ -115,7 +115,7 @@
/>
<!-- 添加或修改燃气用户对话框 -->
<el-dialog :title="title" :visible.sync="open"width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open"width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
......@@ -125,7 +125,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="用户名称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户名称" />
</el-form-item>
......@@ -135,7 +135,7 @@
<el-row>
<el-col :span="11">
<el-form-item label="用户类型" prop="userType">
<el-select v-model="form.userType" placeholder="请选择用户类型">
<el-select v-model="form.userType" placeholder="请选择用户类型" style="width: 100%">
<el-option label="居民用户" value="1" />
<el-option label="商业用户" value="2" />
<el-option label="工业用户" value="3" />
......@@ -143,37 +143,23 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="经度" prop="longitude">-->
<!-- <el-input v-model="form.longitude" placeholder="请输入经度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="纬度" prop="latitude">-->
<!-- <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="21">
<el-col :span="23">
<el-form-item label="经纬度坐标" prop="longitude">
<el-col :span="9">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-col>
<el-col :span="9" style="margin-left: 15px">
<el-col :span="9" style="margin-left: 10px">
<el-input v-model="form.latitude" placeholder="请输入纬度"/>
</el-col>
<el-col :span="3" style="margin-left: 33px">
<el-col :span="3" style="margin-left: 30px">
<el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
</el-col>
</el-form-item>
......@@ -187,7 +173,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="电话" prop="phone">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
......@@ -195,7 +181,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" type="textarea" placeholder="请输入邮箱" />
</el-form-item>
......@@ -203,7 +189,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
</el-form-item>
......
gassafetyprogress-web/src/views/regulation/info/index.vue
View file @ 2a6c7f92
......@@ -153,32 +153,20 @@
/>
<!-- 添加或修改企业信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
<el-col :span="11">
<el-form-item label="企业名称" prop="enterpriseName">
<el-input v-model="form.enterpriseName" placeholder="请输入企业名称" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="注册地址" prop="registerAddress">
<el-input v-model="form.registerAddress" placeholder="请输入注册地址" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-form-item label="营业执照">
<FileUpload
listType="picture"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileList">
</FileUpload>
<el-col :span="23">
<el-form-item label="注册地址" prop="registerAddress">
<el-input v-model="form.registerAddress" placeholder="请输入注册地址" />
</el-form-item>
</el-col>
</el-row>
......@@ -189,9 +177,7 @@
<el-input v-model="form.legalRepresentative" placeholder="请输入法定代表人" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-col :span="12">
<el-form-item label="许可证有效期" prop="licenseValidityTime">
<el-date-picker
v-model="form.licenseValidityTime"
......@@ -199,41 +185,55 @@
placeholder="请选择许可证有效期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
style="width: 117%">
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="许可证编号" prop="licenseKey">
<el-input v-model="form.licenseKey" placeholder="请输入许可证编号" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="经营区域" prop="businessArea">
<el-input v-model="form.businessArea" placeholder="请输入经营区域" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="营业执照">
<FileUpload
listType="picture"
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileList">
</FileUpload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="年度监督检查情况" prop="annualSupervisionInspection">
<el-input v-model="form.annualSupervisionInspection" type="textarea" placeholder="请输入年度监督检查情况" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
......
gassafetyprogress-web/src/views/regulation/pipe/index.vue
View file @ 2a6c7f92
......@@ -155,9 +155,8 @@
/>
<!-- 添加或修改管道信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
......@@ -167,7 +166,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="管径" prop="pipeDiameter">
<el-input v-model="form.pipeDiameter" placeholder="请输入管径" >
<template slot="append">厘米</template>
......@@ -183,7 +182,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="走向" prop="pipeTrend">
<el-input v-model="form.pipeTrend" placeholder="请输入走向" />
</el-form-item>
......@@ -197,7 +196,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="材质" prop="pipeMaterial">
<el-input v-model="form.pipeMaterial" placeholder="请输入材质" />
</el-form-item>
......@@ -211,8 +210,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="建设年代" prop="buildDate" >
<el-date-picker
v-model="form.buildDate"
......@@ -238,7 +236,7 @@
<el-col :span="11">
<el-form-item label="权属单位" prop="beyondEnterpriseName">
<el-select style="width: 230%" v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-select style="width: 100%" v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
......@@ -246,9 +244,8 @@
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<el-col :span="19">
<el-form-item label="坐标" prop="coordinates">
<el-input v-model="form.coordinates" type="textarea" placeholder="请输入坐标" />
</el-form-item>
......@@ -258,17 +255,14 @@
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......
gassafetyprogress-web/src/views/regulation/project/index.vue
View file @ 2a6c7f92
......@@ -125,8 +125,8 @@
/>
<!-- 添加或修改工程项目信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
<el-form-item label="项目年度" prop="projectYear">
......@@ -139,7 +139,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="企业名称" prop="enterpriseCode">
<el-input :disabled="true" v-model="form.enterpriseCode" placeholder="企业名称" >
</el-input>
......@@ -160,7 +160,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="门站投资额" prop="gateStationInvestment">
<el-input :disabled="isGateStationDisabled" v-model="form.gateStationInvestment" placeholder="请输入门站投资额" >
<template slot="append">万元</template>
......@@ -183,7 +183,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="管道投资额" prop="pipeInvestment">
<el-input :disabled="isPipelineAmount" v-model="form.pipeInvestment" placeholder="请输入管道投资额" >
<template slot="append">万元</template>
......@@ -207,7 +207,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
......
gassafetyprogress-web/src/views/regulation/station/index.vue
View file @ 2a6c7f92
......@@ -19,15 +19,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="备注" label-width="40px" prop="remarks">-->
<!-- <el-input-->
<!-- v-model="queryParams.remarks"-->
<!-- placeholder="请输入备注"-->
<!-- clearable-->
<!-- size="small"-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -167,7 +158,7 @@
<!-- 添加或修改场站信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="11">
......@@ -182,7 +173,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="权属单位" prop="beyondEnterpriseName">
<el-select style="width: 100%" v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
......@@ -204,44 +195,23 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="建设单位" prop="buildUnit">
<el-input v-model="form.buildUnit" placeholder="请输入建设单位" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="权属单位" prop="beyondEnterpriseId">-->
<!-- <el-input v-model="form.beyondEnterpriseId" placeholder="请输入权属单位" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="权属单位名称" prop="beyondEnterpriseName">-->
<!-- <el-input v-model="form.beyondEnterpriseName" placeholder="请输入权属单位名称" />-->
<!-- </el-form-item>-->
<!-- <el-row>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="经度" prop="longitude">-->
<!-- <el-input v-model="form.longitude" placeholder="请输入经度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11">-->
<!-- <el-form-item label="纬度" prop="latitude">-->
<!-- <el-input v-model="form.latitude" placeholder="请输入纬度" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row>
<el-col :span="24">
<el-col :span="23">
<el-form-item label="经纬度坐标" prop="longitude">
<el-col :span="8">
<el-col :span="9">
<el-input v-model="form.longitude" placeholder="请输入经度" />
</el-col>
<el-col :span="8" style="margin-left: 20px">
<el-col :span="9" style="margin-left: 10px">
<el-input v-model="form.latitude" placeholder="请输入纬度"/>
</el-col>
<el-col :span="4" style="margin-left: 30px">
<el-col :span="3" style="margin-left: 30px">
<el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
</el-col>
</el-form-item>
......@@ -249,7 +219,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="上传照片">
<FileUpload
listType="picture"
......@@ -262,7 +232,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="场站名称" prop="siteStationName">
<el-input v-model="form.siteStationName" placeholder="请输入场站名称" />
</el-form-item>
......@@ -270,7 +240,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
......
gassafetyprogress-web/src/views/regulation/supervise/index.vue
View file @ 2a6c7f92
......@@ -165,7 +165,7 @@
/>
<!-- 添加或修改从业人员信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row>
......@@ -174,7 +174,7 @@
<el-input v-model="form.employedPeopleName" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号" />
</el-form-item>
......@@ -182,7 +182,7 @@
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="上传照片">
<FileUpload
listType="picture"
......@@ -208,9 +208,9 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="受聘企业名称" prop="beyondEnterpriseId">
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择名称" maxlength="255" :disabled="false" clearable>
<el-select v-model="form.beyondEnterpriseId" placeholder="请在下拉框中选择名称" maxlength="255" :disabled="false" clearable style="width: 100%;">
<el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
</el-option>
</el-select>
......@@ -225,9 +225,9 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="任职岗位" prop="peopleOccupation">
<el-select v-model="form.peopleOccupation" placeholder="请选择任职岗位">
<el-select v-model="form.peopleOccupation" placeholder="请选择任职岗位" style="width: 100%;">
<el-option label="主要负责人" value="1" />
<el-option label="安全管理人员" value="2" />
<el-option label="运行维护和抢修人员" value="3" />
......@@ -243,15 +243,22 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-col :span="12">
<el-form-item label="复检日期" prop="certificateChange">
<el-input v-model="form.certificateChange" placeholder="请输入复检日期" />
<el-date-picker
v-model="form.certificateChange"
type="date"
placeholder="请输入复检日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="22">
<el-col :span="23">
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
......@@ -391,6 +398,7 @@ export default {
avatarAddress:null,
};
this.resetForm("form");
this.fileList = [];
},
/** 搜索按钮操作 */
handleQuery() {
......@@ -490,8 +498,6 @@ export default {
}).catch(() => {});
},
}
};
</script>
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ 2a6c7f92
......@@ -321,6 +321,9 @@ export default {
},
created() {
this.getList();
this.getDicts("t_equipment_type").then(response => {
this.options = response.data;
});
},
methods: {
change(){
......@@ -409,18 +412,12 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset1();
this.getDicts("t_equipment_type").then(response => {
this.options = response.data;
});
this.open1 = true;
this.title1 = "添加用户加装安全装置台账";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset1();
this.getDicts("t_equipment_type").then(response => {
this.options = response.data;
});
getEquipment(row.safeEquipmentId).then(response => {
let data = response.data;
data.equipments = [];
......
gassafetyprogress-web/src/views/system/eventInfo/index.vue
View file @ 2a6c7f92
......@@ -145,7 +145,7 @@
<!-- 添加或修改事件处置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div class="division">
<div style="width: 45%">
<el-form-item label="事件名称" prop="eventTitle">
......@@ -171,9 +171,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="事件地点" prop="eventLocation">
<el-input v-model="form.eventLocation" placeholder="请输入事件地点" :disabled="readonly"/>
</el-form-item>
</div>
<div style="width: 50%">
......@@ -197,14 +194,15 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled="readonly"
placeholder="选择报案时间">
placeholder="选择报案时间"
style="width: 100%;">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注" :disabled="readonly"/>
</el-form-item>
</div>
</div>
<el-form-item label="事件地点" prop="eventLocation" style="width: 95%">
<el-input v-model="form.eventLocation" placeholder="请输入事件地点" :disabled="readonly"/>
</el-form-item>
<el-form-item label="事件处置信息" prop="eventDeal" style="width: 95%">
<el-input v-model="form.eventDeal" type="textarea" placeholder="请输入事件处置信息" :disabled="readonly"/>
</el-form-item>
......@@ -217,7 +215,7 @@
@resFun="getFileInfo"
@remove="listRemove"
:fileArr="fileList"
style="width: 70%"
style="width: 94%"
/>
<el-input v-show="false" disabled v-model="form.iconUrl"></el-input>
<!--<el-input v-model="form.iconUrl" type="textarea" placeholder="请输入内容" />-->
......@@ -235,8 +233,9 @@
<!--<el-form-item label="所属企业名称" prop="beyondEnterpriseName">-->
<!--<el-input v-model="form.beyondEnterpriseName" placeholder="请输入所属企业名称" />-->
<!--</el-form-item>-->
<el-form-item label="备注" prop="remarks" style="width: 95%">
<el-input v-model="form.remarks" placeholder="请输入备注" :disabled="readonly"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......
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