wangyifang
/
szhd-safety-web-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

我的任务显示

Browse Source
master
lion 1 year ago
parent 209f69d759
commit 25790f7fb9
7 changed files with 166 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape View File

@ -2,6 +2,6 @@
ENV = 'development'
# base api
VUE_APP_BASE_API = 'http://safety.115.langye.net/'
VUE_APP_BASE_API = 'http://192.168.60.99:8001/'
#VUE_APP_BASE_API = http://192.168.60.99:9001/

4
.env.production
Unescape View File

@ -2,6 +2,6 @@
ENV = 'production'
# base api
#VUE_APP_BASE_API = http://192.168.60.99:9001/
VUE_APP_BASE_API = http://192.168.60.99:9001/
VUE_APP_BASE_API = 'http://safety.115.langye.net/'
#VUE_APP_BASE_API = 'http://192.168.60.99:8001/'

3
.env.staging
Unescape View File

@ -4,5 +4,6 @@ NODE_ENV = production
ENV = 'staging'
# base api
VUE_APP_BASE_API = '/stage-api'
#VUE_APP_BASE_API = '/stage-api'
VUE_APP_BASE_API = 'http://192.168.60.99:8001/'

18
src/views/task/list/articleview.vue
Unescape View File

@ -34,7 +34,7 @@
</el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<Button ghost size="small" @click="show(scope.row)" type="primary"
<Button ghost size="small" @click="checkUnits(scope.row.mission_id,'show')" type="primary"
style="margin-left: 10px;">查看</Button>
</template>
</el-table-column>
@ -50,14 +50,16 @@
</el-row>
</div>
<viewInfo ref="viewInfo"></viewInfo>
<viewInfo ref="viewInfo"></viewInfo>
<checkUnit ref='checkUnit'></checkUnit>
</div>
</template>
<script>
import LxHeader from "@/components/LxHeader/index.vue";
import viewInfo from '@/views/lawsfile/index/components/viewInfo.vue'
import viewInfo from '@/views/lawsfile/index/components/viewInfo.vue'
import checkUnit from '../list/components/checkUnit.vue'
import {
listarticle,
get
@ -66,7 +68,8 @@
export default {
components: {
LxHeader,
viewInfo
viewInfo,
checkUnit
},
created() {
var that = this;
@ -107,7 +110,12 @@
this.pagination.page = val;
this.load();
},
checkUnits(id, type) {
this.$refs.checkUnit.id = id
this.$refs.checkUnit.type = type
// this.$refs.checkUnit.url_type = this.path_type
this.$refs.checkUnit.isShow = true
},
load(istrue) {
var that = this;
let type = parseInt(this.$route.path.split("_")[1]);

211
src/views/task/list/components/checkUnit.vue
Unescape View File

@ -762,58 +762,57 @@
prop: 'department.name',
align: 'center',
width: 120
},{
label: "小组",
prop: '_names',
width: 240,
customFn: (row) => {
return ( <div style = {
{
"display": "flex",
"flex-wrap": "wrap"
}
} > {
row._names ?
row._names.map(item => {
return ( <div> {
item.group_name ?
// 小组
<div style = {
{
"display": "flex"
}
} > <div> {
item.group_name
}： </div> <
div style = {
{
"display": "flex",
"flex-wrap": "wrap"
}
} > {
item.details.map(detail => {
return ( <el-tag style = {
{
'margin': '0 5px 5px 0'
}
}
type = {
detail.hasDetail ? '' : 'info'
} > {
detail.name
} </el-tag>
)
})
} </div> <
/div> :
'无'
// 其他
// <el-tag style={{'margin':'0 5px 5px 0'}} type={item.hasDetail?'':'info'}>{item.name}</el-tag>
} </div>)
}): '无'
} </div>)
}
}, {
}
// {
// label: "小组",
// prop: '_names',
// width: 240,
// customFn: (row) => {
// return ( <div style = {
// {
// "display": "flex",
// "flex-wrap": "wrap"
// }
// } > {
// row._names ?
// row._names.map(item => {
// return ( <div> {
// item.group_name ?
// // 小组
// <div style = {
// {
// "display": "flex"
// }
// } > <div> {
// item.group_name
// }： </div> <
// div style = {
// {
// "display": "flex",
// "flex-wrap": "wrap"
// }
// } > {
// item.details.map(detail => {
// return ( <el-tag style = {
// {
// 'margin': '0 5px 5px 0'
// }
// }
// type = {
// detail.hasDetail ? '' : 'info'
// } > {
// detail.name
// } </el-tag>
// )
// })
// } </div> <
// /div> :
// '无'} </div>)
// }): '无'
// } </div>)
// }
// }
, {
label: "检查日期",
prop: 'date',
width: 110,
@ -833,7 +832,7 @@
label: "问题描述",
prop: 'ask_introduce',
align: 'left',
width: 180
// width: 180
}, {
label: "问题类型",
prop: 'ask.value',
@ -1059,9 +1058,17 @@
}
},
async getAskLog() {
async getAskLog() {
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
}
console.log("ids",ids)
const res = await listasklog({
mission_id: this.id,
mission_id: ids+this.id,
page: 1,
page_size: 999
})
@ -1074,41 +1081,49 @@
this.$refs.answerQuestion.range = range
this.$refs.answerQuestion.isShow = true
},
async getInspection() {
async getInspection() {
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
}
console.log("ids",ids)
const res = await listpatrol({
mission_id: this.id,
mission_id: ids+this.id,
page: 1,
page_size: 999
})
for (var k of res.data) {
var _names = []
// 小组
if (this.showform.groups && this.showform.groups.length > 0) {
for (var g of this.showform.groups) {
if (g.type == 1) {
// for (var k of res.data) {
// var _names = []
// // 小组
// if (this.showform.groups && this.showform.groups.length > 0) {
// for (var g of this.showform.groups) {
// if (g.type == 1) {
if (g.link_id.indexOf(k.up_admin.id) > -1) {
_names.push({
group_name: g.name,
details: g.details
})
}
}
if (g.type == 2) {
if (g.link_id.indexOf(k.up_admin.department_id) > -1) {
_names.push({
group_name: g.name,
details: g.details
})
}
}
}
k._names = _names
}
// if (g.link_id.indexOf(k.up_admin.id) > -1) {
// _names.push({
// group_name: g.name,
// details: g.details
// })
// }
// }
// if (g.type == 2) {
// if (g.link_id.indexOf(k.up_admin.department_id) > -1) {
// _names.push({
// group_name: g.name,
// details: g.details
// })
// }
// }
// }
// k._names = _names
// }
console.log(k._names)
// console.log(k._names)
}
// }
@ -1119,9 +1134,17 @@
const res = await getparameteritem('unitTypeList')
this.unitTypeList = res.detail
},
async getTrain() {
async getTrain() {
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
}
console.log("ids",ids)
const res = await listtrain({
mission_id: this.id,
mission_id: ids+this.id,
page: 1,
page_size: 999
})
@ -1130,9 +1153,9 @@
async getUploads() {
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
}
console.log("ids",ids)
@ -1145,9 +1168,17 @@
})
this.uploads_log = res.data
},
async getStudy() {
async getStudy() {
let ids = ''
if(this.showform.pid_details&&this.showform.pid_details.length>0){
this.showform.pid_details.map((item)=>{
ids = item.id +','
})
}
console.log("ids",ids)
const res = await liststudy({
mission_id: this.id,
mission_id: ids+this.id,
page: 1,
page_size: 999
})

49
src/views/task/list/unit.vue
Unescape View File

@ -60,16 +60,17 @@
<div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
<div class="topwrap">
<div>
共有<span style="font-size: 24px;color:red;margin:0 5px">{{total}}</span>项任务，共<span
style="font-size: 24px;color:red;margin:0 5px">{{auditStatus1}}</span>项未完成
共有<span style="font-size: 24px;color:red;margin:0 5px">{{total}}</span>项任务，共
<span v-if="path_type==5" style="font-size: 24px;color:red;margin:0 5px">{{list.length}}</span>
<span v-else style="font-size: 24px;color:red;margin:0 5px">{{auditStatus1}}</span>项未完成
</div>
<div v-if="path_type==5" class="myListFinish">
<!-- <div v-if="path_type==5" class="myListFinish">
<div @click='myListFinishStatus = true' :class="{'tabcur':myListFinishStatus}">待办事项</div>
<div @click='myListFinishStatus = false' :class="{'tabcur':!myListFinishStatus}">完成事项</div>
</div>
</div> -->
</div>
<xy-table :showIndex="false" :list="myListFinishStatus?list:myListFinish" :defaultExpandAll="false"
<!-- :list="myListFinishStatus?list:myListFinish" -->
<xy-table :showIndex="false" :list="list" :defaultExpandAll="false"
:isPage="false"
:treeProps="treeProps" :total="total" stripe @cell-dblclick='cellClicks'
@pageSizeChange="e => {select.page_size = e,getList()}" @pageIndexChange="e => {select.page = e,getList()}"
@ -158,24 +159,24 @@
</div>
</div>
</div>
<!-- doadmins 转办的人员 任务分解，任务执行 -->
<div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
<el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</div>
</div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
</Button>
</el-tooltip>
</div>
<!-- doadmins 转办的人员 任务分解，任务执行 -->
<div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
<el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
<div slot="content">
<div style="margin-bottom:5px;">
<Button type="primary" size="small"
@click="editorUnit(scope.row.id,'pid')">任务分解</Button>
</div>
<div v-for="item in unitTypeList">
<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
@click="openMyMission(item.value,scope.row)">任务执行</Button>
</div>
</div>
<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
执行任务
</Button>
</el-tooltip>
</div>
<!-- 直接 执行任务 -->
<div v-else>
<div v-for="item in unitTypeList">

4
vue.config.js
Unescape View File

@ -24,8 +24,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: '/admin/',
outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin',
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,

Write Preview
Loading…
Cancel
Save