Skip to content

G
gassafety-progress
Commit b92a7071 authored by yaqizhang's avatar yaqizhang
Browse files
Options

解决冲突

parents 59ae98c8 376b35f2
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 19 deletions
gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TWorkOrderController.java
View file @ b92a7071
......@@ -84,7 +84,7 @@ public class TWorkOrderController extends BaseController
List<Integer> postIds = iSysPostService.selectPostListByUserId(user.getUserId());
for(Integer postId : postIds){
SysPost postInfo = iSysPostService.selectPostById(postId.longValue());
if("se".equals(postInfo.getPostCode())){
if("se".equals(postInfo.getPostCode()) && postIds.size()==1){
tWorkOrder.setWorkAssignManId(user.getUserId());
}
}
......
gassafetyprogress-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml
View file @ b92a7071
......@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="licenseValidityTime != null and licenseValidityTime != ''"> and license_validity_time = #{licenseValidityTime}</if>
<if test="annualSupervisionInspection != null and annualSupervisionInspection != ''"> and annual_supervision_inspection = #{annualSupervisionInspection}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
</where>
group by enterprise_id desc
</select>
......
gassafetyprogress-web/src/components/bigWindow/Cz.vue
View file @ b92a7071
<!--
* @Author: your name
* @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-16 17:32:38
* @LastEditTime: 2022-03-23 15:19:40
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
......@@ -86,7 +86,7 @@
style="width: 100px; height: 100px"
:src="deviceData.pictureAddress"
:preview-src-list="[deviceData.pictureAddress ]"
z-index=99999
:z-index="999999"
>
</el-image>
<div class="imgtext" v-else>暂无图片</div>
......
gassafetyprogress-web/src/components/bigWindow/Device.vue
View file @ b92a7071
<!--
* @Author: your name
* @Date: 2022-01-26 20:07:52
* @LastEditTime: 2022-03-16 17:29:11
* @LastEditTime: 2022-03-23 15:23:34
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
......@@ -56,7 +56,7 @@
style="width: 100px; height: 100px"
:src="deviceData.iconUrl"
:preview-src-list="[deviceData.iconUrl ]"
z-index=99999
:z-index="999999"
>
</el-image>
<div class="imgtext" v-else>暂无图片</div>
......
gassafetyprogress-web/src/store/modules/user.js
View file @ b92a7071
......@@ -10,7 +10,8 @@ const user = {
permissions: [],
systemSetting:{},
posts: [],
enterpriseId: ''
enterpriseId: '',
userId: ''
},
mutations: {
......@@ -37,6 +38,9 @@ const user = {
},
SET_ENTERPRISEID: (state,enterpriseId) =>{
state.enterpriseId = enterpriseId
},
SET_USERID:(state,userId) =>{
state.userId = userId
}
},
......@@ -76,10 +80,10 @@ const user = {
commit('SET_SYSTEMSETTING', res.systemSetting)
commit('SET_POSTS',res.posts)
commit('SET_ENTERPRISEID',user.deptId)
// 大屏公司获取
// 第一个参数是其他模块的 actions 路径,
// 第二个是传给 actions 的数据, 如果不需要传数据, 也必须预留,
commit('SET_USERID',user.userId);
// 大屏公司获取
// 第一个参数是其他模块的 actions 路径,
// 第二个是传给 actions 的数据, 如果不需要传数据, 也必须预留,
// 第三个参数是配置选项, 申明这个 acitons 不是当前模块的
dispatch("bigWindowCompany/GetCompany",{},{root:true})
console.log(res.systemSetting)
......
gassafetyprogress-web/src/utils/mapClass/config.js
View file @ b92a7071
/*
* @Author: your name
* @Date: 2022-01-26 10:47:44
* @LastEditTime: 2022-03-21 17:11:56
* @LastEditTime: 2022-03-23 15:26:48
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/config.js
......@@ -24,6 +24,7 @@ export const pipePressure = {
export const alarmtime = 10000;
export const svgUrl = {
// bigwindow页面的设备
2: require("@/assets/image/tiaoyaxiang1.svg"),
3: require("@/assets/image/famen1.svg"),
4: require("@/assets/image/changzhan1.svg"),
......@@ -31,10 +32,14 @@ export const svgUrl = {
6: require("@/assets/image/user1.svg"),
7: require("@/assets/image/zrxk.svg"),
8: require("@/assets/image/zcrq.svg"),
// 运行监测-车辆信息 operationMonitor/gassVehicle
// 小汽车
9: require("@/assets/image/car.png"),
//小汽车的路径标点图标
14: require("@/assets/mapImages/carTarget.svg"),
//应急设备,
//应急设备,应急处置 emergency/emergency
10: require("@/assets/image/yj-jydw.png"),
11: require("@/assets/image/yj-wz.png"),
12: require("@/assets/image/yj-cl.png"),
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue
View file @ b92a7071
......@@ -41,6 +41,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:order:add']"
v-if="roleType != 'inpector'"
>新增</el-button>
</el-col>
<el-col :span="1.5">
......@@ -52,6 +53,7 @@
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:order:export']"
v-if="roleType != 'inpector'"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
......@@ -100,7 +102,7 @@
<el-table-column label="责任人员" align="center" prop="responsiblePerson" />
<el-table-column label="截止日期" align="center" prop="expiryDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.expiryDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.expiryDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150%">
......@@ -113,7 +115,7 @@
v-hasPermi="['system:order:edit']"
key="detail"
>详情</el-button>
<el-button v-if="scope.row.workStatus == '0' || scope.row.workStatus == '1'" key="edit"
<el-button v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'" key="edit"
size="mini"
type="text"
icon="el-icon-edit"
......@@ -126,9 +128,10 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
v-if="('zhengfu'== roleType || (('enterprise'== roleType || 'doubleRole' == roleType) && scope.row.workCreateEnterpriseId == $store.state.user.enterpriseId))&& scope.row.workStatus == '0'"
key="detele"
>删除</el-button>
<el-button v-if=" (('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == null))) && scope.row.workStatus == '0'"
<el-button v-if="'inpector'!= roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null) && scope.row.workStatus == '0'"
size="mini"
type="text"
icon="el-icon-edit"
......@@ -136,7 +139,7 @@
v-hasPermi="['system:order:edit']"
key="work"
>任务下发</el-button>
<el-button v-if=" 'inpector'== roleType && scope.row.workStatus == '0'"
<el-button v-if=" ('inpector'== roleType || 'doubleRole' == roleType) && (scope.row.workAssignManId == $store.state.user.userId) && scope.row.workStatus == '0'"
size="mini"
type="text"
icon="el-icon-edit"
......@@ -523,8 +526,10 @@ export default {
let enterpriseId = this.$store.state.user.enterpriseId;
let post = this.$store.state.user.posts.find(item => item.postCode === "se");
if(-2 != enterpriseId){
if(post){
if(post && this.$store.state.user.posts.length <=1){
this.roleType = "inpector";
}else if(post && this.$store.state.user.posts.length >1){
this.roleType = "doubleRole";
}else{
this.roleType = "enterprise";
}
......@@ -685,8 +690,12 @@ export default {
},
//指派单位
getEnterpriseLists(){
enterpriseLists().then(response => {
this.enterprises = response.rows;
const param = {};
if(this.roleType != "zhengfu"){
param.enterpriseId = this.$store.state.user.enterpriseId;
}
enterpriseLists(param).then(response => {
this.enterprises = response.rows;
});
},
//获取巡检员
......
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