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']
-              delete queryParams['gsId']
+          if (queryParams['gsId']) {
+            queryParams['homeGsId'] = queryParams['gsId']
+            delete queryParams['gsId']
           }
-          if(queryParams['bmId']){
-             queryParams['homeBmId']=queryParams['bmId']
-             delete 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/index.vue

@@ -27,6 +27,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:''
 
 				},
 				/* 树的标题 */
@@ -115,6 +122,9 @@ console.log(res,'tree')
 			{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},
            {label: "目标完成标准", prop: "mbwcbz", fieldType: "ftString",width:300},