src/api/api.js

@@ -88,3 +88,64 @@ export const getCompleteMonthStatus = (params) => {
   {params},
    )
 };
+export function filterCompanyAPI (params) {
+  return request({
+    url: '/rcm/company-credit/filterCompany',
+    method: 'post',
+    data: params
+  })
+}
+
+export function normalScanAPI (params) {
+  return request({
+    url: '/rcm/company-credit/report',
+    method: 'post',
+    data: params
+  })
+}
+
+export function deepScanAPI (params) {
+  return request({
+    url: '/rcm/company-credit/deepAuthUrl',
+    method: 'post',
+    data: params
+  })
+}
+
+export function reportDetailAPI (params) {
+  return request({
+    url: `/rcm/company-credit/detail?requestId=${params.id}`,
+    method: 'get',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function deepReportAPI (params) {
+  return request({
+    url: `/rcm/company-credit/deep-report`,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
+
+export function taxInfoAPI (params) {
+  return request({
+    url: `/rcm/company-credit/taxInfo`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function saveScoreAPI (params) {
+  return request({
+    url: `/rcm/company-credit/updateScore`,
+    method: 'post',
+    data: params
+  })
+}

src/api/personnel.js

@@ -26,16 +26,4 @@ export const getUserGroup = (params) => {
     {params},
      )
 };
-//施工人员组成
-export const getGroupCensus = (params) => {
-    return axios.get('api/ems-third-party-service/user/groupCensus',
-    {params},
-     )
-};
-//考勤监控
-export const getAttend = (params) => {
-    return axios.get('api/ems-third-party-service/user/attend',
-    {params},
-     )
-};
 

src/components/common/pieChart.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:100%;height:100%;">
     <div ref="chart" style="width:100%;height:100%;"></div>
-    <!-- <div class="boxPeople aa">
+    <div class="boxPeople aa">
       <div class="name" style="color: #fcecb8;">架子工</div>
       <div class="nucm" style="color: #eadfb4;">33<span
           style=" font-size: 18px; font-weight: 400;color: #fcecb8;">%</span></div>
@@ -20,7 +20,7 @@
       <div class="name" style="color: #53E3FF">项目监理组</div>
       <div class="nucm" style="color: #d9def4;">40<span style=" font-size: 18px; font-weight: 400;color:#d9def4">%</span>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 <script>
@@ -39,10 +39,7 @@ export default {
             return ['#00A572', '#007EC1', '#DA9300', '#878787']
         } 
     },
-    constructionPersonnel:{
+
-      type: Array,
-      default:null 
-    }
   },
 
   components: {
@@ -52,30 +49,61 @@ export default {
     return {}
   },
   mounted() {
-    
+    this.initCharts(window.innerHeight)
   },
   watch: {
-    // // 监听父组件中的数据变化，重新触发Echarts
+    // 监听父组件中的数据变化，重新触发Echarts
-    // chartData: {
+    chartData: {
-    //   deep: true,
-    //   handler() {
-    //     this.resetOption()
-    //   }
-    // },
-    constructionPersonnel:{
       deep: true,
-      handler(newVal) {
+      handler() {
-        this.initCharts(newVal)
+        this.resetOption()
       }
     }
   },
   methods: {
-    initCharts(dataList) {
+    initCharts() {
       let myChart = this.$echarts.init(this.$refs.chart)
-      var val1data2 = []
+      var val1data2 = [{
-        val1data2 = Object.keys(dataList).map((item,index)=>{
+          value: 33,
-          return {name:dataList[item].post,value:dataList[item].percent}
+          name: '电工',
-        })
+          itemStyle: { // 此配置
+                normal: {
+                  borderWidth: 2,
+                  borderColor: '#52FFC1'
+                }
+              },
+        },
+        {
+          value: 13,
+          name: '项目监理组',
+          itemStyle: { // 此配置
+                normal: {
+                  borderWidth: 2,
+                  borderColor: '#B6F9FF'
+                }
+              },
+        },
+        {
+          value: 14,
+          name: '土建专工',
+          itemStyle: { // 此配置
+                normal: {
+                  borderWidth: 2,
+                  borderColor: '#DCD6FF'
+                }
+              },
+        },
+        {
+          value: 43,
+          name: '架子工',
+          itemStyle: { // 此配置
+                normal: {
+                  borderWidth: 2,
+                  borderColor: '#FFF6DA'
+                }
+              },
+        }
+        ]
       var arr = ['middleLost', 0.6, val1data2, '今日完成进度']
       // 绘制图表
       myChart.setOption({
@@ -88,37 +116,30 @@ export default {
               height:120
             },
             left: '162',//
-            top: '104' //配置图片居中
+            top: '109' //配置图片居中
           }]
         },
         series: [
         // ['48%', '60%']
           {
             type: 'pie',
-            radius: this.picIsShow ? ['48%', '60%'] : ['57%', '57%'],
+            radius: this.picIsShow ? ['51%', '63%'] : ['60%', '60%'],
-            center: ['50%', '55%'],
+            center: ['50%', '170'],
             color: this.colorList,
             hoverAnimation: true, /// /设置饼图默认的展开样式
             label: {
-              show: true,
+              show: false,
-              formatter: '{b}：{c}%',
+              formatter: '{b}{c}%',
-              padding:[0,10,0,50],
-              itemStyle: { // 此配置
-                normal: {
-                  borderWidth: 2,
-                  borderColor: '#52FFC1'
-                }
-              },
               rich: {
                 d: {
                   color: '#fff',
-                  fontSize: 20,
+                  fontSize: 16,
                   lineHeight: 24,
                   height: 24
                 },
                 c: {
                   color: "red",
-                  fontSize: 20,
+                  fontSize: 14,
                   lineHeight: 20,
                   align: 'left',
                 }

src/components/common/pieDateChart.vue

@@ -5,7 +5,7 @@
       <span>{{totalPer}}</span>
       <span>人</span>
     </div>
-    <div ref="chart" style="width:100%;height:100%;position: relative;left: 53%;"></div>
+    <div ref="chart" style="width:100%;height:100%;"></div>
     <div class="jsBox">
       <div class="bogJs" v-for="(item, i) in pieData" :key="i">
         <div class="jsChild">
@@ -101,127 +101,323 @@ export default {
 
     initCharts() {
       let myChart = this.$echarts.init(this.$refs.chart);
-      var placeHolderStyle = {
+    //   var placeHolderStyle = {
-        normal: {
+    //     normal: {
-          label: {
+    //       label: {
-            show: false,
+    //         show: false,
-            position: "center"
+    //         position: "center"
-          },
+    //       },
-          labelLine: {
+    //       labelLine: {
-            show: false
+    //         show: false
-          },
+    //       },
-          color: "#104841a3",
+    //       color: "#104841a3",
-          borderWidth: 0
+    //       borderWidth: 0
+    //     },
+    //     emphasis: {
+    //       color: "#104841a3",
+    //       borderColor: "#00b3ff",
+    //       borderWidth: 0
+    //     }
+    //   };
+    //   // 绘制图表
+    //   myChart.setOption({
+    //     series: [
+    //       {
+    //         name: '值',
+    //         type: 'pie',
+    //         clockWise: true,
+    //         hoverAnimation: false,
+    //         radius: ['92%', '97%'],
+    //         center: ['50%', '50%'],
+    //         itemStyle: {
+    //           normal: {
+    //             label: {
+    //               show: false
+    //             },
+    //             labelLine: {
+    //               show: false,
+    //               length: 100,
+    //               smooth: 0.5
+    //             },
+    //             borderWidth: 5,
+    //             shadowBlur: 40,
+    //             borderColor: "#00B3FF",
+    //             shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
+    //           }
+    //         },
+    //         data: [{
+    //           value: 12,
+    //         }, {
+    //           value: 4,
+    //           name: '',
+    //           itemStyle: placeHolderStyle
+    //         }]
+    //       },
+    //       // ------------2
+    //       {
+    //         name: '值',
+    //         type: 'pie',
+    //         clockWise: true,
+    //         hoverAnimation: false,
+    //         radius: ['72%', '67%'],
+    //         center: ['50%', '50%'],
+    //         itemStyle: {
+    //           normal: {
+    //             label: {
+    //               show: false
+    //             },
+    //             labelLine: {
+    //               show: false,
+    //               length: 100,
+    //               smooth: 0.5
+    //             },
+    //             borderWidth: 5,
+    //             shadowBlur: 40,
+    //             borderColor: "#F1E453",
+    //             shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
+    //           }
+    //         },
+    //         data: [{
+    //           value: 6,
+    //         }, {
+    //           value: 4,
+    //           name: '',
+    //           itemStyle: placeHolderStyle
+    //         }]
+    //       },
+    //       // ------------3
+    //       {
+    //         name: '值',
+    //         type: 'pie',
+    //         clockWise: true,
+    //         hoverAnimation: false,
+    //         radius: ['48%', '44%'],
+    //         center: ['50%', '50%'],
+    //         itemStyle: {
+    //           normal: {
+    //             label: {
+    //               show: false
+    //             },
+    //             labelLine: {
+    //               show: false,
+    //               length: 100,
+    //               smooth: 0.5
+    //             },
+    //             borderWidth: 5,
+    //             shadowBlur: 40,
+    //             borderColor: "#f85b60",
+    //             shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
+    //           }
+    //         },
+    //         data: [{
+    //           value: 9,
+    //         }, {
+    //           value: 44,
+    //           name: '',
+    //           itemStyle: placeHolderStyle
+    //         }]
+    //       },
+    //     ]
+    //   });
+   var  data = [{
+        name: "本科及以上",
+        value: 13211
+    },
+    {
+        name: "高中",
+        value: 42111
+    },
+    {
+        name: "初中及以下",
+        value: 81711
+    },
+    {
+        name: "其他",
+        value: 121711
+    }
+];
+function   getArrayValue(array, key) {
+    var key = key || "value";
+    var res = [];
+    if (array) {
+        array.forEach(function(t) {
+            res.push(t[key]);
+        });
+    }
+    return res;
+}
+function array2obj(array,key) {
+	var resObj = {};
+	for(var i=0;i<array.length;i++){
+		resObj[array[i][key]] = array[i];
+	}
+	return resObj;
+}
+function getData(data) {
+    var res = {
+        series: [],
+        yAxis: []
+    };
+    for (let i = 0; i < data.length; i++) {
+        res.series.push({
+            name: '学历',
+            type: 'pie',
+            clockWise: false, //顺时加载
+            hoverAnimation: false, //鼠标移入变大
+            radius: [65 - i * 15 + '%', 57 - i * 15 + '%'],
+            center: ["30%", "55%"],
+            label: {
+                show: false
+            },
+            itemStyle: {
+                label: {
+                    show: false,
+                },
+                labelLine: {
+                    show: false
+                },
+                borderWidth: 5,
+            },
+            data: [{
+                value: data[i].value,
+                name: data[i].name
+            }, {
+                value: sumValue - data[i].value,
+                name: '',
+                itemStyle: {
+                    color: "rgba(0,0,0,0)",
+                    borderWidth: 0
+                },
+                tooltip: {
+                    show: false
+                },
+                hoverAnimation: false
+            }]
+        });
+        res.series.push({
+            name: '',
+            type: 'pie',
+            silent: true,
+            z: 1,
+            clockWise: false, //顺时加载
+            hoverAnimation: false, //鼠标移入变大
+            radius: [65 - i * 15 + '%', 57 - i * 15 + '%'],
+            center: ["30%", "55%"],
+            label: {
+                show: false
+            },
+            itemStyle: {
+                label: {
+                    show: false,
+                },
+                labelLine: {
+                    show: false
+                },
+                borderWidth: 5,
+            },
+            data: [{
+                value: 7.5,
+                itemStyle: {
+                    color: "#E3F0FF",
+                    borderWidth: 0
+                },
+                tooltip: {
+                    show: false
+                },
+                hoverAnimation: false
+            }, {
+                value: 2.5,
+                name: '',
+                itemStyle: {
+                    color: "rgba(0,0,0,0)",
+                    borderWidth: 0
+                },
+                tooltip: {
+                    show: false
+                },
+                hoverAnimation: false
+            }]
+        });
+        res.yAxis.push((data[i].value / sumValue * 100).toFixed(2) + "%");
+    }
+    return res;
+}
+var arrName = getArrayValue(data, "name");
+var arrValue = getArrayValue(data, "value");
+var sumValue = eval(arrValue.join('+'));
+var objData = array2obj(data, "name");
+var optionData = getData(data);
+
+
+myChart.option = {
+    backgroundColor:'#fff',
+    legend: {
+        show: true,
+        top: "center",
+        left: '70%',
+        data: arrName,
+        itemWidth: 30,
+        itemHeight: 20,
+        width:50,
+        padding: [0, 5],
+        itemGap: 25,
+        formatter: function(name) {
+            return "{title|" + name + "}\n{value|" + (objData[name].value) + "人}"
         },
-        emphasis: {
+        textStyle: {
-          color: "#104841a3",
+            rich: {
-          borderColor: "#00b3ff",
+                title: {
-          borderWidth: 0
+                    fontSize: 10,
-        }
+                    lineHeight: 10,
-      };
+                    color: "rgba(0,0,0,.45)"
-      // 绘制图表
-      myChart.setOption({
-        series: [
-          {
-            name: '值',
-            type: 'pie',
-            clockWise: true,
-            hoverAnimation: false,
-            radius: ['92%', '97%'],
-            center: ['50%', '50%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
                 },
-                labelLine: {
+                value: {
-                  show: false,
+                    fontSize: 14,
-                  length: 100,
+                    lineHeight: 18,
-                  smooth: 0.5
+                    color: "rgba(0,0,0,.85)"
-                },
+                }
-                borderWidth: 5,
+            }
-                shadowBlur: 40,
+        },
-                borderColor: "#00B3FF",
+    },
-                shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
+    tooltip: {
-              }
+        show: true,
+        trigger: "item",
+        formatter: "{a}<br>{b}:{c}({d}%)"
+    },
+    color: ['#FF8700', '#ffc300', '#00e473', '#009DFF'],
+    grid: {
+        top: '20%',
+        bottom: '48%',
+        left: "30%",
+        containLabel: false
+    },
+    yAxis: [{
+        type: 'category',
+        inverse: true,
+        axisLine: {
+            show: false
+        },
+        axisTick: {
+            show: false
+        },
+        axisLabel: {
+            interval: 0,
+            inside: true,
+            textStyle: {
+                color: "#000",
+                fontSize: 10,
             },
-            data: [{
+            show: true
-              value: 12,
+        },
-            }, {
+        data: optionData.yAxis
-              value: 4,
+    }],
-              name: '',
+    xAxis: [{
-              itemStyle: placeHolderStyle
+        show: false
-            }]
+    }],
-          },
+    series: optionData.series
-          // ------------2
+};
-          {
-            name: '值',
-            type: 'pie',
-            clockWise: true,
-            hoverAnimation: false,
-            radius: ['72%', '67%'],
-            center: ['50%', '50%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false,
-                  length: 100,
-                  smooth: 0.5
-                },
-                borderWidth: 5,
-                shadowBlur: 40,
-                borderColor: "#F1E453",
-                shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
-              }
-            },
-            data: [{
-              value: 6,
-            }, {
-              value: 4,
-              name: '',
-              itemStyle: placeHolderStyle
-            }]
-          },
-          // ------------3
-          {
-            name: '值',
-            type: 'pie',
-            clockWise: true,
-            hoverAnimation: false,
-            radius: ['48%', '44%'],
-            center: ['50%', '50%'],
-            itemStyle: {
-              normal: {
-                label: {
-                  show: false
-                },
-                labelLine: {
-                  show: false,
-                  length: 100,
-                  smooth: 0.5
-                },
-                borderWidth: 5,
-                shadowBlur: 40,
-                borderColor: "#f85b60",
-                shadowColor: 'rgba(0, 0, 0, 0)' //边框阴影
-              }
-            },
-            data: [{
-              value: 9,
-            }, {
-              value: 44,
-              name: '',
-              itemStyle: placeHolderStyle
-            }]
-          },
-        ]
-      });
-  
       //默认第一条高亮
-      myChart.dispatchAction({ type: 'highlight', seriesIndex: [0, 1, 2], dataIndex: 0 });
+    //   myChart.dispatchAction({ type: 'highlight', seriesIndex: [0, 1, 2], dataIndex: 0 });
     },
 
   }
@@ -232,8 +428,7 @@ export default {
 .allTotle {
   position: absolute;
   bottom: 69px;
-    left: 87%;
+    left: 60px;
-    width: 50%;
   div {
     font-size: 14px;
     font-weight: 500;

src/views/modelScreenComponents.vue

@@ -55,55 +55,49 @@
     <!-- :style="{ bottom: boxNone ? '166px' : '0' }"  -->
 
     <div :class="[boxNone ? 'centerBottom' : 'centerBottom2']">
-      <el-scrollbar>
+        <el-scrollbar>
-        <div class="centerBottom3">
+      <div class="centerBottom3">
-          <div class="boxChild" v-for="item in boxList">
+        <div class="boxChild" v-for="item in boxList">
-            <div>{{ item.c1 }}</div>
+          <div>{{ item.c1 }}</div>
-            <div>{{ item.c2 }}</div>
+          <div>{{ item.c2 }}</div>
-            <div
+          <div
-              v-if="item.c4 === '未开始'"
+            v-if="item.c4 === '未开始'"
-              :style="{
+            :style="{
-                'background-image': `url(${require(`../assets/pic/delay.png`)}`,
+              'background-image': `url(${require(`../assets/pic/delay.png`)}`,
-              }"
+            }"
-            ></div>
+          ></div>
-            <!-- <div v-else-if="item.c1 === '完工'" :style="{ 'background-image': `url(${require(`../assets/pic/no.png`)}` }">
+          <!-- <div v-else-if="item.c1 === '完工'" :style="{ 'background-image': `url(${require(`../assets/pic/no.png`)}` }">
           </div> -->
-            <div
+          <div
-              v-if="item.c4 === '实施中'"
+            v-if="item.c4 === '实施中'"
-              :style="{
+            :style="{
-                'background-image': `url(${require(`../assets/pic/no.png`)}`,
+              'background-image': `url(${require(`../assets/pic/no.png`)}`,
-              }"
+            }"
-            ></div>
+          ></div>
-            <!-- <div v-eles :style="{ 'background-image': `url(${require(`../assets/pic/finish.png`)}` }"></div> -->
+          <!-- <div v-eles :style="{ 'background-image': `url(${require(`../assets/pic/finish.png`)}` }"></div> -->
-            <div
+          <div
-              :style="{
+            :style="{
-                'background-image': `url(${require(`../assets/pic/finish.png`)}`,
+              'background-image': `url(${require(`../assets/pic/finish.png`)}`,
-              }"
+            }"
-            ></div>
+          ></div>
-            <div>{{ item.c3 }}</div>
+          <div>{{ item.c3 }}</div>
-            <div
+          <div
-              :style="{
+            :style="{
-                color:
+              color:
-                  item.c4 == '逾期中' || item.c4 == '逾期完成'
+                item.c4 == '逾期中' || item.c4 == '逾期完成'
-                    ? '#FFA700'
+                  ? '#FFA700'
-                    : '#00FFF6',
+                  : '#00FFF6',
-              }"
+            }"
-            >
+          >
-              {{ item.c4 }}
+            {{ item.c4 }}
-            </div>
-          </div>
-          <div class="lineBox" :style="'width:' + jinduList * 20 + '%;'">
-            <el-progress
-              :text-inside="true"
-              status="success"
-              :show-text="false"
-              :stroke-width="9"
-              :percentage="progress"
-              style="z-index: 10"
-            ></el-progress>
           </div>
         </div>
+        <div class="lineBox">
+          <!-- <el-progress :text-inside="true" status="success" :stroke-width="9" :percentage="70" style="z-index:10"></el-progress> -->
+        </div>
+      </div>
       </el-scrollbar>
+      
     </div>
 
     <!-- 左侧模块1 -->
@@ -363,8 +357,6 @@ export default {
   },
   data() {
     return {
-      jinduList:0, //计算进度条的宽度
-      progress:0, //计算进度条的值
       securityCheck: [], //安全检查统计
       introduction: "", //基本情况
       projectId: "", //项目Id
@@ -679,18 +671,6 @@ export default {
       getProjectStatus({
         projectId: this.projectId,
       }).then((res) => {
-        this.jinduList = res.data.data.length
-          for(var i = 0; i < res.data.data.length; i++){
-              if (res.data.data[i].completionStatusValue == '正常完成') {
-                if (i==0) {
-                 this.progress = (i + 1) * 5
-                }else if (i+1 >= this.jinduList) {
-                  this.progress = 95
-                }else{
-                  this.progress = (i + 1) * 12.5
-                }
-              }
-          }
         this.boxList = Object.keys(res.data.data).map((item, index) => {
           if (res.data.data[item].planEndTime != null) {
             res.data.data[item].planEndTime = res.data.data[
@@ -963,33 +943,32 @@ export default {
     bottom: 164px;
   }
 }
-.centerBottom3 {
+.centerBottom3{
   width: 100%;
   height: 100%;
   // display: flex;
   z-index: 999;
-  position: relative;
   display: -webkit-box;
   ::-webkit-scrollbar {
     display: none;
   }
 }
 .lineBox {
-  // width: 100%;
+  width: 810px;
   height: 9px;
   // background: #ffffff;
   // border-radius: 5px;
   // opacity: 0.5;
   position: absolute;
   top: 80px;
-  // left: 20px;
+  left: 20px;
   z-index: 10 !important;
 }
 
 .boxChild {
   // margin-left: 70px;
   text-align: center;
-  width: 20% !important;
+  width: 140px !important;
   height: 100%;
   z-index: 999 !important;
   // display: inline;
@@ -1714,10 +1693,10 @@ export default {
 /* element滚动条组件 隐藏水平滚动条 */
 /deep/.el-scrollbar__thumb {
   //可设置滚动条颜色
-  background: rgb(55,142,136); //这里我设置成了透明色,可以根据需求添加自己想要的颜色
+  background: greenyellow;//这里我设置成了透明色,可以根据需求添加自己想要的颜色
 }
-/deep/ .el-scrollbar__wrap {
+/deep/ .el-scrollbar__wrap{
-  margin-bottom: 10px !important;
+  margin-bottom:10px !important
 }
 </style>
 <style>