Skip to content

G
gassafety-progress
Commit 0580795f authored by wuqinghua's avatar wuqinghua
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a6a9632f 612dc52e
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 35 deletions
gassafetyprogress-system/src/main/resources/mapper/system/THiddenTroubleInfoMapper.xml
View file @ 0580795f
......@@ -26,18 +26,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTHiddenTroubleInfoVo">
select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks from t_hidden_trouble_info
select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type, longitude, latitude, picture_url, hidden_trouble_describe, report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks,beyond_enterprise_id from t_hidden_trouble_info
</sql>
<select id="selectTHiddenTroubleInfoList" parameterType="THiddenTroubleInfo" resultMap="THiddenTroubleInfoResult">
<include refid="selectTHiddenTroubleInfoVo"/>
<where>
is_del='0'
<if test="workId != null "> and work_id = #{workId}</if>
<if test="hiddenTroubleLevel != null and hiddenTroubleLevel != ''"> and hidden_trouble_level = #{hiddenTroubleLevel}</if>
<if test="hiddenTroubleType != null and hiddenTroubleType != ''"> and hidden_trouble_type = #{hiddenTroubleType}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="pictureUrl != null and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
<if test="hiddenTroubleDescribe != null and hiddenTroubleDescribe != ''"> and hidden_trouble_describe = #{hiddenTroubleDescribe}</if>
<if test="reportTime != null "> and report_time = #{reportTime}</if>
<if test="beyondEnterpriseId != null and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="hiddenTroubleName != null and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
<if test="reportPerson != null and reportPerson != ''"> and report_person = #{reportPerson}</if>
<if test="hiddenTroubleDealStatus != null and hiddenTroubleDealStatus != ''"> and hidden_trouble_deal_status = #{hiddenTroubleDealStatus}</if>
<if test="hiddenTroubleDealCondition != null and hiddenTroubleDealCondition != ''"> and hidden_trouble_deal_condition = #{hiddenTroubleDealCondition}</if>
<if test="hiddenTroubleDealFinishTime != null "> and hidden_trouble_deal_finish_time = #{hiddenTroubleDealFinishTime}</if>
</where>
group by hidden_trouble_id desc
ORDER BY hidden_trouble_id DESC
</select>
<select id="selectTHiddenTroubleInfoById" parameterType="Long" resultMap="THiddenTroubleInfoResult">
......
gassafetyprogress-system/src/main/resources/mapper/system/TWorkOrderMapper.xml
View file @ 0580795f
......@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTWorkOrderList" parameterType="TWorkOrder" resultMap="TWorkOrderResult">
<include refid="selectTWorkOrderVo"/>
<where>
workOrder.is_del = '0'
<if test="workTitle != null and workTitle != ''"> and workOrder.work_title like concat('%', #{workTitle}, '%')</if>
<if test="workType != null and workType != ''"> and workOrder.work_type = #{workType}</if>
<if test="workContent != null and workContent != ''"> and workOrder.work_content = #{workContent}</if>
......
gassafetyprogress-web/src/components/bigWindow/leftBar.vue
View file @ 0580795f
......@@ -282,7 +282,7 @@
});
pietwo.setOption({
title: {
text: '隐患整治数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
text: '隐患整治数(个) : 0',
left: 'center',
top :20,
textStyle:{
......@@ -305,12 +305,12 @@
center: ['50%','58%'],
data: [
{
value: this.allNum.typeTwo,
value: 0,
name: '未完成',
itemStyle: { color: '#09f' }
},
{
value: this.allNum.typeOne,
value: 0,
name: '已完成' ,
itemStyle: { color: '#00ffff' }
},
......
gassafetyprogress-web/src/components/bigWindow/rightBar.vue
View file @ 0580795f
......@@ -59,7 +59,7 @@
</div>
<div class="yujingbottom">
<div>设备预警</div>
<span>2</span>
<span>0</span>
</div>
</div>
<div class="yujingcenter yujing" >
......@@ -72,7 +72,7 @@
</div>
<div class="yujingbottom">
<div>事件情况</div>
<span>2</span>
<span>0</span>
</div>
</div>
<div class="yujingright yujing" >
......@@ -85,7 +85,7 @@
</div>
<div class="yujingbottom">
<div>隐患数量</div>
<span>2</span>
<span>0</span>
</div>
</div>
</div>
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/components/HiddenFeedTrouble.vue
View file @ 0580795f
......@@ -221,7 +221,6 @@ export default {
this.getDicts("t_hidden_trouble_type").then(response => {
this.hiddenTroubleOptions = response.data;
});
console.log("fdafdsafds",this.workId)
this.getHiddenInfoList({workId:this.workId});
},
methods: {
......@@ -264,7 +263,6 @@ export default {
this.reset();
this.index = index;
this.hiddenForm = {...row};
console.log(row,"ffffffffff",this.hiddenForm);
this.title = "修改隐患信息"
this.hiddenOpen = true;
if (this.hiddenForm.pictureUrl) {
......@@ -288,6 +286,7 @@ export default {
this.hiddenForm.reportTime = moment().format("YYYY-MM-DD HH:mm:ss");
this.hiddenForm.reportPersonName = this.$store.state.user.name;
this.hiddenForm.reportPerson = this.$store.state.user.userId;
this.hiddenForm.beyondEnterpriseId = this.$store.state.user.enterpriseId;
addHiddenInfo(this.hiddenForm).then(response => {
this.msgSuccess("新增成功");
this.hiddenOpen = false;
......@@ -305,7 +304,8 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delHiddenInfo(hiddenTroubleId);
//return delHiddenInfo(hiddenTroubleId);
return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1'})
}).then(() => {
this.getHiddenInfoList({workId:this.workId});
this.msgSuccess("删除成功");
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/components/HiddenTrouble.vue
View file @ 0580795f
......@@ -93,6 +93,8 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="隐患类型" prop="hiddenTroubleType">
<el-select v-model="hiddenForm.hiddenTroubleType" placeholder="请选择隐患类型" style="width: 330px" :disabled="isView">
<el-option
......@@ -103,6 +105,35 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属企业" prop="beyondEnterpriseName" v-if="isView">
<el-input v-model="hiddenForm.beyondEnterpriseName" placeholder="请输入所属企业" :disabled="isView"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="处理状态" prop="hiddenTroubleDealStatus" v-if="isView">
<el-input v-if="hiddenForm.hiddenTroubleDealStatus == '1'" value="待处理" :disabled="isView"/>
<el-input v-if="hiddenForm.hiddenTroubleDealStatus == '2'" value="处理中" :disabled="isView"/>
<el-input v-if="hiddenForm.hiddenTroubleDealStatus == '3'" value="已完成" :disabled="isView"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上报时间" prop="reportTime">
<el-date-picker clearable size="small"
v-model="hiddenForm.reportTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择上报时间" style="width: 100%" :disabled="isView">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="经纬度坐标" prop="longitude">
......@@ -152,6 +183,7 @@
</template>
<script>
import { getInfo } from "@/api/regulation/info";
import MyFileUpload from '@/components/MyFileUpload';
import GetPos from '@/components/GetPos';
import moment from "moment";
......@@ -187,7 +219,8 @@ export default {
hiddenOpen: false,
// 表单参数
hiddenForm: {
pictureUrl: ""
pictureUrl: "",
beyondEnterpriseName: "1233"
},
// 表单校验
rules: {
......@@ -248,6 +281,13 @@ export default {
url: this.hiddenForm.pictureUrl,
});
}
if(this.hiddenForm.beyondEnterpriseId && !this.hiddenForm.beyondEnterpriseName){
getInfo(this.hiddenForm.beyondEnterpriseId).then(res =>{
if(res.data){
this.$set(this.hiddenForm,"beyondEnterpriseName",res.data.enterpriseName);
}
})
}
},
/** 修改按钮操作 */
handleUpdate(row,index) {
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue
View file @ 0580795f
......@@ -347,7 +347,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-col :span="12">
<el-form-item label="截止日期" prop="expiryDate">
<el-date-picker clearable size="small"
v-model="form.expiryDate"
......@@ -521,7 +521,8 @@
<HiddenFeedTrouble
:workId="hiddenFeedForm.workId"
:isView="false"
ref="hiddenChild"/>
ref="hiddenChild"
v-if="hiddenFeedOpen"/>
</el-form-item>
</el-form>
......@@ -868,7 +869,8 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delOrder(workIds);
//return delOrder(workIds);
updateOrder({workId: workIds,isDel: '1'})
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
......@@ -1137,7 +1139,7 @@ export default {
//隐患反馈取消
cancelHiddenFeedForm(){
this.hiddenFeedOpen = false;
this.hiddenFeedForm = {hiddenList:[]};
this.hiddenFeedForm = {};
this.fileList = [];
},
//督办
......
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