Commit 90e3cb8b authored by 黄自鹏's avatar 黄自鹏

Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

parents 2266b63e a412fb91
......@@ -747,7 +747,7 @@ export const powerRoutes=[
"icon": "",
"noCache": false,
"link": null,
"mkid":'test',
"mkid":905200300,
},
name:'performanceReportSet',
path:"performanceReportSet"
......
......@@ -117,7 +117,7 @@
if(val.length){
this.notInIds=[]
val.forEach(e=>{
this.notInIds.push(e.jcnrid)
this.notInIds.push(e.lzbzid)
})
}
},
......@@ -175,7 +175,7 @@
form: {
// bmid:'',
gsid:'',
table:'FXSZMX',
table:'LZSZMX',
name:'',
jldw:'',
begintime:'',
......@@ -192,10 +192,12 @@
},
/* 多表表头*/
editTableTitle:[
{label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
{label: "岗位", prop: "scgwName", fieldType: "ftString",width:150},
{label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:150},
{label: "检查人", prop: "fzrName", fieldType: "ftString",width:150},
{label: "公司", prop: "gsName", fieldType: "ftString",width: 150},
{label: "分类", prop: "flName", fieldType: "ftString",width:200},
{label: "岗位", prop: "scgwName", fieldType: "ftString",width:180},
{label: "履职内容", prop: "content", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString",width:100},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
]
}
},
......
......@@ -49,7 +49,7 @@
start,
stop,
excute
} from '@/api/riskPrecontrol/riskSet';
} from '@/api/daily/lzsz.js';
/* edit页面*/
import Edit from './edit'
......
......@@ -5,18 +5,11 @@
<div class="min_full" style='height:100%;width: 100%;'>
<div class="search" v-condition>
<SearchButton :app='this'></SearchButton>
<el-row :gutter="20" class="search-row-1">
<el-col :span="12" class="search-col">
<div class="search-item">
<span class="search-span">任务类型:</span>
<RelSelect style="width: 100%;" src='aqgl/fxyk/fxpc/init/rwlx' clearable :match="{value:'id',label:'name'}" v-model='queryParams.rwlx' ></RelSelect>
</div>
</el-col>
<el-col :span="12" class="search-col">
<div class="search-item">
<span class="search-span">人员:&nbsp;&nbsp;</span>
<el-input v-model='queryParams.condition' ></el-input>
</div>
<el-row :gutter="20" class="search-row-1" style="margin-top: 5px;">
<el-col :span="12">
<el-form-item label="公司" >
<RelSelect style="width: 100%;" src='/jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='queryParams.gsid' ></RelSelect>
</el-form-item>
</el-col>
</el-row>
......@@ -44,13 +37,12 @@
doAdd,
doUpdate,
doDelete,
doQueryJcnr,
doAddJcnr,
doUpdateJcnr,
doDeleteJcnr,
doAutoGen,
doQueryScgw
} from "@/api/riskPrecontrol/screeningCriteria.js";
doAutoGen
} from '@/api/daily/maintenanceDuty.js';
import {
tableMixin_noapp
} from 'common'
......@@ -72,7 +64,7 @@
},
methods: {
query: doQueryJcnr,
query: doQuery,
/* 基础增*/
apiAdd: doAdd,
/* 基础更新*/
......@@ -89,11 +81,11 @@
idList.push(e.id)
})
this.multipleSelection.forEach(item=>{
item.jcnrid=item.id
item.lzbzid=item.id
item.id=''
})
let addData=this.multipleSelection.filter((item)=>{
if(idList.indexOf(item.jcnrid)==-1){
if(idList.indexOf(item.lzbzid)==-1){
return true
}else{
return false
......@@ -109,16 +101,16 @@
data() {
return {
queryParams:{
gwid:'',
condition:'',
rwlx:'',
notInIds:[]
gsid:'',
// info: ''
},
tableTitle: [
{label: "检查内容", prop: "nr", fieldType: "ftString",width:300},
{label: "岗位", prop: "scgwName", fieldType: "ftString",width:150},
{label: "任务类型", prop: "rwlxName", fieldType: "ftString",width:150},
{label: "检查人", prop: "fzrName", fieldType: "ftString",width:150},
{label: "公司", prop: "gsName", fieldType: "ftString",width: 150},
{label: "分类", prop: "flName", fieldType: "ftString",width:200},
{label: "岗位", prop: "scgwName", fieldType: "ftString",width:180},
{label: "履职内容", prop: "content", fieldType: "ftString",width:300},
{label: "维护人", prop: "whr", fieldType: "ftString",width:100},
{label: "维护时间", prop: "whsj", fieldType: "ftDateTime"}
],
baseUrl: '/aqgl/fxyk/fxbz',
}
......
......@@ -80,7 +80,7 @@
</div>
<div class="bottom">
<div class="zttitle">
处理隐患
处理隐患
</div>
<div class="" style="height: calc(100% - 30px);width: 100%;">
<TablePager isAutoRoll showPagination queryAll :delButton='false' @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
......@@ -263,7 +263,8 @@
},
queryParams:{
zt:'Z'
queryType:'YHWCL'
// zt:'S'
},
aqpng:aqpng,
baseurl:baseurl,
......@@ -325,6 +326,16 @@
series: [
{
axisLine: {
lineStyle: {
width: 6,
color: [
[0.25, '#FF6E76'],
[0.5, '#FDDD60'],
[0.75, '#58D9F9'],
[1, '#7CFFB2']
]
}},
radius:'90%',
name:setting.title,
type: 'gauge',
......@@ -337,7 +348,11 @@
},
detail: {
valueAnimation: true,
formatter: '{value}'
formatter: '{value}',
textStyle:{
fontSize:17
}
},
data: [
{
......
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