..

jwtech-pc-page/src/http/http.js

@@ -46,7 +46,8 @@ axios.interceptors.request.use(
         }
         if (store.state.token) {
             // requestConfig.headers["token"] = `${store.state.token}`;
-          requestConfig.headers['jianwei'] = 'jwtech ' + `${store.state.token}` ;
+        //   requestConfig.headers['jianwei'] = 'jwtech ' + `${store.state.token}` ;
+          requestConfig.headers['pingtai'] = 'pingtai ' + `${store.state.token}` ;
         } else {
           // requestConfig.headers['jianwei'] = 'jwtech ' + `${store.state.token}` ;
           // requestConfig.headers['jianwei'] = 'jwtech cf351e12-5418-456d-8934-d878d4f0147c';

jwtech-pc-page/src/views/creditStatistics/components/dynamicCredit.vue

@@ -19,6 +19,7 @@
         </div>
     </div>
 </template>
+
 <script>
 import { creditStatisticsGetNum, getHistogram } from "@/api/home"
 export default {
@@ -49,10 +50,12 @@ export default {
     methods: {
         getTableNum() {
             creditStatisticsGetNum().then(res => {
-                this.amountList[0].total = res.data.data.unit
+                if (res.data.data) {
-                this.amountList[1].total = res.data.data.person
+                    this.amountList[0].total = res.data.data.unit
-                this.amountList[2].total = res.data.data.creditNum
+                    this.amountList[1].total = res.data.data.person
-                this.amountList[3].total = res.data.data.informationTotal
+                    this.amountList[2].total = res.data.data.creditNum
+                    this.amountList[3].total = res.data.data.informationTotal
+                }
             })
         },
         getLine() {
@@ -137,6 +140,7 @@ export default {
     }
 }
 </script>
+
 <style lang="less" scoped>
 .ranking-wrap {
     height: 544px;

jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseQualificationList.vue

@@ -5,8 +5,9 @@
                 <el-input class="name-inp-search" placeholder="请输入企业名称" v-model="queryForm.enterpriseName"></el-input>
             </el-form-item>
             <el-form-item label="企业资质">
-                <el-select v-model="queryForm.adcd" clearable placeholder="请选择企业资质">
+                <el-select v-model="queryForm.qualificationCategory" clearable placeholder="请选择企业类型">
-                    <el-option v-for="item in areaList" :key="item.xzqhdm" :label="item.name" :value="item.xzqhdm">
+                    <el-option v-for="item in categoryList" :key="item.dictValue" :label="item.dictLabel.split('资质')[0]"
+                        :value="item.dictValue">
                     </el-option>
                 </el-select>
             </el-form-item>
@@ -17,7 +18,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-                <el-input class="name-inp-search" placeholder="请输入资质等级" v-model="queryForm.enterpriseName"></el-input>
+                <el-input class="name-inp-search" placeholder="请输入资质等级" v-model="queryForm.qualificationCategory"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-button type="mini" icon="el-icon-search" @click="getResult()">查询</el-button>
@@ -32,11 +33,17 @@
                     }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="legalRepresentative" label="资质类别" width="180" align="center">
+            <el-table-column prop="qualificationCategory" label="资质类别" width="180" align="center">
+                <template slot-scope="scope">
+                    <div v-for="(cateTtem, index) in categoryList" :key="(cateTtem, index)">
+                        <div v-if="cateTtem.dictValue == scope.row.qualificationCategory">{{
+                            cateTtem.dictLabel.split("资质")[0] }}</div>
+                    </div>
+                </template>
             </el-table-column>
-            <el-table-column prop="legalRepresentative" label="资质等级名称" width="180" align="center">
+            <el-table-column prop="qualificationCategory" label="资质等级名称" width="180" align="center">
             </el-table-column>
-            <el-table-column prop="legalRepresentative" label="发布时间" width="180" align="center">
+            <el-table-column prop="legalRepresentative" label="法定代表人" align="center">
             </el-table-column>
         </el-table>
         <pagination :total="total" :page.sync="apidata.pageNum" :limit.sync="apidata.pageSize" :pageSizes="pageSizes"

jwtech-pc-page/src/views/enterpriseInformation/components/personnelBasicList.vue

@@ -19,15 +19,20 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableData" style="width: 100%" v-loading="loading">
-            <el-table-column prop="legalRepresentative" label="姓名" width="180" align="center">
+            <el-table-column prop="legalRepresentative" label="姓名" width="300" align="center">
             </el-table-column>
-            <el-table-column prop="enterpriseName" label="企业名称" width="500">
+            <el-table-column prop="enterpriseName" label="企业名称">
                 <template slot-scope="scope">
                     <span style="color: #005EB7;cursor: pointer;font-size: 16px !important;" @click="toDetail(scope.row)">{{
                         scope.row.enterpriseName
                     }}</span>
                 </template>
             </el-table-column>
+            <el-table-column prop="adcd" label="所在区域" align="center">
+                <template slot-scope="scope">
+                    <div>{{ getadcd(scope.row) }}</div>
+                </template>
+            </el-table-column>
         </el-table>
         <pagination :total="total" :page.sync="apidata.pageNum" :limit.sync="apidata.pageSize" :pageSizes="pageSizes"
             @pagination="getResult" />

jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue

@@ -1,12 +1,15 @@
 <template>
     <div class="descriptions-table">
-        <el-descriptions class="margin-top" :column="1" border :content-style="rowCenter" :label-style="labelRowCenter">
+        <el-descriptions class="margin-top" :column="1" border :content-style="rowCenter" :label-style="labelRowCenter"
-            <el-descriptions-item :label="item.label" v-for="(item,index) in certificationData" :key="(item,index)">
+            v-for="(item, index) in certificationData" :key="(item, index)">
-                {{item.val}}
+            <el-descriptions-item :label="itemTable.label" v-for="(itemTable, indexTable) in item"
+                :key="(itemTable, indexTable)">
+                {{ itemTable.val }}
             </el-descriptions-item>
         </el-descriptions>
     </div>
 </template>
+
 <script>
 import { listByEid } from "@/api/enterpriseInformation"
 export default {
@@ -23,7 +26,31 @@ export default {
             //     certificationName: "",
 
             // }]
-            certificationData: [{
+            certificationData: []
+        }
+    },
+    mounted() {
+        this.enterpriseId = this.$route.query.enterpriseId
+        this.getListByEid()
+    },
+    methods: {
+        getListByEid() {
+            listByEid(this.enterpriseId).then(res => {
+                if (res.data.data.length > 0) {
+                    let dataList = []
+                    res.data.data.forEach(item => {
+                        if (item.children && item.children.length > 0) {
+                            dataList.push(...item.children)
+                        }
+                    })
+                    dataList.forEach(item => {
+                        this.certificationData.push(this.toVal(item))
+                    })
+                }
+            })
+        },
+        toVal(item) {
+            let obj = [{
                 label: "企业名称",
                 code: "enterpriseName",
                 val: ""
@@ -56,37 +83,28 @@ export default {
                 code: "validityPeriod",
                 val: ""
             }]
-        }
+            obj[0].val = item.enterpriseName || "-"
-    },
+            obj[1].val = item.qualificationCategory || "-"
-    mounted() {
+            for (let key in item) {
-        this.enterpriseId = this.$route.query.enterpriseId
+                obj.forEach(itemObj => {
-        this.getListByEid()
+                    if (itemObj.code !== "enterpriseName" && itemObj.code !== "qualificationCategory" && itemObj.code == key) {
-    },
+                        itemObj.val = item[key] || "-"
-    methods: {
-        getListByEid() {
-            listByEid(this.enterpriseId).then(res => {
-                if (res.data.data.length > 0) {
-                    this.certificationData[0].val = res.data.data[0].enterpriseName || "-"
-                    this.certificationData[1].val = res.data.data[0].qualificationCategory || "-"
-                    if (res.data.data[0].children.length > 0) {
-                        for (let key in res.data.data[0].children[0]) {
-                            this.certificationData.forEach(item => {
-                                if (item.code !== "enterpriseName" && item.code !== "qualificationCategory" && item.code == key){
-                                    item.val=res.data.data[0].children[0][key] || "-"
-                                }
-                            })
-                        }
                     }
-                }
+                })
-            })
+            }
+            return obj
         }
     }
 }
 </script>
+
 <style lang="less" scoped>
 .descriptions-table {
     min-height: 600px;
+
     /deep/.el-descriptions {
+        margin-bottom: 20px;
+
         .el-descriptions-item__cell {
             padding: 11px 10px;
             font-size: 16px;

jwtech-pc-page/src/views/home/components/scoreRanking.vue

@@ -49,10 +49,12 @@ export default {
     methods: {
         getTableNum() {
             creditStatisticsGetNum().then(res => {
-                this.amountList[0].total = res.data.data.unit
+                if (res.data.data) {
-                this.amountList[1].total = res.data.data.person
+                    this.amountList[0].total = res.data.data.unit
-                this.amountList[2].total = res.data.data.creditNum
+                    this.amountList[1].total = res.data.data.person
-                this.amountList[3].total = res.data.data.informationTotal
+                    this.amountList[2].total = res.data.data.creditNum
+                    this.amountList[3].total = res.data.data.informationTotal
+                }
             })
         },
         getLine() {

jwtech-pc-page/src/views/indexs.vue

@@ -96,7 +96,8 @@
         //   // requestConfig.headers["token"] = `${store.state.token}`;
         //   requestConfig.headers['jianwei'] = 'jwtech ' + `${store.state.token}` ;
         // }
-        const token = 'jwtech '+this.$store.state.token;
+        // const token = 'jwtech '+this.$store.state.token;
+        const token = 'pingtai '+this.$store.state.token;
         console.log(token)
         this.ws = new WebSocket(wsuri,[this.$store.state.token]);
         const self = this;

jwtech-pc-page/src/vue-simple-uploader/GlobalUploader.vue

@@ -103,7 +103,7 @@ export default {
         chunkSize: '2048000',
         fileParameterName: 'file',
         headers: {
-          jianwei: "jwtech " + `${store.state.token}`,
+          pingtai: "pingtai " + `${store.state.token}`,
         },
         // maxChunkRetries: 3,
         // 是否开启服务器分片校验

jwtech-pc-page/static/config.js

@@ -9,7 +9,7 @@ window.g = {
   // noSuffixUrl: "http://106.2.224.58:1036",//没有工程名的地址
   // url: "http://106.2.224.58:1036/kms-pc-web/api",
   // url: "http://106.2.224.58:1039/kms-pc-web",
-  url: "http://192.168.2.106:18082/tianhui-admin-web",
+  url: "http://192.168.2.108:18080/tianhui-admin-web",
   // url: "http://192.168.1.113:8083/kms-pc-web",
   // url: "http://192.168.1.113:18080/kms-pc-web",
   // downloadUrl: "http://106.2.224.58:1036/kms-pc-web/api/uploadRecord/downloadNet/",