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

src/views/threeViolations/homePage/index.vue

@@ -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">
             <i class="topL"></i>
             <i class="topR"></i>
@@ -474,24 +474,29 @@
             '公司资质证照': '/dailya/holdCertificate'
           }
           /* 待定todo*/
-          const colorMap={
-            '#91cc75':'Y',
-            '#ffb56b':'D',
-            '#FF7474':'C'
+          const colorMap = {
+            '#91cc75': 'Y',
+            '#ffb56b': 'D',
+            '#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']
-          if(queryParams['gsId']){
-             queryParams['homeGsId']=queryParams['gsId']
+          if (queryParams['gsId']) {
+            queryParams['homeGsId'] = queryParams['gsId']
             delete queryParams['gsId']
           }
-          if(queryParams['bmId']){
-             queryParams['homeBmId']=queryParams['bmId']
+          if (queryParams['bmId']) {
+            queryParams['homeBmId'] = 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 @@
         params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
         this.$post('aqgl/homepage/aqpx', params).then(res => {
           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 => {
             this.eAqpx(key, records[key])
           })
@@ -949,7 +981,7 @@
         params[this.menusItems[this.active]['type']] = this.menusItems[this.active]['id']
         this.$post('aqgl/homepage/yhpc', params).then(res => {
           let records = res.data.records
-          let xData = ['人员违章','设备设施','环境影响','管理缺陷']
+          let xData = ['人员违章', '设备设施', '环境影响', '管理缺陷']
           let yhList = []
           xData.forEach(key => {
             yhList.push(records[key])

src/views/train/planning/edit.vue

 <template>
   <RelDialog :type='type' :editApp='editApp' :app='app' :buttonApp='buttonApp'>
     <!-- 填写表单内容，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-col :span="12">
           <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
+              :match="{value:'id',label:'bmmc'}" v-model='form.gsid'></RelSelect>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="主办单位" ref="bmid" prop="bmid">
-                         <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>
+            <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>
         </el-col>
         <el-col :span="12">
           <el-form-item label="培训时间" ref="pxsj" prop="pxsj">
-                        <el-input :readonly="readonly"  v-model="form.pxsj" ></el-input>
+            <el-input :readonly="readonly" v-model="form.pxsj"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="估计费用" ref="pxfy" prop="pxfy">
-                        <el-input  :readonly="readonly"  v-model="form.pxfy" ></el-input>
+            <el-input :readonly="readonly" v-model="form.pxfy"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <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-col>
         <el-col :span="12">
           <el-form-item label="培训对象" ref="pxdx" prop="pxdx">
-                        <el-input :readonly="readonly"  v-model="form.pxdx" ></el-input>
+            <el-input :readonly="readonly" v-model="form.pxdx"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="培训人数" ref="pxrs" prop="pxrs">
-                        <el-input type="number" :readonly="readonly"  v-model="form.pxrs" ></el-input>
+            <el-input type="number" :readonly="readonly" v-model="form.pxrs"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="培训方式" ref="pxfs" prop="pxfs">
-                      <el-input  :readonly="readonly"  v-model="form.pxfs" ></el-input>
+            <el-input :readonly="readonly" v-model="form.pxfs"></el-input>
             <!-- <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>
         </el-col>
         <el-col :span="12">
           <el-form-item label="项目负责人" ref="xmfzr" prop="xmfzr">
-                      <el-input  :readonly="readonly"  v-model="form.xmfzr" ></el-input>
+            <el-input :readonly="readonly" v-model="form.xmfzr"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="质量负责人" ref="zlfzr" prop="zlfzr">
-                        <el-input  :readonly="readonly"  v-model="form.zlfzr" ></el-input>
+            <el-input :readonly="readonly" v-model="form.zlfzr"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="培训类型" ref="type" prop="type">
-                        <RelSelect :readonly="readonly"  style="width: 100%;"  src='aqgl/pxgl/pxjh/init/type'  filterable clearable :match="{value:'id',label:'name'}" v-model='form.type' ></RelSelect>
+            <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-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="年度" ref="year" prop="year">
             <el-select style="width: 100%;" v-model="form.year" placeholder="请选择">
-                         <el-option v-for="(item,index) in yearList"
-                           :label='item.label'
-                           :value="item.value">
+              <el-option v-for="(item,index) in yearList" :label='item.label' :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -75,9 +77,7 @@
           <el-form-item 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 v-for="(item,index) in 12" :label='`${item}月`' :value="item">
               </el-option>
             </el-select>
           </el-form-item>
@@ -85,9 +85,7 @@
         <el-col v-show="form.type=='Q'" :span="12">
           <el-form-item label="季度" ref="quarter" prop="quarter">
             <el-select style="width: 100%;" v-model="form.quarter" placeholder="请选择">
-                          <el-option v-for="(item,index) in 4"
-                            :label='`${item}季度`'
-                            :value="item">
+              <el-option v-for="(item,index) in 4" :label='`${item}季度`' :value="item">
               </el-option>
             </el-select>
             <!-- <el-input  type="number" :readonly="readonly"  v-model="form.quarter" ></el-input> -->
@@ -97,23 +95,32 @@
       <el-row :gutter="25">
         <el-col :span="24">
           <el-form-item label="完成标准" ref="mbwcbz" prop="mbwcbz">
-                        <el-input type='textarea' :readonly="readonly"  v-model="form.mbwcbz" ></el-input>
+            <el-input type='textarea' :readonly="readonly" v-model="form.mbwcbz"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="培训目标" ref="pxmb" prop="pxmb">
-                        <el-input type='textarea' :readonly="readonly"  v-model="form.pxmb" ></el-input>
+            <el-input type='textarea' :readonly="readonly" v-model="form.pxmb"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
           <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-col>
         <el-col :span="12">
           <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-col>
+        <el-col :span="12">
+          <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>
@@ -121,7 +128,7 @@
 
         <el-col :span="24">
           <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-col>
       </el-row>
@@ -129,18 +136,20 @@
   </RelDialog>
 </template>
 <script>
-    import {editMixin} from 'common'
+  import {
+    editMixin
+  } from 'common'
   export default {
     mixins: [editMixin],
     /* 存放index页面传递的额外参数*/
     mounted() {
-          let year =new Date().getFullYear();
-          this.form.year=year
-          year=year-35
-          for(let i=0;i<40;i++){
+      let year = new Date().getFullYear();
+      this.form.year = year
+      year = year - 35
+      for (let i = 0; i < 40; i++) {
         this.yearList.push({
-              label:year+i+'年',
-              value:year+i
+          label: year + i + '年',
+          value: year + i
         })
       }
     },
@@ -150,7 +159,7 @@
 
     data() {
       return {
-              yearList:[],
+        yearList: [],
         /* 额外初始化，根据需求*/
         systemType: [],
 
@@ -158,58 +167,59 @@
 
         /* 当前表单初始值，默认由RelDialog查询indexQuery赋值，copy时不赋值id，初始化时所有query的值都会赋值给form*/
         form: {
-                  mbwcbz:'',
-                  skr:'',
-                  zlfzr:'',
-                  xmfzr:'',
+          pxjhdj: '',
+          mbwcbz: '',
+          skr: '',
+          zlfzr: '',
+          xmfzr: '',
           /* 新增字段*/
-                  pxsj:'',
-                  pxfy:'',
+          pxsj: '',
+          pxfy: '',
           //ID
-                        id:'',
+          id: '',
           //公司编码
-                        gsid:'',
+          gsid: '',
           //培训项目
-                        name:'',
+          name: '',
           //培训对象
-                        pxdx:'',
+          pxdx: '',
           //培训人数
-                        pxrs:'',
+          pxrs: '',
           //培训类型
-                        type:'',
+          type: '',
           //年度
-                        year:'',
+          year: '',
           //月份
-                        month:'',
+          month: '',
           //季度
-                        quarter:'',
+          quarter: '',
           //培训目标
-                        pxmb:'',
+          pxmb: '',
           //培训方式
-                        pxfs:'',
+          pxfs: '',
 
           //课时
-                        pxsc:'',
+          pxsc: '',
           //主办单位
-                        bmid:'',
+          bmid: '',
           //备注
-                        bz:'',
+          bz: '',
           //维护人编码
-                        whrid:'',
+          whrid: '',
           //维护人
-                        whr:'',
+          whr: '',
           //维护时间
-                        whsj:'',
+          whsj: '',
           //创建人编码
-                        cjrid:'',
+          cjrid: '',
           //创建人
-                        cjr:'',
+          cjr: '',
           //创建时间
-                        cjsj:'',
+          cjsj: '',
           //系统版本
-                        sysversion:'',
+          sysversion: '',
           //附件数
-                        attachcount:'',
+          attachcount: '',
         },
         /* form提交时的规则,具体规则参考官网*/
         rules: {
@@ -218,8 +228,8 @@
       }
     },
     methods: {
-          skrSelected(row){
-            this.form.skrid=row.id
+      skrSelected(row) {
+        this.form.skrid = row.id
       },
 
     }

src/views/train/planning/index.vue

@@ -26,6 +26,12 @@
               <!-- -->
               	<el-input v-model='queryParams.pxfs' size="small" class="search-input"></el-input>
           	</div>
+          </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>
 
@@ -97,7 +103,8 @@ console.log(res,'tree')
           pxfs:'',
           year:'',
           skr:'',
-          gsid:''
+          gsid:'',
+          pxjhdj:''
 
 				},
 				/* 树的标题 */
@@ -114,6 +121,9 @@ console.log(res,'tree')
 			{label: "培训人数", prop: "pxrs", fieldType: "int"},
 			{label: "培训类型", prop: "type", fieldType: "ftString",width:100,transform:{
           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: "pxfy", fieldType: "ftString",width:200},