Skip to content

D
dxgaqgl-vue
Commit a241a785 authored by 李苏's avatar 李苏 💬
Browse files
Options

11.29 大溪沟首页调整，连带功能调整

parent 6d7682ad
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 229 deletions
src/views/threeViolations/homePage/index.vue
View file @ a241a785
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
<div class="flex1" style="margin-right: 5px;" @click="$router.push('/train/assessment')"> <div class="flex1" style="margin-right: 5px;" @click="$router.push('/train/planning')">
<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>
...@@ -474,24 +474,29 @@ ...@@ -474,24 +474,29 @@
'公司资质证照': '/dailya/holdCertificate' '公司资质证照': '/dailya/holdCertificate'
} }
/* 待定todo*/ /* 待定todo*/
const colorMap={ const colorMap = {
'#91cc75':'Y', '#91cc75': 'Y',
'#ffb56b':'D', '#ffb56b': 'D',
'#FF7474':'C' '#FF7474': 'C'
} }
/* 开始判定*/ /* 开始判定*/
let queryParams={ homeCzyjType:colorMap[params.color]} let queryParams = {
homeCzyjType: colorMap[params.color]
}
queryParams[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] queryParams[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
if(queryParams['gsId']){ if (queryParams['gsId']) {
queryParams['homeGsId']=queryParams['gsId'] queryParams['homeGsId'] = queryParams['gsId']
delete queryParams['gsId'] delete queryParams['gsId']
} }
if(queryParams['bmId']){ if (queryParams['bmId']) {
queryParams['homeBmId']=queryParams['bmId'] queryParams['homeBmId'] = queryParams['bmId']
delete queryParams['bmId'] delete queryParams['bmId']
} }
this.$router.push({ path: pathMap[params.name], query: queryParams }); this.$router.push({
path: pathMap[params.name],
query: queryParams
});
}) })
...@@ -741,7 +746,34 @@ ...@@ -741,7 +746,34 @@
params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
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 || []
let KeyList = Object.keys(records) 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
}
}
if (('班组级' in records) == false) {
records['班组级'] = {
"wccCount": 0,
"wccRatio": "0",
"ywcRatio": "0",
"allCount": 0,
"ywcCount": 0
}
}
let KeyList = ['公司级', '车间级', '班组级']
KeyList.forEach(key => { KeyList.forEach(key => {
this.eAqpx(key, records[key]) this.eAqpx(key, records[key])
}) })
...@@ -949,7 +981,7 @@ ...@@ -949,7 +981,7 @@
params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id'] params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
this.$post('aqgl/homepage/yhpc', params).then(res => { this.$post('aqgl/homepage/yhpc', params).then(res => {
let records = res.data.records let records = res.data.records
let xData = ['人员违章','设备设施','环境影响','管理缺陷'] let xData = ['人员违章', '设备设施', '环境影响', '管理缺陷']
let yhList = [] let yhList = []
xData.forEach(key => { xData.forEach(key => {
yhList.push(records[key]) yhList.push(records[key])
......
src/views/train/planning/edit.vue
View file @ a241a785
<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 slot="form" ref="form" :model="form" label-width="80px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="120px" :rules="rules">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="公司" ref="gsid" prop="gsid"> <el-form-item label="公司" ref="gsid" prop="gsid">
<RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect> <RelSelect :readonly="readonly" style="width: 100%;" src='jcsj/common/bm/queryGs' filterable clearable
</el-form-item> :match="{value:'id',label:'bmmc'}" v-model='form.gsid'></RelSelect>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="主办单位" ref="bmid" prop="bmid"> <el-col :span="12">
<RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;" src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid' ></RelSelect> <el-form-item label="主办单位" ref="bmid" prop="bmid">
</el-form-item> <RelSelect :readonly="readonly" linkage :linkParams="{pid:form.gsid}" style="width: 100%;"
</el-col> src='jcsj/common/bm/queryBz' filterable clearable :match="{value:'id',label:'bmmc'}" v-model='form.bmid'>
<el-col :span="12"> </RelSelect>
<el-form-item label="培训时间" ref="pxsj" prop="pxsj"> </el-form-item>
<el-input :readonly="readonly" v-model="form.pxsj" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="培训时间" ref="pxsj" prop="pxsj">
<el-col :span="12"> <el-input :readonly="readonly" v-model="form.pxsj"></el-input>
<el-form-item label="估计费用" ref="pxfy" prop="pxfy"> </el-form-item>
<el-input :readonly="readonly" v-model="form.pxfy" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="估计费用" ref="pxfy" prop="pxfy">
<el-col :span="12"> <el-input :readonly="readonly" v-model="form.pxfy"></el-input>
<el-form-item label="培训项目" ref="name" prop="name"> </el-form-item>
<el-input :readonly="readonly" v-model="form.name" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="培训项目" ref="name" prop="name">
<el-col :span="12"> <el-input :readonly="readonly" v-model="form.name"></el-input>
<el-form-item label="培训对象" ref="pxdx" prop="pxdx"> </el-form-item>
<el-input :readonly="readonly" v-model="form.pxdx" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="培训对象" ref="pxdx" prop="pxdx">
<el-col :span="12"> <el-input :readonly="readonly" v-model="form.pxdx"></el-input>
<el-form-item label="培训人数" ref="pxrs" prop="pxrs"> </el-form-item>
<el-input type="number" :readonly="readonly" v-model="form.pxrs" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
<el-col :span="12"> <el-input type="number" :readonly="readonly" v-model="form.pxrs"></el-input>
<el-form-item label="培训方式" ref="pxfs" prop="pxfs"> </el-form-item>
<el-input :readonly="readonly" v-model="form.pxfs" ></el-input> </el-col>
<!-- <RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxfs' ></RelSelect> --> <el-col :span="12">
</el-form-item> <el-form-item label="培训方式" ref="pxfs" prop="pxfs">
</el-col> <el-input :readonly="readonly" v-model="form.pxfs"></el-input>
<el-col :span="12"> <!-- <RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxfs' filterable clearable :match="{value:'id',label:'name'}" v-model='form.pxfs' ></RelSelect> -->
<el-form-item label="项目负责人" ref="xmfzr" prop="xmfzr"> </el-form-item>
<el-input :readonly="readonly" v-model="form.xmfzr" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="项目负责人" ref="xmfzr" prop="xmfzr">
<el-col :span="12"> <el-input :readonly="readonly" v-model="form.xmfzr"></el-input>
<el-form-item label="质量负责人" ref="zlfzr" prop="zlfzr"> </el-form-item>
<el-input :readonly="readonly" v-model="form.zlfzr" ></el-input> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="质量负责人" ref="zlfzr" prop="zlfzr">
</el-row> <el-input :readonly="readonly" v-model="form.zlfzr"></el-input>
<el-row :gutter="20"> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="培训类型" ref="type" prop="type"> </el-row>
<RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/type' filterable clearable :match="{value:'id',label:'name'}" v-model='form.type' ></RelSelect> <el-row :gutter="20">
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="培训类型" ref="type" prop="type">
<el-col :span="12"> <RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/type' filterable clearable
<el-form-item label="年度" ref="year" prop="year"> :match="{value:'id',label:'name'}" v-model='form.type'></RelSelect>
<el-select style="width: 100%;" v-model="form.year" placeholder="请选择"> </el-form-item>
<el-option v-for="(item,index) in yearList" </el-col>
:label='item.label' <el-col :span="12">
:value="item.value"> <el-form-item label="年度" ref="year" prop="year">
</el-option> <el-select style="width: 100%;" v-model="form.year" placeholder="请选择">
</el-select> <el-option v-for="(item,index) in yearList" :label='item.label' :value="item.value">
</el-form-item> </el-option>
</el-col> </el-select>
<el-col v-show="form.type=='M'" :span="12"> </el-form-item>
<el-form-item label="月份" ref="month" prop="month"> </el-col>
<!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> --> <el-col v-show="form.type=='M'" :span="12">
<el-select style="width: 100%;" v-model="form.month" placeholder="请选择"> <el-form-item label="月份" ref="month" prop="month">
<el-option v-for="(item,index) in 12" <!-- <el-input type="number" :readonly="readonly" v-model="form.month" ></el-input> -->
:label='`${item}月`' <el-select style="width: 100%;" v-model="form.month" placeholder="请选择">
:value="item"> <el-option v-for="(item,index) in 12" :label='`${item}月`' :value="item">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-show="form.type=='Q'" :span="12"> <el-col v-show="form.type=='Q'" :span="12">
<el-form-item label="季度" ref="quarter" prop="quarter"> <el-form-item label="季度" ref="quarter" prop="quarter">
<el-select style="width: 100%;" v-model="form.quarter" placeholder="请选择"> <el-select style="width: 100%;" v-model="form.quarter" placeholder="请选择">
<el-option v-for="(item,index) in 4" <el-option v-for="(item,index) in 4" :label='`${item}季度`' :value="item">
:label='`${item}季度`' </el-option>
:value="item"> </el-select>
</el-option> <!-- <el-input type="number" :readonly="readonly" v-model="form.quarter" ></el-input> -->
</el-select> </el-form-item>
<!-- <el-input type="number" :readonly="readonly" v-model="form.quarter" ></el-input> --> </el-col>
</el-form-item> </el-row>
</el-col> <el-row :gutter="25">
</el-row> <el-col :span="24">
<el-row :gutter="25"> <el-form-item label="完成标准" ref="mbwcbz" prop="mbwcbz">
<el-col :span="24"> <el-input type='textarea' :readonly="readonly" v-model="form.mbwcbz"></el-input>
<el-form-item label="完成标准" ref="mbwcbz" prop="mbwcbz"> </el-form-item>
<el-input type='textarea' :readonly="readonly" v-model="form.mbwcbz" ></el-input> </el-col>
</el-form-item> <el-col :span="24">
</el-col> <el-form-item label="培训目标" ref="pxmb" prop="pxmb">
<el-col :span="24"> <el-input type='textarea' :readonly="readonly" v-model="form.pxmb"></el-input>
<el-form-item label="培训目标" ref="pxmb" prop="pxmb"> </el-form-item>
<el-input type='textarea' :readonly="readonly" v-model="form.pxmb" ></el-input> </el-col>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="授课人" ref="skr" prop="skr"> <el-form-item label="授课人" ref="skr" prop="skr">
<el-input :readonly="readonly" v-model="form.skr" ></el-input> <el-input :readonly="readonly" v-model="form.skr"></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="pxsc" prop="pxsc"> <el-form-item label="课时" ref="pxsc" prop="pxsc">
<el-input :readonly="readonly" v-model="form.pxsc" ></el-input> <el-input :readonly="readonly" v-model="form.pxsc"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="12">
<el-row :gutter="20"> <el-form-item label="培训计划等级" v-rule="{
required: true,
rules:rules
}" ref="pxjhdj" prop="pxjhdj">
<RelSelect :readonly="readonly" style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxjhdj' filterable clearable
:match="{value:'id',label:'name'}" v-model='form.pxjhdj'></RelSelect>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<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-row> </el-row>
</el-form> </el-form>
</RelDialog> </RelDialog>
</template> </template>
<script> <script>
import {editMixin} from 'common' import {
export default { editMixin
mixins: [editMixin], } from 'common'
/* 存放index页面传递的额外参数*/ export default {
mounted() { mixins: [editMixin],
let year =new Date().getFullYear(); /* 存放index页面传递的额外参数*/
this.form.year=year mounted() {
year=year-35 let year = new Date().getFullYear();
for(let i=0;i<40;i++){ this.form.year = year
this.yearList.push({ year = year - 35
label:year+i+'年', for (let i = 0; i < 40; i++) {
value:year+i this.yearList.push({
}) label: year + i + '年',
} value: year + i
}, })
/* 组件名称*/ }
name: "aqgl/pxglPxjhEdit", },
/* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/ /* 组件名称*/
name: "aqgl/pxglPxjhEdit",
data() { /* 传递props模式一样必填，用于index,button,REdialog之间的组件通信*/
return {
yearList:[],
/* 额外初始化，根据需求*/
systemType: [],
bmList: [], data() {
return {
yearList: [],
/* 额外初始化，根据需求*/
systemType: [],
/* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/ bmList: [],
form: {
mbwcbz:'',
skr:'',
zlfzr:'',
xmfzr:'',
/* 新增字段*/
pxsj:'',
pxfy:'',
//ID
id:'',
//公司编码
gsid:'',
//培训项目
name:'',
//培训对象
pxdx:'',
//培训人数
pxrs:'',
//培训类型
type:'',
//年度
year:'',
//月份
month:'',
//季度
quarter:'',
//培训目标
pxmb:'',
//培训方式
pxfs:'',
//课时 /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
pxsc:'', form: {
//主办单位 pxjhdj: '',
bmid:'', mbwcbz: '',
//备注 skr: '',
bz:'', zlfzr: '',
//维护人编码 xmfzr: '',
whrid:'', /* 新增字段*/
//维护人 pxsj: '',
whr:'', pxfy: '',
//维护时间 //ID
whsj:'', id: '',
//创建人编码 //公司编码
cjrid:'', gsid: '',
//创建人 //培训项目
cjr:'', name: '',
//创建时间 //培训对象
cjsj:'', pxdx: '',
//系统版本 //培训人数
sysversion:'', pxrs: '',
//附件数 //培训类型
attachcount:'', type: '',
}, //年度
/* form提交时的规则,具体规则参考官网*/ year: '',
rules: { //月份
month: '',
//季度
quarter: '',
//培训目标
pxmb: '',
//培训方式
pxfs: '',
} //课时
} pxsc: '',
//主办单位
bmid: '',
//备注
bz: '',
//维护人编码
whrid: '',
//维护人
whr: '',
//维护时间
whsj: '',
//创建人编码
cjrid: '',
//创建人
cjr: '',
//创建时间
cjsj: '',
//系统版本
sysversion: '',
//附件数
attachcount: '',
}, },
methods: { /* form提交时的规则,具体规则参考官网*/
skrSelected(row){ rules: {
this.form.skrid=row.id
},
} }
}
},
methods: {
skrSelected(row) {
this.form.skrid = row.id
},
} }
}
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
......
src/views/train/planning/index.vue
View file @ a241a785
...@@ -27,6 +27,12 @@ ...@@ -27,6 +27,12 @@
<el-input v-model='queryParams.pxfs' size="small" class="search-input"></el-input> <el-input v-model='queryParams.pxfs' size="small" class="search-input"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="search-col">
<div class="search-item">
<span class="search-span">计划等级:</span>
<RelSelect style="width: 100%;" src='aqgl/pxgl/pxjh/init/pxjhdj' filterable clearable :match="{value:'id',label:'name'}" v-model='queryParams.pxjhdj' ></RelSelect>
</div>
</el-col>
</el-row> </el-row>
...@@ -97,7 +103,8 @@ console.log(res,'tree') ...@@ -97,7 +103,8 @@ console.log(res,'tree')
pxfs:'', pxfs:'',
year:'', year:'',
skr:'', skr:'',
gsid:'' gsid:'',
pxjhdj:''
}, },
/* 树的标题 */ /* 树的标题 */
...@@ -115,6 +122,9 @@ console.log(res,'tree') ...@@ -115,6 +122,9 @@ console.log(res,'tree')
{label: "培训类型", prop: "type", fieldType: "ftString",width:100,transform:{ {label: "培训类型", prop: "type", fieldType: "ftString",width:100,transform:{
url:'aqgl/pxgl/pxjh/init/type',label:'name',value:'id' url:'aqgl/pxgl/pxjh/init/type',label:'name',value:'id'
}}, }},
{label: "培训计划等级", prop: "pxjhdj", width:100,transform:{
url:'aqgl/pxgl/pxjh/init/pxjhdj',label:'name',value:'id'
}},
{label: "培训时间", prop: "pxsj", fieldType: "ftString",width:200}, {label: "培训时间", prop: "pxsj", fieldType: "ftString",width:200},
{label: "估计费用", prop: "pxfy", fieldType: "ftString",width:200}, {label: "估计费用", prop: "pxfy", fieldType: "ftString",width:200},
{label: "目标完成标准", prop: "mbwcbz", fieldType: "ftString",width:300}, {label: "目标完成标准", prop: "mbwcbz", fieldType: "ftString",width:300},
......
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