update code

src/api/flow/index.js

@@ -58,7 +58,7 @@ const listByCategory=(projectId,deptId,category,pageNum,pageSize)=>{
     }
   })
 }
-const listByState=(projectId,deptId,state,pageNum,pageSize)=>{
+const listByState=(projectId,deptId,state,pageNum,pageSize)=>{  
   return request({
     url: `bgscreen/flow/listByState?pageNum=${pageNum}&pageSize=${pageSize}`,
     method: 'post',

src/components/header.vue

@@ -65,11 +65,11 @@
                     </div>
                 </div>
             </div>    
-            <div v-if="isTypeBuser" :class="nav==7?'head-nav active' : 'head-nav'" style="position: relative;"
+            <div v-if="!isTypeBuser" :class="nav==7?'head-nav active' : 'head-nav'" style="position: relative;"
             @click="pageJump(7, '#/enginBUser')">工程管理
             </div>                
         </div>
-        <template v-if="!isTypeBuser">
+        <template v-if="isTypeBuser">
             <div class="head-title-select title-select1" @mouseleave="hideScreenUlSel1" v-if="localStorage1">
                 <div class="head-select head-select-150">
                     <input type="text" :value="dept1" @click="showScreenUlSel1" placeholder="请选择公司" readonly>

src/pages/engin/auditingPage.vue

@@ -37,8 +37,7 @@
                   <div class="active">合同总金额(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data1 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data1 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
               </el-col>
               <el-col :span="12">
@@ -46,8 +45,7 @@
                   <div class="active">建安费总金额(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data2 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data2 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
               </el-col>
             </el-row>
@@ -58,8 +56,7 @@
                   <div class="active">总计付款(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data3 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data3 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
               </el-col>
               <el-col :span="12">
@@ -83,15 +80,13 @@
                   <div class="active">进度款已支付(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data4 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data4 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
                 <div class="warning-info-title">
                   <div class="active">安措费已支付(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data5 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data5 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
               </el-col>
               <el-col :span="12" style="margin-top:40px;">
@@ -99,8 +94,7 @@
                   <div class="active">挂账总金额(万元)</div>
                 </div>
 
-                <people-number :number="((sumCost.data6 * 1.0 || 0).toFixed(2)) || '0.00'"
+                <people-number :number="((sumCost.data6 * 1.0 || 0).toFixed(2)) || '0.00'" unit=""></people-number>
-                  unit=""></people-number>
 
               </el-col>
             </el-row>
@@ -209,10 +203,10 @@
                     </td>
                   </tr>
                 </table>
-              </div>              
+              </div>
-              <el-pagination layout="total,prev, pager, next"
+              <el-pagination layout="total,prev, pager, next" @current-change="handleCurrentChange"
-                @current-change="handleCurrentChange" :total="data4Page.total" :page-size="data4Page.pageSize"
+                :total="data4Page.total" :page-size="data4Page.pageSize" :current-page.sync="data4Page.pageIndex"
-                :current-page.sync="data4Page.pageIndex" class="bg-pagination" :pager-count="2"></el-pagination>
+                class="bg-pagination" :pagerCount="5"></el-pagination>
             </template>
             <div v-else style="text-align: center;margin-top:100px;" class="div-no-data">
               <img src="images/nodata.png" style="width: 120px;">
@@ -290,6 +284,7 @@ export default {
       this.$refs.stateDlg.showDialog(obj);
     },
     changeChart1(opt) {
+      opt.xAxis.axisLabel = { interval: 0, rotate: 0, fontSize: 9, color: "#fff" }
       opt.legend = {
         textStyle: {
           color: "#fff"
@@ -330,7 +325,7 @@ export default {
         postData.id = this.dept.id;
       }
       this.$api.flow.listFlowBySubDeptType(postData, this.data4Page.pageIndex, this.data4Page.pageSize).then(d => {
-        let data = d.rows || [];       
+        let data = d.rows || [];
         this.dataList4 = data;
         this.data4Page.total = d.total;
       });
@@ -376,6 +371,18 @@ export default {
       this.chartInfo = [];
       let sum = 0;
       (res.data || []).forEach(it => {
+        if (it.taskName == "程序及质量类") {
+          it.taskName = "质量";
+        }
+        if (it.taskName == "项目管理制度类") {
+          it.taskName = "项目制度";
+        }
+        if (it.taskName == "特殊事项确认类") {
+          it.taskName = "特殊事项";
+        }
+        if (it.taskName == "专项验收审批") {
+          it.taskName = "专项验收";
+        }
         let o = {
           title: it.taskName,
           comp: it.assigneeId || 0,
@@ -488,7 +495,7 @@ export default {
         line-height: 40px;
       }
     }
-  }  
+  }
 
   .data-list3 {
     max-height: calc(100% - 70px);

src/pages/engin/flowDetailByStateDialog.vue

@@ -69,7 +69,10 @@ export default {
         },
         showDialog(data) {
             this.deptId=data.deptId;
-            this.projectId=data.projectId;
+            this.projectId=this.$root.project.id;
+            if(this.projectId==0 && this.$root.projects.length>0){
+                this.projectId=this.$root.projects[0].id;
+            }
             if(data.prj){
                 this.prjName=data.prj.name||'';
             }else{

src/pages/engin/flowListByCategory.vue

@@ -1,16 +1,22 @@
 <template>
-    <div class="flow-list-by-category quality-table ">
+    <div class="flow-list-by-category quality-table ">        
-        <div class="nav">
+        <div class="head-title-tab" style="padding: 10px 10px;width:unset;">
-            <div class="nav-item" :style="'width:' + navWidth" :class="it.dictValue == selItem.dictValue ? 'active' : ''"
+            <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doQuery(1)">质量</div>
-                v-for="(it, idx) in categories" :key="idx" @click="doQuery(it)">{{ it.dictLabel }}</div>
+            <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doQuery(2)">安全</div>
+            <div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doQuery(3)">认价类</div>
+            <div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doQuery(4)">图纸类</div>
+            <div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doQuery(5)">项目制度</div>
+            <div :class="nav == 6 ? 'head-nav active' : 'head-nav'" @click="doQuery(6)">索赔类</div>
+            <div :class="nav == 7 ? 'head-nav active' : 'head-nav'" @click="doQuery(7)">特殊事项</div>
+            <div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doQuery(8)">专项验收</div>
         </div>
 
-        <el-table :data="tableData" class="mytable" style="background: transparent;"
+        <el-table :data="tableData" class="mytable" style="background: transparent;" height="300"
             ref="fbsubordinateUnit">            
-            <el-table-column prop="businessKeyName" label="申请项目" class-name="text-left">
+            <el-table-column prop="procDefName" label="流程名称" class-name="text-left">
             </el-table-column>            
             
-            <el-table-column prop="startUserName" label="当前状态" width="100">
+            <el-table-column prop="startUserName" label="申请状态" width="100">
                 <template slot-scope="{row}">
                     <span v-if="row.finishTime" style="color: greenyellow;">已完成</span>
                     <span v-else style="color: red;">进行中</span>
@@ -24,7 +30,7 @@
                 </template>
             </el-table-column>
         </el-table>
-        <el-pagination layout="total,prev, pager, next" :hide-on-single-page="true" @current-change="handleCurrentChange"
+        <el-pagination layout="total,prev, pager, next" :hide-on-single-page="false" :pagerCount="5" @current-change="handleCurrentChange"
             :total="total" :page-size="size" :current-page.sync="index" class="bg-pagination"></el-pagination>
 
     </div>
@@ -33,31 +39,21 @@
 <script>
 export default {
     name: 'JhbigscreenFlowListByCategory',
-    props: {
+   
-        getPData: {
-            type: Function,
-            default: null
-        }
-    },
     data() {
         return {
             index: 1,
             size: 10,
             total: 0,
-            categories: [],
+            nav:1,
-            selItem: {},
             tableData: [],
             navWidth: '',
+            deptId:0,
+            projectId:0,
         };
     },
     created() {
-        this.$api.dict('sys_process_category').then(d => {
+        
-            this.categories = d || [];
-            if (this.categories.length > 0) {
-                this.doQuery(this.categories[0])
-            }
-            this.navWidth = (98.0 / this.categories.length).toFixed(2) + "%";
-        });
     },
     mounted() {
 
@@ -78,23 +74,29 @@ export default {
             this.index = n;
             this.loadData();
         },
+        initData(){
+            this.deptId=this.$root.dept.id;
+            this.projectId=this.$root.project.id;
+            if(this.projectId==0 && this.$root.projects.length>1){
+                this.projectId=this.$root.projects[1].id;
+            }
+            if(this.projectId>0){
+                this.nav=1;
+                this.index=1;
+                this.loadData();
+            }
+        },
         reLoad(){
             this.index=1;
             this.loadData();
-        },
+        },       
-        doNav(n) {
-            this.nav = n;
-            this.index = 1;
-            this.loadData();
-        },
         doQuery(it) {
-            this.selItem = it;
+            this.nav = it;
             this.index = 1;
             this.loadData();
         },
-        loadData() {
+        loadData() {            
-            let obj = this.getPData ? this.getPData() || {} : {}
+            this.$api.flow.listByCategory(this.projectId, this.deptId, this.nav, this.index, this.size).then(d => {
-            this.$api.flow.listByCategory(obj.projectId, obj.deptId, this.selItem.dictValue, this.index, this.size).then(d => {
                 this.tableData = d.rows || [];
                 this.total = d.total;
             })
@@ -106,7 +108,18 @@ export default {
 <style lang="less" scoped>
 .flow-list-by-category {
     padding:0px;
-    height:calc(~"100% - 40px");
+    height:calc(~"100% - 370px");
+    .head-title-tab{        
+        .head-nav{            
+            background: none;
+            color:#82c9ff;
+            padding: 0px 4px;
+            &.active{
+                color:rgb(0, 144, 255);
+                font-weight: bold;
+            }
+        }
+    }
     .bg-pagination{
         margin-top:10px;
     }
@@ -127,7 +140,7 @@ export default {
         }
     }
     .mytable{
-        height:calc(~"100% - 100px");
+        height:calc(~"100% - 100px") !important;
         margin:12px 12px;
         width:calc(~"100% - 24px");
         border:solid 1px #142c6a;

src/pages/engin/projectStandardList.vue

@@ -11,7 +11,7 @@
         <div class="image-list scroll" v-if="tableData.length>0">
             <imageItem v-for="(it, idx) in tableData" :key="idx" :info="it"></imageItem>
         </div>
-        <el-pagination layout="total,prev, pager, next" :hide-on-single-page="false"  v-if="tableData.length>0" :pager-count="3"
+        <el-pagination layout="total,prev, pager, next" :hide-on-single-page="false"  v-if="tableData.length>0" :pagerCount="5"
             @current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index"
             class="bg-pagination"></el-pagination>
             <div v-if="tableData.length == 0" style="text-align: center;margin-top: 150px;">

src/pages/projectEngin.vue

@@ -345,8 +345,8 @@ export default {
                 {id:1,text:'现场管理标准化',value:0},
                 {id:2,text:'作业标准化',value:0},
                 {id:3,text:'安全技术标准化',value:0},                
-                {id:4,text:'设备管理标准化',value:0},
+                {id:4,text:'文明施工标准化',value:0},
-                {id:5,text:'文明施工标准化',value:0},
+                {id:5,text:'设备管理标准化',value:0},
                 {id:6,text:'环境保护标准化',value:0}
             ];
             datas.forEach(d => {

src/pages/projectEnginBUser.vue

@@ -119,6 +119,7 @@
                                 <span style="display:inline-block;margin-left:12px;">工程审批明细</span>
                             </div>
                         </div>
+                        <ListByCategory ref="auditList"/>
                     </module-one-3-1>
                 </el-col>
             </el-row>
@@ -146,6 +147,7 @@ import enginChart from './engin/enginChart.vue'
 import { tryToJson } from '@/utils/tools'
 import ListByCategory from './engin/flowListByCategory.vue'
 import projectStandardList from './engin/projectStandardList.vue'
+
 export default {
     name: 'JhbigscreenProjectEngin',
     components: { BorderBox6, imageItem, unitDialog, stateDialog, enginChart, projectStandardDialog, ListByCategory, magListDialog,projectStandardList },
@@ -201,6 +203,7 @@ export default {
             this.$refs.stateDlg.showDialog(obj);
         },
         changeChart1(opt) {
+            opt.xAxis.axisLabel={ interval: 0, rotate: 0,fontSize:9,color:"#fff" }
             opt.legend = {
                 textStyle: {
                     color: "#fff"
@@ -260,8 +263,8 @@ export default {
                 { id: 1, text: '现场管理标准化', value: 0 },
                 { id: 2, text: '作业标准化', value: 0 },
                 { id: 3, text: '安全技术标准化', value: 0 },
-                { id: 4, text: '设备管理标准化', value: 0 },
+                { id: 4, text: '文明施工标准化', value: 0 },
-                { id: 5, text: '文明施工标准化', value: 0 },
+                { id: 5, text: '设备管理标准化', value: 0 },
                 { id: 6, text: '环境保护标准化', value: 0 }
             ];
             datas.forEach(d => {
@@ -297,6 +300,9 @@ export default {
                     if(this.$refs.prjStandList){
                         this.$refs.prjStandList.initData();
                     }
+                    if(this.$refs.auditList){
+                        this.$refs.auditList.initData();
+                    }
                     this.showChart1(res[0]);
                     this.showFlowChart2(res[1]);
                     this.showMagGroup(res[2]);
@@ -310,6 +316,18 @@ export default {
             this.chartInfo = [];
             let sum = 0;
             (res.data || []).forEach(it => {
+                if(it.taskName=="程序及质量类"){
+                    it.taskName="质量";
+                }
+                if(it.taskName=="项目管理制度类"){
+                    it.taskName="项目制度";
+                }
+                if(it.taskName=="特殊事项确认类"){
+                    it.taskName="特殊事项";
+                }
+                if(it.taskName=="专项验收审批"){
+                    it.taskName="专项验收";
+                }
                 let o = {
                     title: it.taskName,
                     comp: it.assigneeId || 0,