Commit dcc6b719 authored by 李苏's avatar 李苏 💬

大溪沟调整

parent 2e9072e6
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
:match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect> :match="{value:'id',label:'name'}" v-model='queryParams.yldj'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">年度:</span>
<RelYearSelect style="width: 100%;"
v-model='queryParams.year'></RelYearSelect>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
...@@ -85,7 +92,15 @@ ...@@ -85,7 +92,15 @@
name: 'appVersion', name: 'appVersion',
/* 初始额外赋值*/ /* 初始额外赋值*/
created() {
this.queryParams={
...this.queryParams,
...this.$route.query
}
},
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery({ this.$refs['TablePager'].pageQuery({
setFirstCurrent: true setFirstCurrent: true
}) })
...@@ -102,6 +117,7 @@ ...@@ -102,6 +117,7 @@
baseUrl: '/aqgl/yjgl/yjyljh', baseUrl: '/aqgl/yjgl/yjyljh',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
year:'',
yldj: '', yldj: '',
info: '', info: '',
ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30, ksrq: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
......
<template> <template>
<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.yljhid' > <div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.yljhid' >
<!-- 查询条件--> <!-- 查询条件-->
<!-- <div class="search" v-condition> <div class="search" v-condition>
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1"> <el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">分类:</span> <span class="search-span">月份:</span>
<el-input></el-input> <el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
</div> <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-col> </el-option>
<el-col :span="6" class="search-col"> </el-select>
<div class="search-item">
<span class="search-span">开始日期:</span>
<el-date-picker></el-date-picker>
</div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">结束日期:</span>
<el-date-picker></el-date-picker>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> --> </div>
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<PrintButton :app='app'></PrintButton> <PrintButton :app='app'></PrintButton>
...@@ -41,7 +32,7 @@ ...@@ -41,7 +32,7 @@
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager @getData='getData' :ref="'TablePager'" :rowClass='rowClass' :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
</TablePager> </TablePager>
...@@ -69,10 +60,13 @@ ...@@ -69,10 +60,13 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery() this.queryParams.month=this.$route.query.month
// this.$refs['TablePager'].pageQuery()
}, },
data() { data() {
return { return {
/*需要的额外参数 */ /*需要的额外参数 */
showDialog: false, showDialog: false,
DialogName: '', DialogName: '',
...@@ -82,10 +76,19 @@ ...@@ -82,10 +76,19 @@
baseUrl: 'aqgl/yjgl/yjyl', baseUrl: 'aqgl/yjgl/yjyl',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
yljhid: '' yljhid: '',
month:''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label:"状态", prop: "zt",width:80,formatter(row,c,v){
if( row.attachcount>0){
return '完成'
}else{
return '未完成'
}
}},
{label: "月份", prop: "month",width:80},
{label: "演练名称", prop: "name", fieldType: "ftString",width:300}, {label: "演练名称", prop: "name", fieldType: "ftString",width:300},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:192}, {label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "演练组织单位", prop: "yldwName", fieldType: "ftString",width:192}, {label: "演练组织单位", prop: "yldwName", fieldType: "ftString",width:192},
...@@ -117,7 +120,13 @@ ...@@ -117,7 +120,13 @@
} }
}, },
methods: { methods: {
rowClass({ row, rowIndex }) {
if (row.attachcount == 0) {
return "warning-row";
} else {
return "success-row";
}
},
/* 基础查询*/ /* 基础查询*/
query: doQuery, query: doQuery,
/* 基础增*/ /* 基础增*/
......
...@@ -2,26 +2,29 @@ ...@@ -2,26 +2,29 @@
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写--> <!-- 填写表单内容,slot=form必写-->
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练名称" ref="name" prop="name"> <el-form-item label="演练名称" ref="name" prop="name">
<el-input :readonly="readonly" v-model="form.name" ></el-input> <el-input :readonly="readonly" v-model="form.name"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司" v-rule="{ <el-form-item label="公司" v-rule="{
required: true, required: true,
rules:rules rules:rules
}" ref="gsid" prop="gsid"> }" ref="gsid" prop="gsid">
<RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect> <RelSelect style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs'
:match="{value:'id',label:'bmmc'}" v-model='form.gsid'></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="分公司ID" ref="gsid" prop="gsid"> <el-form-item label="分公司ID" ref="gsid" prop="gsid">
<el-input :readonly="readonly" v-model="form.gsid" ></el-input> <el-input :readonly="readonly" v-model="form.gsid" ></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="演练组织单位" ref="yldwid" prop="yldwid"> <el-form-item label="演练组织单位" ref="yldwid" prop="yldwid">
&lt;!&ndash; <el-input :readonly="readonly" v-model="form.yldwid" ></el-input> &ndash;&gt; &lt;!&ndash; <el-input :readonly="readonly" v-model="form.yldwid" ></el-input> &ndash;&gt;
<RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect> <RelSelect style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect>
...@@ -30,9 +33,9 @@ ...@@ -30,9 +33,9 @@
<!--<el-col :span="6">--> <!--<el-col :span="6">-->
<!--<el-form-item label="演练计划ID" ref="yljhid" prop="yljhid">--> <!--<el-form-item label="演练计划ID" ref="yljhid" prop="yljhid">-->
<!--<el-input :readonly="readonly" v-model="form.yljhid" ></el-input>--> <!--<el-input :readonly="readonly" v-model="form.yljhid" ></el-input>-->
<!--</el-form-item>--> <!--</el-form-item>-->
<!--</el-col>--> <!--</el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -42,39 +45,42 @@ ...@@ -42,39 +45,42 @@
</el-form-item> </el-form-item>
</el-col>--> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练组织部门" v-rule="{ <el-form-item label="演练组织部门" v-rule="{
required: true, required: true,
rules:rules rules:rules
}" ref="yldwid" prop="yldwid"> }" ref="yldwid" prop="yldwid">
<RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.yldwid' ></RelSelect> <RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;"
src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}"
v-model='form.yldwid'></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练地点" ref="ylmb" prop="ylmb">
<el-input :readonly="readonly" v-model="form.ylmb"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练地点" ref="ylmb" prop="ylmb"> <el-form-item label="演练等级" ref="yldj" prop="yldj">
<el-input :readonly="readonly" v-model="form.ylmb" ></el-input> <RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable
:match="{value:'id',label:'name'}" v-model='form.yldj'></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="演练等级" ref="yldj" prop="yldj">
<RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/yjgl/yjyljh/init/yldj' filterable clearable :match="{value:'id',label:'name'}" v-model='form.yldj' ></RelSelect>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练时间" ref="ylrq" prop="ylrq"> <el-form-item label="演练时间" ref="ylrq" prop="ylrq">
<el-date-picker style="width: 100%;" :readonly="readonly" type="datetime" <el-date-picker style="width: 100%;" :readonly="readonly" type="datetime" v-model="form.ylrq"
v-model="form.ylrq" placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-rule="{ <el-form-item v-rule="{
required: true, required: true,
rules:rules rules:rules
}" label="演练责任人" ref="ylzrrid" prop="ylzrrid"> }" label="演练责任人" ref="ylzrrid" prop="ylzrrid">
<personSelector :label="form.ylzrrName||'暂无'" @selected='ylzrrSelected' ></personSelector> <personSelector :label="form.ylzrrName||'暂无'" @selected='ylzrrSelected'></personSelector>
<!-- <el-input :readonly="readonly" v-model="form.ylzrrid" ></el-input> --> <!-- <el-input :readonly="readonly" v-model="form.ylzrrid" ></el-input> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="12"> <!--<el-col :span="12">
...@@ -83,25 +89,36 @@ ...@@ -83,25 +89,36 @@
</el-form-item> </el-form-item>
</el-col>--> </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="协办单位" ref="zbdwid" prop="zbdwid"> <el-form-item label="协办单位" ref="zbdwid" prop="zbdwid">
<el-input :readonly="readonly" v-model="form.zbdwid" ></el-input> <el-input :readonly="readonly" v-model="form.zbdwid"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="演练人数" ref="ylrs" prop="ylrs"> <el-form-item v-rule="{
<el-input :readonly="readonly" v-model="form.ylrs" ></el-input> required: true,
rules:rules
}" label="月份" ref="month" prop="month">
<!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> -->
<el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="演练人数" ref="ylrs" prop="ylrs">
<el-input :readonly="readonly" v-model="form.ylrs"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz"> <el-form-item label="备注" ref="bz" prop="bz">
<el-input :readonly="readonly" v-model="form.bz" ></el-input> <el-input :readonly="readonly" v-model="form.bz"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="系统版本" ref="sysversion" prop="sysversion"> <el-form-item label="系统版本" ref="sysversion" prop="sysversion">
<el-input :readonly="readonly" v-model="form.sysversion" ></el-input> <el-input :readonly="readonly" v-model="form.sysversion" ></el-input>
</el-form-item> </el-form-item>
...@@ -111,12 +128,14 @@ ...@@ -111,12 +128,14 @@
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import {editMixin} from 'common' import {
editMixin
} from 'common'
export default { export default {
mixins: [editMixin], mixins: [editMixin],
/* 存放index页面传递的额外参数*/ /* 存放index页面传递的额外参数*/
mounted() { mounted() {
this.form.yljhid=this.app.queryParams.yljhid this.form.yljhid = this.app.queryParams.yljhid
}, },
/* 组件名称*/ /* 组件名称*/
name: "aqglYjylEdit", name: "aqglYjylEdit",
...@@ -132,54 +151,55 @@ ...@@ -132,54 +151,55 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {
ylrs:'', month: '',
yldj:'', ylrs: '',
yldj: '',
//ID //ID
id:'', id: '',
//演练名称 //演练名称
name:'', name: '',
//分公司ID //分公司ID
gsid:'', gsid: '',
//演练组织单位ID //演练组织单位ID
yldwid:'', yldwid: '',
//演练计划ID //演练计划ID
yljhid:'', yljhid: '',
//培训人数 //培训人数
pxrs:'', pxrs: '',
//演练目标 //演练目标
ylmb:'', ylmb: '',
//演练方式 //演练方式
ylfs:'', ylfs: '',
//演练时间 //演练时间
ylrq:new Date().getTime(), ylrq: new Date().getTime(),
//演练责任人 //演练责任人
ylzrrid:'', ylzrrid: '',
//演练时长 //演练时长
ylsc:'', ylsc: '',
//主(协)办单位 //主(协)办单位
zbdwid:'', zbdwid: '',
//演练负责人ID //演练负责人ID
ylfzrid:'', ylfzrid: '',
//质量负责人ID //质量负责人ID
zlfzrid:'', zlfzrid: '',
//估计费用 //估计费用
gjfy:'', gjfy: '',
//备注 //备注
bz:'', bz: '',
//维护人编码 //维护人编码
whrid:'', whrid: '',
//维护人 //维护人
whr:'', whr: '',
//维护时间 //维护时间
whsj:new Date().getTime(), whsj: new Date().getTime(),
//创建人编码 //创建人编码
cjrid:'', cjrid: '',
//创建人 //创建人
cjr:'', cjr: '',
//创建时间 //创建时间
// cjsj:new Date().getTime(), // cjsj:new Date().getTime(),
//系统版本 //系统版本
sysversion:'', sysversion: '',
}, },
/* form提交时的规则,具体规则参考官网*/ /* form提交时的规则,具体规则参考官网*/
rules: { rules: {
...@@ -188,14 +208,14 @@ ...@@ -188,14 +208,14 @@
} }
}, },
methods: { methods: {
ylzrrSelected(row){ ylzrrSelected(row) {
this.form.ylzrrid=row.id this.form.ylzrrid = row.id
}, },
ylfzrSelected(row){ ylfzrSelected(row) {
this.form.ylfzrid=row.id this.form.ylfzrid = row.id
}, },
zlfzrSelected(row){ zlfzrSelected(row) {
this.form.zlfzrid=row.id this.form.zlfzrid = row.id
} }
} }
......
<template> <template>
<RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'> <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
<!-- 填写表单内容,slot=form必写--> <!-- 填写表单内容,slot=form必写-->
<el-form style="height: 70vh;padding-right: 30px;overflow: auto;overflow-x: hidden;" slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form style="height: 70vh;padding-right: 30px;overflow: auto;overflow-x: hidden;" slot="form" ref="form"
<el-row :gutter="20"> :model="form" label-width="100px" :rules="rules">
<el-col :span="8"> <el-row :gutter="20">
<el-form-item label="公司" ref="gsid" prop="gsid"> <el-col :span="8">
<RelSelect clearable style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect> <el-form-item label="公司" ref="gsid" prop="gsid">
</el-form-item> <RelSelect clearable style="width: 100%;" :readonly="readonly" src='jcsj/common/all/queryGs'
</el-col> :match="{value:'id',label:'bmmc'}" v-model='form.gsid'></RelSelect>
<el-col :span="8"> </el-form-item>
<el-form-item label="部门" ref="bmid" prop="bmid"> </el-col>
<RelSelect linkage :linkParams="{pid:form.gsid}" :params="{ <el-col :span="8">
isBm:true <el-form-item label="部门" ref="bmid" prop="bmid">
}" :readonly="readonly" style="width: 100%;" src='/jcsj/common/bm/queryBz' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <!-- <RelSelect linkage :linkParams="{pid:form.gsid}" :readonly="readonly" style="width: 100%;" src='/jcsj/common/bm/queryBz' clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> -->
</el-form-item>
</el-col> <!-- <el-cascader v-if='cascader' :props="props" v-model="form.bmid" ></el-cascader> -->
<el-col :span="8">
<el-form-item label="岗位" ref="gwid" prop="gwid"> <el-popover
<RelSelect linkage :linkParams="{gsid:form.gsid}" :readonly="readonly" style="width: 100%;" src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.gwid' ></RelSelect> v-if='cascader'
</el-form-item> placement="right"
</el-col> width="400"
trigger="click">
<el-col :span="24"> <!-- 懒加载树-->
<el-form-item label="风险地点" ref="fxpcdd" prop="fxpcdd"> <div class="lazyTree">
<el-input type='textarea' :readonly="readonly" v-model="form.fxpcdd" ></el-input> <!-- 懒加载树-->
</el-form-item> <el-tree @node-click="handleNodeClick" :highlight-current='true' :load="loadNode" lazy :props="props"
</el-col> style="width: 100%;" ref="tree">
</el-tree>
<el-col :span="24"> </div>
<el-form-item label="风险点" ref="fxd" prop="fxd"> <el-input slot="reference" :readonly="true" v-model="form.bmName"></el-input>
<el-input :readonly="readonly" v-model="form.fxd" ></el-input> </el-popover>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="检查部位" ref="jcyd" prop="jcyd"> </el-form-item>
<el-input type="textarea" :readonly="readonly" v-model="form.jcyd" ></el-input> </el-col>
</el-form-item> <el-col :span="8">
</el-col> <el-form-item label="岗位" ref="gwid" prop="gwid">
<el-col :span="24"> <RelSelect linkage :linkParams="{bmid:form.bmid}" :readonly="readonly" style="width: 100%;"
<el-form-item label="危害因素" ref="whys" prop="whys"> src='/aqgl/jcsj/scgw/query' clearable :match="{value:'id',label:'name'}" v-model='form.gwid'></RelSelect>
<el-input type="textarea" :readonly="readonly" v-model="form.whys" ></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col>
<el-col :span="24">
<el-form-item label="风险地点" ref="fxpcdd" prop="fxpcdd">
<el-col :span="24"> <el-input type='textarea' :readonly="readonly" v-model="form.fxpcdd"></el-input>
<el-form-item label="事故后果" ref="sghg" prop="sghg"> </el-form-item>
<el-input type="textarea" :readonly="readonly" v-model="form.sghg" ></el-input> </el-col>
</el-form-item>
</el-col> <el-col :span="24">
<el-col :span="12"> <el-form-item label="风险点" ref="fxd" prop="fxd">
<el-form-item label="固有风险等级" ref="wxdj" prop="wxdj"> <el-input :readonly="readonly" v-model="form.fxd"></el-input>
<RelSelect clearable style="width: 100%;" src='aqgl/fxyk/fxpc/init/wxdj' :match="{value:'id',label:'name'}" v-model='form.wxdj' ></RelSelect> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="12"> <el-form-item label="检查部位" ref="jcyd" prop="jcyd">
<el-form-item label="现有风险等级" ref="lsdj" prop="lsdj"> <el-input type="textarea" :readonly="readonly" v-model="form.jcyd"></el-input>
<RelSelect clearable style="width: 100%;" src='aqgl/fxyk/fxpc/init/wxdj' :match="{value:'id',label:'name'}" v-model='form.lsdj' ></RelSelect> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="24">
<el-form-item label="危害因素" ref="whys" prop="whys">
<!-- 事故后果 --> <el-input type="textarea" :readonly="readonly" v-model="form.whys"></el-input>
<el-col :span="24"> </el-form-item>
<el-form-item label="技术措施" ref="jscs" prop="jscs"> </el-col>
<el-input type="textarea":readonly="readonly" v-model="form.jscs" ></el-input>
</el-form-item>
</el-col> <el-col :span="24">
<el-col :span="24"> <el-form-item label="事故后果" ref="sghg" prop="sghg">
<el-form-item label="管理措施" ref="glcs" prop="glcs"> <el-input type="textarea" :readonly="readonly" v-model="form.sghg"></el-input>
<el-input type="textarea" :readonly="readonly" v-model="form.glcs" ></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="24"> <el-form-item label="固有风险等级" ref="wxdj" prop="wxdj">
<el-form-item label="教育措施" ref="jycs" prop="jycs"> <RelSelect clearable style="width: 100%;" src='aqgl/fxyk/fxpc/init/wxdj' :match="{value:'id',label:'name'}"
<el-input type="textarea" :readonly="readonly" v-model="form.jycs" ></el-input> v-model='form.wxdj'></RelSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="个体防护措施" ref="gthfcs" prop="gthfcs"> <el-form-item label="现有风险等级" ref="lsdj" prop="lsdj">
<el-input type="textarea" :readonly="readonly" v-model="form.gthfcs" ></el-input> <RelSelect clearable style="width: 100%;" src='aqgl/fxyk/fxpc/init/wxdj' :match="{value:'id',label:'name'}"
</el-form-item> v-model='form.lsdj'></RelSelect>
</el-col> </el-form-item>
<el-col :span="24"> </el-col>
<el-form-item label="应急措施" ref="yjcs" prop="yjcs">
<el-input type="textarea" :readonly="readonly" v-model="form.yjcs" ></el-input> <!-- 事故后果 -->
</el-form-item> <el-col :span="24">
</el-col> <el-form-item label="技术措施" ref="jscs" prop="jscs">
<el-col :span="24"> <el-input type="textarea" :readonly="readonly" v-model="form.jscs"></el-input>
<el-form-item label="其他措施" ref="qtcs" prop="qtcs"> </el-form-item>
<el-input type="textarea" :readonly="readonly" v-model="form.qtcs" ></el-input> </el-col>
</el-form-item> <el-col :span="24">
</el-col> <el-form-item label="管理措施" ref="glcs" prop="glcs">
<el-col :span="24"> <el-input type="textarea" :readonly="readonly" v-model="form.glcs"></el-input>
<el-form-item label="备注" ref="bz" prop="bz"> </el-form-item>
<el-input type="textarea" :readonly="readonly" v-model="form.bz" ></el-input> </el-col>
</el-form-item> <el-col :span="24">
</el-col> <el-form-item label="教育措施" ref="jycs" prop="jycs">
</el-row> <el-input type="textarea" :readonly="readonly" v-model="form.jycs"></el-input>
</el-form-item>
</el-form> </el-col>
</RelDialog> <el-col :span="24">
<el-form-item label="个体防护措施" ref="gthfcs" prop="gthfcs">
<el-input type="textarea" :readonly="readonly" v-model="form.gthfcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="应急措施" ref="yjcs" prop="yjcs">
<el-input type="textarea" :readonly="readonly" v-model="form.yjcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="其他措施" ref="qtcs" prop="qtcs">
<el-input type="textarea" :readonly="readonly" v-model="form.qtcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" ref="bz" prop="bz">
<el-input type="textarea" :readonly="readonly" v-model="form.bz"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</RelDialog>
</template> </template>
<script> <script>
import {editMixin} from 'common' import {
export default { editMixin
mixins: [editMixin], } from 'common'
/* 存放index页面传递的额外参数*/ export default {
mounted() { mixins: [editMixin],
/* 存放index页面传递的额外参数*/
mounted() {
},
/* 组件名称*/
name: "fxykFxbzEdit",
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/
computed: {
fgsid() {
return this.form.gsid
}
},
watch: {
fgsid(val) {
if (val) {
this.cascader=false
this.$nextTick(()=>{
this.cascader=true
})
}
}, }
/* 组件名称*/ },
name: "fxykFxbzEdit", data() {
/* 传递props模式一样必填,用于index,button,REdialog之间的组件通信*/ return {
cascader:true,
props: {
label:'bmmc',
isLeaf: 'isLeaf'
},
data() {
return {
gsid:'',
/* 额外初始化,根据需求*/
systemType: [],
bmList: [], bmOptions: [],
gsid: '',
/* 额外初始化,根据需求*/
systemType: [],
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ bmList: [],
form: {
bmid:'',
qtcs:'',
yjcs:'',
gthfcs:'',
jycs:'',
glcs:'',
jscs:'',
zrrName:'',
id:'',
bmid:'', /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: {
bmName:'',
bmid: '',
qtcs: '',
yjcs: '',
gthfcs: '',
jycs: '',
glcs: '',
jscs: '',
zrrName: '',
id: '',
cjid:'', bmid: '',
gwid:'', cjid: '',
fxpcdd:'', gwid: '',
fxd:'', fxpcdd: '',
sglx:'', fxd: '',
wxdj:'', sglx: '',
fz:'', wxdj: '',
fxlx:'', fz: '',
lsdj:'', fxlx: '',
glcj:'', lsdj: '',
pzxx:'', glcj: '',
xh:'', pzxx: '',
txcode:'', xh: '',
cslx:'', txcode: '',
jzjd:'', cslx: '',
jzwd:'', jzjd: '',
jcyd:'', jzwd: '',
whys:'', jcyd: '',
sghg:'', whys: '',
jccsms:'', sghg: '',
bz:'', jccsms: '',
zrr:'', bz: '',
whrid:'', zrr: '',
whr:'', whrid: '',
whr: '',
cjrid:'',
cjr:'', cjrid: '',
cjr: '',
sysversion:'',
}, sysversion: '',
/* form提交时的规则,具体规则参考官网*/
rules: {
gsid: [{ required: true, trigger: 'blur' }],
fxpcdd: [{ required: true, trigger: 'blur' }],
fxd: [{ required: true, trigger: 'blur' }],
jcyd: [{ required: true, trigger: 'blur' }],
wxdj: [{ required: true, trigger: 'blur' }],
lsdj: [{ required: true, trigger: 'blur' }],
whys: [{ required: true, trigger: 'blur' }],
sghg: [{ required: true, trigger: 'blur' }],
}
}
}, },
methods: { /* form提交时的规则,具体规则参考官网*/
zrrSelected(row){ rules: {
this.form.zrr=row.id gsid: [{
}, required: true,
trigger: 'blur'
}],
fxpcdd: [{
required: true,
trigger: 'blur'
}],
fxd: [{
required: true,
trigger: 'blur'
}],
jcyd: [{
required: true,
trigger: 'blur'
}],
wxdj: [{
required: true,
trigger: 'blur'
}],
lsdj: [{
required: true,
trigger: 'blur'
}],
whys: [{
required: true,
trigger: 'blur'
}],
sghg: [{
required: true,
trigger: 'blur'
}],
}
}
},
methods: {
handleNodeClick(data){
this.form.bmName=data.bmmc
this.form.bmid=data.id
},
loadNode(node, resolve) {
if (node.level === 0) {
if(this.form.gsid){
this.$post('kzzx/bm/query',{pid:this.form.gsid}).then(res=>{
resolve(res.data.records);
})
}else{
resolve([]);
}
} else {
const data = node.data
this.$post('kzzx/bm/query', {
"pid": data.id
}).then(res => {
if (res.success && res.data.records.length!=0) {
resolve(res.data.records)
} else {
res.data.records.forEach(item => {
item.isLeaf = true
})
resolve(res.data.records)
}
})
} }
},
zrrSelected(row) {
this.form.zrr = row.id
},
} }
}
</script> </script>
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<!-- 动态单位标题--> <!-- 动态单位标题-->
<div class="bigTitle"> <div class="bigTitle">
<div class="menus"> <div class="menus">
<div v-for="(item,index) in menusItems" v-if="appInit&&csIndex==0||appInit&&csIndex==index" :key="index" @click="changeItem(index)" class="menusItem" :class="{ <div v-for="(item,index) in menusItems" v-if="appInit&&csIndex==0||appInit&&csIndex==index" :key="index"
@click="changeItem(index)" class="menusItem" :class="{
'menusItemActive':index==active, 'menusItemActive':index==active,
'gsIndex':index==0, 'gsIndex':index==0,
'nogsIndex':index!=0 'nogsIndex':index!=0
...@@ -257,8 +258,7 @@ ...@@ -257,8 +258,7 @@
</div> </div>
<div class="hpbodyItem flex flex1" style="flex-direction: row;gap: 10px;"> <div class="hpbodyItem flex flex1" style="flex-direction: row;gap: 10px;">
<!-- 隐患 --> <!-- 隐患 -->
<div style="width: 32.3%;height: 100%;min-width: 0px;min-height: 0px;" <div style="width: 32.3%;height: 100%;min-width: 0px;min-height: 0px;">
@click="$router.push('/contingency/contingencystudy')">
<div class="full data-box1"> <div class="full data-box1">
<i class="topL"></i> <i class="topL"></i>
<i class="topR"></i> <i class="topR"></i>
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
</div> </div>
<div class="flex1" > <div class="flex1">
<div class="full data-box1"> <div class="full data-box1">
<i class="topL"></i> <i class="topL"></i>
<i class="topR"></i> <i class="topR"></i>
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
<div class="flex1" style="margin-right: 5px;" @click="$router.push('/train/aqpx')"> <div class="flex1" style="margin-right: 5px;" >
<div class="full data-box1"> <div class="full data-box1">
<i class="topL"></i> <i class="topL"></i>
<i class="topR"></i> <i class="topR"></i>
...@@ -386,18 +386,18 @@ ...@@ -386,18 +386,18 @@
}, },
async mounted() { async mounted() {
this.pcMap = await this.$match({ this.pcMap = await this.$match({
url: "aqgl/rcgl/lzbg/init/pc", url: "aqgl/rcgl/lzbg/init/pc",
match:{ match: {
label:'id', label: 'id',
value:'name' value: 'name'
} }
}) })
this.pcZtMap = await this.$match({ this.pcZtMap = await this.$match({
url: "aqgl/rcgl/lzbg/init/zt", url: "aqgl/rcgl/lzbg/init/zt",
match:{ match: {
label:'id', label: 'id',
value:'name' value: 'name'
} }
}) })
this.yhlxMap = await this.$match({ this.yhlxMap = await this.$match({
url: "aqgl/yhgl/yhfl/query" url: "aqgl/yhgl/yhfl/query"
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
if (this.superuser) { if (this.superuser) {
this.changeItem(0) this.changeItem(0)
this.appInit=true this.appInit = true
} else { } else {
/* 选中个人orgName*/ /* 选中个人orgName*/
let index = 0 let index = 0
...@@ -454,12 +454,12 @@ ...@@ -454,12 +454,12 @@
this.menusItems.forEach((item, itemIndex) => { this.menusItems.forEach((item, itemIndex) => {
if (item.name == bmmc) { if (item.name == bmmc) {
index = itemIndex index = itemIndex
this.csIndex=itemIndex this.csIndex = itemIndex
} }
}) })
this.changeItem(index) this.changeItem(index)
this.appInit=true this.appInit = true
}) })
...@@ -550,14 +550,15 @@ ...@@ -550,14 +550,15 @@
}) })
/* 履职管理*/ /* 履职管理*/
this.elzgl.on('click', (params) => { this.elzgl.on('click', (params) => {
let pcMap=this.pcMap||{} let pcMap = this.pcMap || {}
let pcZtMap=this.pcZtMap||{} let pcZtMap = this.pcZtMap || {}
let pc=pcMap[params.name] let pc = pcMap[params.name]
let zt=pcZtMap[params.seriesName] let zt = pcZtMap[params.seriesName]
let queryParams = { let queryParams = {
ksrq: this.lzglKsrq, ksrq: this.lzglKsrq,
jsrq: this.lzglJsrq, jsrq: this.lzglJsrq,
pc,zt pc,
zt
} }
...@@ -567,6 +568,148 @@ ...@@ -567,6 +568,148 @@
}) })
}) })
/* 应急管理-公司级*/
this.egsjyjgl.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
// month: this.yjglMonth,
year: this.yjglYear,
yldj: 'GSJ'
}
} else {
queryParams = {
month: this.yjglMonth,
year: this.yjglYear,
yldj: 'GSJ'
}
}
this.$router.push({
path: '/contingency/contingencystudy',
query: queryParams,
})
})
/* 应急管理-车间级*/
this.ecjjyjgl.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
// month: this.yjglMonth,
year: this.yjglYear,
yldj: 'CJJ'
}
} else {
queryParams = {
month: this.yjglMonth,
year: this.yjglYear,
yldj: 'CJJ'
}
}
this.$router.push({
path: '/contingency/contingencystudy',
query: queryParams,
})
})
/* 应急管理-班组级*/
// this.ebzjyjgl
this.ebzjyjgl.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
year: this.yjglYear,
// month: this.yjglMonth,
yldj: 'BZJ'
}
} else {
queryParams = {
month: this.yjglMonth,
year: this.yjglYear,
yldj: 'BZJ'
}
}
this.$router.push({
path: '/contingency/contingencystudy',
query: queryParams,
})
})
/* 安全培训-公司级*/
this.egsjaqpx.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
// month: this.yjglMonth,
year: this.aqpxYear,
pxdj: 'GSJ'
}
} else {
queryParams = {
month: this.aqpxMonth,
year: this.aqpxYear,
pxdj: 'GSJ'
}
}
this.$router.push({
path: '/train/aqpx',
query: queryParams,
})
})
/* 安全培训-车间级*/
this.ecjjaqpx.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
// month: this.yjglMonth,
year: this.aqpxYear,
pxdj: 'CJJ'
}
} else {
queryParams = {
month: this.aqpxMonth,
year: this.aqpxYear,
pxdj: 'CJJ'
}
}
this.$router.push({
path: '/train/aqpx',
query: queryParams,
})
})
/* 安全培训-班组级*/
// this.ebzjyjgl
this.ebzjaqpx.on('click', (params) => {
let queryParams = {}
if (params.seriesName == '年度') {
queryParams = {
year: this.aqpxYear,
// month: this.yjglMonth,
pxdj: 'BZJ'
}
} else {
queryParams = {
month: this.aqpxMonth,
year: this.aqpxYear,
pxdj: 'BZJ'
}
}
this.$router.push({
path: '/train/aqpx',
query: queryParams,
})
})
/* 自动 */ /* 自动 */
...@@ -585,13 +728,13 @@ ...@@ -585,13 +728,13 @@
}, },
data() { data() {
return { return {
appInit:false, appInit: false,
csIndex:0,//如果初始index不=0那么只显示csIndex的数据s csIndex: 0, //如果初始index不=0那么只显示csIndex的数据s
fxgkListSx:['采矿作业区','第二焙烧车间','第一选矿车间','质量计量控制中心','加油站'], fxgkListSx: ['采矿作业区', '第二焙烧车间', '第一选矿车间', '质量计量控制中心', '加油站'],
yhpcKsrq: '', yhpcKsrq: '',
yhpcJsrq: '', yhpcJsrq: '',
lzglKsrq:'', lzglKsrq: '',
lzglJsrq:'', lzglJsrq: '',
yhlxMap: {}, yhlxMap: {},
clztMap: {}, clztMap: {},
orgname: allUserInfo.orgname, orgname: allUserInfo.orgname,
...@@ -690,7 +833,7 @@ ...@@ -690,7 +833,7 @@
}, },
/* 应急管理*/ /* 应急管理*/
eYjgl(key, data) { eYjgl(key, yearData, monthData) {
var option = { var option = {
title: { title: {
...@@ -704,44 +847,72 @@ ...@@ -704,44 +847,72 @@
}, },
}, },
graphic: [{ // graphic: [{
type: "text", // type: "text",
left: "center", // left: "center",
top: "56%", // top: "56%",
style: { // style: {
text: (data.ywcRatio) + '%', // text: (data.ywcRatio) + '%',
textAlign: "center", // textAlign: "center",
fill: "#ffffff", // fill: "#ffffff",
fontSize: 12, // fontSize: 12,
}, // },
}, ], // }, ],
color: ['#91cc75', '#f56c6c', ], color: ['#91cc75', '#f56c6c', ],
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
}, },
series: [{ series: [
type: 'pie', /* 外环年度*/
radius: ['40%', '70%'], {
center: ['50%', '60%'], name: '年度',
avoidLabelOverlap: false, type: 'pie',
label: { radius: ['55%', '75%'],
normal: { center: ['50%', '60%'],
show: false, avoidLabelOverlap: false,
formatter: "{value}%", label: {
position: "inside", normal: {
color: 'white' show: false,
formatter: "{value}%",
position: "inside",
color: 'white'
},
position: 'center'
}, },
position: 'center' data: [{
value: yearData.ywcCount,
name: '已完成'
}, {
value: yearData.wccCount,
name: '未完成'
}]
}, },
data: [{
value: data.ywcCount, {
name: '已完成' name: '月度',
}, { type: 'pie',
value: data.wccCount, radius: ['20%', '40%'],
name: '未完成' center: ['50%', '60%'],
}] avoidLabelOverlap: false,
}], label: {
normal: {
show: false,
formatter: "{value}%",
position: "inside",
color: 'white'
},
position: 'center'
},
data: [{
value: monthData.ywcCount,
name: '已完成'
}, {
value: monthData.wccCount,
name: '未完成'
}]
}
],
}; };
key == '公司级' && this.egsjyjgl.setOption(option); key == '公司级' && this.egsjyjgl.setOption(option);
...@@ -749,8 +920,8 @@ ...@@ -749,8 +920,8 @@
key == '班组级' && this.ebzjyjgl.setOption(option); key == '班组级' && this.ebzjyjgl.setOption(option);
}, },
eAqpx(key, data) { eAqpx(key, yearData, monthData) {
console.log(key)
var option = { var option = {
title: { title: {
text: key, text: key,
...@@ -763,44 +934,71 @@ ...@@ -763,44 +934,71 @@
}, },
}, },
graphic: [{ // graphic: [{
type: "text", // type: "text",
left: "center", // left: "center",
top: "56%", // top: "56%",
style: { // style: {
text: (data.ywcRatio) + '%', // text: (data.ywcRatio) + '%',
textAlign: "center", // textAlign: "center",
fill: "#ffffff", // fill: "#ffffff",
fontSize: 12, // fontSize: 12,
}, // },
}, ], // }, ],
color: ['#91cc75', '#f56c6c', ], color: ['#91cc75', '#f56c6c', ],
tooltip: { tooltip: {
trigger: 'item' trigger: 'item'
}, },
series: [{ series: [
type: 'pie', {
radius: ['40%', '70%'], name: '年度',
center: ['50%', '60%'], type: 'pie',
avoidLabelOverlap: false, radius: ['55%', '75%'],
label: { center: ['50%', '60%'],
normal: { avoidLabelOverlap: false,
show: false, label: {
formatter: "{value}%", normal: {
position: "inside", show: false,
color: 'white' formatter: "{value}%",
position: "inside",
color: 'white'
},
position: 'center'
}, },
position: 'center' data: [{
value: yearData.ywcCount,
name: '已完成'
}, {
value: yearData.wccCount,
name: '未完成'
}]
}, },
data: [{
value: data.ywcCount, {
name: '已完成' name: '月度',
}, { type: 'pie',
value: data.wccCount, radius: ['20%', '40%'],
name: '未完成' center: ['50%', '60%'],
}] avoidLabelOverlap: false,
}], label: {
normal: {
show: false,
formatter: "{value}%",
position: "inside",
color: 'white'
},
position: 'center'
},
data: [{
value: monthData.ywcCount,
name: '已完成'
}, {
value: monthData.wccCount,
name: '未完成'
}]
}
],
}; };
key == '公司级' && this.egsjaqpx.setOption(option); key == '公司级' && this.egsjaqpx.setOption(option);
...@@ -815,13 +1013,13 @@ ...@@ -815,13 +1013,13 @@
params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
Object.keys(params).includes('gsId') && (delete params.gsId) Object.keys(params).includes('gsId') && (delete params.gsId)
this.$post('aqgl/homepage/fxgk', params).then(res => { this.$post('aqgl/homepage/fxgk', params).then(res => {
let fxgkMap=new Map() let fxgkMap = new Map()
res.data.records.forEach(item=>{ res.data.records.forEach(item => {
fxgkMap.set(item.dwmc,item) fxgkMap.set(item.dwmc, item)
}) })
this.fxgkList=[] this.fxgkList = []
this.fxgkListSx.forEach(key=>{ this.fxgkListSx.forEach(key => {
this.fxgkList.push(fxgkMap.get(key)) this.fxgkList.push(fxgkMap.get(key))
}) })
}) })
...@@ -847,8 +1045,17 @@ ...@@ -847,8 +1045,17 @@
this.$post('aqgl/homepage/yjgl', params).then(res => { this.$post('aqgl/homepage/yjgl', params).then(res => {
let records = res.data.records let records = res.data.records
let KeyList = Object.keys(records) let KeyList = Object.keys(records)
KeyList.forEach(key => { /* 存储年月*/
this.eYjgl(key, records[key]) this.yjglMonth = records["month"]
this.yjglYear = records["year"]
let monthData = records['monthData']
let yearData = records['yearData']
let dataKeyList = Object.keys(yearData)
dataKeyList.forEach(key => {
this.eYjgl(key, yearData[key], monthData[key])
}) })
}) })
...@@ -859,37 +1066,20 @@ ...@@ -859,37 +1066,20 @@
params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
Object.keys(params).includes('gsId') && (delete params.gsId) Object.keys(params).includes('gsId') && (delete params.gsId)
this.$post('aqgl/homepage/aqpx', params).then(res => { this.$post('aqgl/homepage/aqpx', params).then(res => {
let records = res.data.records || [] let records = res.data.records || []
if (('公司级' in records) == false) {
records['公司级'] = { /* 存储年月*/
"wccCount": 0, this.aqpxMonth = records["month"]
"wccRatio": "0", this.aqpxYear = records["year"]
"ywcRatio": "0",
"allCount": 0, let monthData = records['monthData']
"ywcCount": 0 let yearData = records['yearData']
}
} // let dataKeyList = Object.keys(yearData)
if (('车间级' in records) == false) {
records['车间级'] = {
"wccCount": 0,
"wccRatio": "0",
"ywcRatio": "0",
"allCount": 0,
"ywcCount": 0
}
}
if (('班组级' in records) == false) {
records['班组级'] = {
"wccCount": 0,
"wccRatio": "0",
"ywcRatio": "0",
"allCount": 0,
"ywcCount": 0
}
}
let KeyList = ['公司级', '车间级', '班组级'] let KeyList = ['公司级', '车间级', '班组级']
KeyList.forEach(key => { KeyList.forEach(key => {
this.eAqpx(key, records[key]) this.eAqpx(key, yearData[key], monthData[key])
}) })
}) })
...@@ -900,12 +1090,12 @@ ...@@ -900,12 +1090,12 @@
Object.keys(params).includes('gsId') && (delete params.gsId) Object.keys(params).includes('gsId') && (delete params.gsId)
this.$post('aqgl/homepage/lzgl', params).then(res => { this.$post('aqgl/homepage/lzgl', params).then(res => {
let records = _.cloneDeep(res.data.records || []) let records = _.cloneDeep(res.data.records || [])
let keyList = Object.keys(records).filter(key=>{ let keyList = Object.keys(records).filter(key => {
if(key=='ksrq'){ if (key == 'ksrq') {
this.lzglKsrq=records['ksrq'] this.lzglKsrq = records['ksrq']
}else if(key =='jsrq'){ } else if (key == 'jsrq') {
this.lzglJsrq=records['jsrq'] this.lzglJsrq = records['jsrq']
}else{ } else {
return key return key
} }
}) })
...@@ -1102,7 +1292,7 @@ ...@@ -1102,7 +1292,7 @@
}, },
inityhpc() { inityhpc() {
let params = { let params = {
type:'PC' type: 'PC'
} }
params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
Object.keys(params).includes('gsId') && (delete params.gsId) Object.keys(params).includes('gsId') && (delete params.gsId)
......
...@@ -26,6 +26,13 @@ ...@@ -26,6 +26,13 @@
:match="{value:'id',label:'name'}" v-model='queryParams.pxdj'></RelSelect> :match="{value:'id',label:'name'}" v-model='queryParams.pxdj'></RelSelect>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">年度:</span>
<RelYearSelect style="width: 100%;"
v-model='queryParams.year'></RelYearSelect>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
...@@ -85,6 +92,12 @@ ...@@ -85,6 +92,12 @@
name: 'aqpx', name: 'aqpx',
/* 初始额外赋值*/ /* 初始额外赋值*/
created() {
this.queryParams={
...this.queryParams,
...this.$route.query
}
},
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery({ this.$refs['TablePager'].pageQuery({
setFirstCurrent: true setFirstCurrent: true
......
<template> <template>
<div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.pxjhid' > <div class="min_full" style="height: 72vh;overflow: auto;" v-show='queryParams.pxjhid' >
<!-- 查询条件--> <!-- 查询条件-->
<!-- <div class="search" v-condition> <div class="search" v-condition>
<SearchButton :app='app'></SearchButton> <SearchButton :app='app'></SearchButton>
<el-row :gutter="20" class="search-row-1"> <el-row :gutter="20" class="search-row-1">
<el-col :span="6" class="search-col"> <el-col :span="6" class="search-col">
<div class="search-item"> <div class="search-item">
<span class="search-span">分类:</span> <span class="search-span">月份:</span>
<el-input></el-input> <el-select style="width: 100%;" clearable v-model="queryParams.month" placeholder="请选择">
</div> <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-col> </el-option>
<el-col :span="6" class="search-col"> </el-select>
<div class="search-item"> </div>
<span class="search-span">开始日期:</span> </el-col>
<el-date-picker></el-date-picker> </el-row>
</div> </div>
</el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">结束日期:</span>
<el-date-picker></el-date-picker>
</div>
</el-col>
</el-row>
</div> -->
<!-- 按钮操作--> <!-- 按钮操作-->
<el-row class="tool-bar"> <el-row class="tool-bar">
<PrintButton :app='app'></PrintButton> <PrintButton :app='app'></PrintButton>
...@@ -41,7 +32,7 @@ ...@@ -41,7 +32,7 @@
</el-row> </el-row>
<!-- 表格--> <!-- 表格-->
<div class="tablePagers"> <div class="tablePagers">
<TablePager @getData='getData' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem' <TablePager @getData='getData' :rowClass='rowClass' :ref="'TablePager'" :app='app' :query='query' @selectItem='selectItem'
@getRow='getRow'> @getRow='getRow'>
</TablePager> </TablePager>
...@@ -69,7 +60,11 @@ ...@@ -69,7 +60,11 @@
/* 初始额外赋值*/ /* 初始额外赋值*/
async mounted() { async mounted() {
this.$refs['TablePager'].pageQuery() this.queryParams={
...this.queryParams,
...this.$route.query
}
// this.$refs['TablePager'].pageQuery()
}, },
data() { data() {
return { return {
...@@ -82,10 +77,19 @@ ...@@ -82,10 +77,19 @@
baseUrl: 'aqgl/pxgl/uaqpx', baseUrl: 'aqgl/pxgl/uaqpx',
/* 查询参数*/ /* 查询参数*/
queryParams: { queryParams: {
pxjhid: '' pxjhid: '',
month:''
}, },
/* 表格标题对应参数*/ /* 表格标题对应参数*/
tableTitle: [ tableTitle: [
{label:"状态", prop: "zt",width:80,formatter(row,c,v){
if( row.attachcount>0){
return '完成'
}else{
return '未完成'
}
}},
{label: "月份", prop: "month",width:80},
{label: "培训名称", prop: "name", fieldType: "ftString",width:300}, {label: "培训名称", prop: "name", fieldType: "ftString",width:300},
{label: "分公司", prop: "gsName", fieldType: "ftString",width:192}, {label: "分公司", prop: "gsName", fieldType: "ftString",width:192},
{label: "培训组织单位", prop: "pxdwName", fieldType: "ftString",width:192}, {label: "培训组织单位", prop: "pxdwName", fieldType: "ftString",width:192},
...@@ -117,6 +121,13 @@ ...@@ -117,6 +121,13 @@
} }
}, },
methods: { methods: {
rowClass({ row, rowIndex }) {
if (row.attachcount == 0) {
return "warning-row";
} else {
return "success-row";
}
},
/* 基础查询*/ /* 基础查询*/
query: doQuery, query: doQuery,
......
...@@ -90,7 +90,18 @@ ...@@ -90,7 +90,18 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item v-rule="{
required: true,
rules:rules
}" label="月份" ref="month" prop="month">
<!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> -->
<el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
<el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="培训人数" ref="pxrs" prop="pxrs"> <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-input :readonly="readonly" v-model="form.pxrs" ></el-input> <el-input :readonly="readonly" v-model="form.pxrs" ></el-input>
...@@ -132,6 +143,7 @@ ...@@ -132,6 +143,7 @@
/* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/ /* 当前表单初始值,默认由RelDialog查询indexQuery赋值,copy时不赋值id,初始化时所有query的值都会赋值给form*/
form: { form: {
month:'',
pxrs:'', pxrs:'',
pxdj:'', pxdj:'',
//ID //ID
......
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