From 2a9fb3b8d294669cacf464dbdccd5a44d56cd251 Mon Sep 17 00:00:00 2001
From: xzt <1113240624@qq.com>
Date: Wed, 17 Apr 2024 12:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../options/components/badCredit.vue          |  18 +-
 .../options/components/goodCredit.vue         |  18 +-
 jwtech-pc-page/config/index.js                |   2 +-
 .../announcement/actionAnnouncementDetail.vue |   2 +-
 .../components/misconductTable.vue            |   5 +-
 .../components/actionList.vue                 |   2 +-
 .../enterpriseQualificationList.vue           | 311 ++++++++-------
 .../components/qualificationTable.vue         | 228 ++++++-----
 .../enterpriseInDetail.vue                    | 355 +++++++++---------
 .../summarizedDetail.vue                      |  16 +-
 jwtech-pc-page/static/config.js               |   2 +-
 11 files changed, 535 insertions(+), 424 deletions(-)

diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
index fb4dead0..f16a7c70 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badCredit.vue
@@ -25,7 +25,7 @@
       <el-table-column
         label="不良行为"
         align="center"
-        prop="badBehavior"
+        prop="behavior"
         min-width="120"
       />
       <!-- <el-table-column
@@ -179,11 +179,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="不良行为" prop="badBehavior">
-              <el-input
-                v-model="form.badBehavior"
-                placeholder="请输入不良行为"
-              />
+            <el-form-item label="不良行为" prop="behavior">
+              <el-input v-model="form.behavior" placeholder="请输入不良行为" />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -288,7 +285,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 不良行为 </template>
-            {{ this.creditMsg.badBehavior }}
+            {{ this.creditMsg.behavior }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 扣分值 </template>
@@ -404,6 +401,7 @@ export default {
           attachment: null,
           status: null,
           type: null,
+          behavior: null,
           badBehavior: null,
           createUid: null,
           updateUid: null,
@@ -424,9 +422,7 @@ export default {
         projectName: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
-        badBehavior: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
-        ],
+        behavior: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         bonusPoints: [
           { required: true, message: "请输入扣分值", trigger: "blur" },
           {
@@ -502,6 +498,7 @@ export default {
         attachment: null,
         status: null,
         type: null,
+        behavior: null,
         badBehavior: null,
         createUid: null,
         updateUid: null,
@@ -532,6 +529,7 @@ export default {
           attachment: null,
           status: null,
           type: null,
+          behavior: null,
           badBehavior: null,
           createUid: null,
           updateUid: null,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
index 16f86406..b92a23e5 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodCredit.vue
@@ -48,7 +48,7 @@
       <el-table-column
         label="良好行为"
         align="center"
-        prop="goodBehavior"
+        prop="behavior"
         min-width="120"
       />
       <el-table-column
@@ -289,11 +289,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="良好行为" prop="goodBehavior">
-              <el-input
-                v-model="form.goodBehavior"
-                placeholder="请输入良好行为"
-              />
+            <el-form-item label="良好行为" prop="behavior">
+              <el-input v-model="form.behavior" placeholder="请输入良好行为" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -421,7 +418,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 良好行为 </template>
-            {{ this.creditMsg.goodBehavior }}
+            {{ this.creditMsg.behavior }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 表彰等级 </template>
@@ -622,6 +619,7 @@ export default {
           projectName: null,
           qualificationCategory: null,
           declarationManagementZones: null,
+          behavior: null,
           goodBehavior: null,
           commendationLevel: null,
           authority: null,
@@ -648,9 +646,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        goodBehavior: [
-          { max: 250, message: "字符长度最大为250", trigger: "blur" },
-        ],
+        behavior: [{ max: 250, message: "字符长度最大为250", trigger: "blur" }],
         commendationLevel: [
           { max: 250, message: "字符长度最大为250", trigger: "blur" },
         ],
@@ -808,6 +804,7 @@ export default {
         projectName: null,
         qualificationCategory: null,
         declarationManagementZones: null,
+        behavior: null,
         goodBehavior: null,
         commendationLevel: null,
         authority: null,
@@ -838,6 +835,7 @@ export default {
           projectName: null,
           qualificationCategory: null,
           declarationManagementZones: null,
+          behavior: null,
           goodBehavior: null,
           commendationLevel: null,
           authority: null,
diff --git a/jwtech-pc-page/config/index.js b/jwtech-pc-page/config/index.js
index 98010c66..f4807639 100644
--- a/jwtech-pc-page/config/index.js
+++ b/jwtech-pc-page/config/index.js
@@ -34,7 +34,7 @@ module.exports = {
       '/kms-pc-web': {
         // target: 'http://127.0.0.1:18080/kms-pc-web',
         target: 'http://192.168.2.100:18080/kms-pc-web',
-        // target: 'http://192.168.2.105:18082/kms-pc-web',
+        // target: 'http://192.168.2.100:18082/tianhui-admin-web',
         changeOrigin: true,
         pathRewrite: {
           '^/kms-pc-web': '/'
diff --git a/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue b/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue
index 56f1e85e..5aa565fe 100644
--- a/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue
+++ b/jwtech-pc-page/src/views/announcement/actionAnnouncementDetail.vue
@@ -5,7 +5,7 @@
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
           <el-breadcrumb-item :to="{ path: '/announcement' }"
-            >公告</el-breadcrumb-item
+            >动态信用</el-breadcrumb-item
           >
           <el-breadcrumb-item>{{
             this.$route.query.type === "good"
diff --git a/jwtech-pc-page/src/views/announcement/components/misconductTable.vue b/jwtech-pc-page/src/views/announcement/components/misconductTable.vue
index f50d21ec..a2663f55 100644
--- a/jwtech-pc-page/src/views/announcement/components/misconductTable.vue
+++ b/jwtech-pc-page/src/views/announcement/components/misconductTable.vue
@@ -8,11 +8,14 @@
       :content-style="rowCenter"
       :label-style="labelRowCenter"
     >
-      <el-descriptions-item label="良好行为" v-if="isGood">
+      <!-- <el-descriptions-item label="良好行为" v-if="isGood">
         {{ itemObj.goodBehavior || "-" }}
       </el-descriptions-item>
       <el-descriptions-item label="不良行为" v-else>
         {{ itemObj.badBehavior || "-" }}
+      </el-descriptions-item> -->
+      <el-descriptions-item :label="isGood ? '良好行为' : '不良行为'">
+        {{ itemObj.behavior || "-" }}
       </el-descriptions-item>
 
       <el-descriptions-item label="等级">
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
index 2569a4a1..e6ca2c24 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/actionList.vue
@@ -100,7 +100,7 @@ export default {
   },
   methods: {
     getResult() {
-      if (title == "良好行为列表") {
+      if (this.title == "良好行为列表") {
         this.$emit("getGoodResult");
       } else {
         this.$emit("getBadResult");
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseQualificationList.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseQualificationList.vue
index 2fe41b0b..4f5bbfb1 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseQualificationList.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/enterpriseQualificationList.vue
@@ -1,136 +1,191 @@
 <template>
-    <div>
-        <el-form :inline="true" label-width="80px" :model="queryForm">
-            <el-form-item label="企业名称">
-                <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.qualificationCategory" clearable placeholder="请选择企业类型">
-                    <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>
-            <el-form-item label="所在区域">
-                <el-select v-model="queryForm.adcd" clearable placeholder="请选择所有区域">
-                    <el-option v-for="item in areaList" :key="item.xzqhdm" :label="item.name" :value="item.xzqhdm">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="资质等级">
-                <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>
-                <el-button type="mini" icon="el-icon-refresh" @click="resetForm()">重置</el-button>
-            </el-form-item>
-        </el-form>
-        <el-table :data="tableData" style="width: 100%" v-loading="loading">
-            <el-table-column prop="enterpriseName" label="企业名称" width="500">
-                <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="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="qualificationCategory" label="资质等级名称" width="180" align="center">
-            </el-table-column>
-            <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"
-            @pagination="getResult" />
-    </div>
+  <div>
+    <el-form :inline="true" label-width="80px" :model="queryForm">
+      <el-form-item label="企业名称">
+        <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.qualificationCategory"
+          clearable
+          placeholder="请选择企业类型"
+        >
+          <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>
+      <el-form-item label="所在区域">
+        <el-select
+          v-model="queryForm.adcd"
+          clearable
+          placeholder="请选择所有区域"
+        >
+          <el-option
+            v-for="item in areaList"
+            :key="item.xzqhdm"
+            :label="item.name"
+            :value="item.xzqhdm"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="资质等级">
+        <el-input
+          class="name-inp-search"
+          placeholder="请输入资质等级"
+          v-model="queryForm.aaa"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="mini" icon="el-icon-search" @click="getResult()"
+          >查询</el-button
+        >
+        <el-button type="mini" icon="el-icon-refresh" @click="resetForm()"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData" style="width: 100%" v-loading="loading">
+      <el-table-column prop="enterpriseName" label="企业名称" width="500">
+        <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="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="aaa"
+        label="资质等级名称"
+        width="180"
+        align="center"
+      >
+      </el-table-column>
+      <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"
+      @pagination="getResult"
+    />
+  </div>
 </template>
 <script>
-import { getDisclosure } from "@/api/home"
-import { getGuangDong } from "@/api/creditStatistics"
+import { getDisclosure } from "@/api/home";
+import { getGuangDong } from "@/api/creditStatistics";
 export default {
-    data(){
-        return {
-            loading: false,
-            total: 0,
-            apidata: {
-                pageNum: 1,
-                pageSize: 10,
-            },
-            pageSizes: [10, 20, 30, 50],
-            queryForm: {
-                groupId: "2",
-                qualificationCategory: "",
-                personName:"",
-                enterpriseName: "",
-                adcd: "",
-                pageNum: 1,
-                pageSize: 10
-            },
-            tableData: [],
-            areaList: [],
-            categoryList: [],
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      apidata: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      pageSizes: [10, 20, 30, 50],
+      queryForm: {
+        groupId: "2",
+        qualificationCategory: "",
+        personName: "",
+        enterpriseName: "",
+        adcd: "",
+        pageNum: 1,
+        pageSize: 10
+      },
+      tableData: [],
+      areaList: [],
+      categoryList: []
+    };
+  },
+  mounted() {
+    this.getArea();
+    this.getResult();
+    this.getDicts("qualification_type").then(res => {
+      this.categoryList = res.data.data;
+    });
+  },
+  methods: {
+    getResult() {
+      this.loading = true;
+      getDisclosure({ ...this.queryForm }).then(res => {
+        this.loading = false;
+        this.tableData = [];
+        this.tableData = res.data.data.records;
+        this.total = res.data.data.total;
+      });
+    },
+    getArea() {
+      getGuangDong().then(res => {
+        this.areaList = res.data.data;
+      });
+    },
+    getadcd(row) {
+      let adcdText = "";
+      let adcdCode = row.adcd.slice(0, 4) + "00";
+      this.areaList.forEach(item => {
+        if (item.xzqhdm == adcdCode) {
+          adcdText = item.name;
         }
+      });
+      if (adcdText == "") {
+        adcdText = "省外";
+      }
+      return adcdText;
     },
-    mounted(){
-        this.getArea()
-        this.getResult()
-        this.getDicts("qualification_type").then(res => {
-            this.categoryList = res.data.data
-        })
+    resetForm() {
+      this.queryForm = {
+        groupId: "2",
+        qualificationCategory: "",
+        enterpriseName: "",
+        adcd: "",
+        pageNum: 1,
+        pageSize: 10
+      };
+      this.getResult();
     },
-    methods:{
-        getResult() {
-            this.loading = true
-            getDisclosure({ ...this.queryForm }).then(res => {
-                this.loading = false
-                this.tableData = []
-                this.tableData = res.data.data.records
-                this.total = res.data.data.total
-            })
-        },
-        getArea() {
-            getGuangDong().then(res => {
-                this.areaList = res.data.data
-            })
-        },
-        getadcd(row) {
-            let adcdText = ""
-            let adcdCode = row.adcd.slice(0, 4) + "00"
-            this.areaList.forEach(item => {
-                if (item.xzqhdm == adcdCode) {
-                    adcdText = item.name
-                }
-            })
-            if (adcdText == "") {
-                adcdText = "省外"
-            }
-            return adcdText
-        },
-        resetForm() {
-            this.queryForm = {
-                groupId: "2",
-                qualificationCategory: "",
-                enterpriseName: "",
-                adcd: "",
-                pageNum: 1,
-                pageSize: 10
-            }
-            this.getResult()
-        },
-        toDetail(row) {
-            this.$router.push({
-                path: "/enterpriseInDetail",
-                query:{
-                    enterpriseId:row.enterpriseId
-                }
-            })
-        },
+    toDetail(row) {
+      this.$router.push({
+        path: "/enterpriseInDetail",
+        query: {
+          enterpriseId: row.enterpriseId,
+          type: "zizhi"
+        }
+      });
     }
-}
-</script>
\ No newline at end of file
+  }
+};
+</script>
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue b/jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue
index c8dadee5..0a160275 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/components/qualificationTable.vue
@@ -1,122 +1,148 @@
 <template>
-    <div class="descriptions-table">
-        <el-descriptions class="margin-top" :column="1" border :content-style="rowCenter" :label-style="labelRowCenter"
-            v-for="(item, index) in certificationData" :key="(item, index)">
-            <el-descriptions-item :label="itemTable.label" v-for="(itemTable, indexTable) in item"
-                :key="(itemTable, indexTable)">
-                {{ itemTable.val }}
-            </el-descriptions-item>
-        </el-descriptions>
+  <div class="descriptions-table">
+    <el-descriptions
+      class="margin-top"
+      :column="1"
+      border
+      :content-style="rowCenter"
+      :label-style="labelRowCenter"
+      v-for="(item, index) in certificationData"
+      :key="(item, index)"
+    >
+      <el-descriptions-item
+        :label="itemTable.label"
+        v-for="(itemTable, indexTable) in item"
+        :key="(itemTable, indexTable)"
+      >
+        {{ itemTable.val }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <div v-if="certificationData.length == 0">
+      暂无子资质数据~
     </div>
+  </div>
 </template>
 
 <script>
-import { listByEid } from "@/api/enterpriseInformation"
+import { listByEid } from "@/api/enterpriseInformation";
 export default {
-    data() {
-        return {
-            rowCenter: {
-                'borderColor': '#DADCE3'
-            },
-            labelRowCenter: {
-                'borderColor': '#DADCE3'
-            },
-            enterpriseId: "",
-            // certificationList: [{
-            //     certificationName: "",
+  data() {
+    return {
+      rowCenter: {
+        borderColor: "#DADCE3"
+      },
+      labelRowCenter: {
+        borderColor: "#DADCE3"
+      },
+      enterpriseId: "",
+      // certificationList: [{
+      //     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));
+          });
         }
+      });
     },
-    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: ""
         },
-        toVal(item) {
-            let obj = [{
-                label: "企业名称",
-                code: "enterpriseName",
-                val: ""
-            }, {
-                label: "资质类别",
-                code: "qualificationCategory",
-                val: ""
-            }, {
-                label: "资质专业类别",
-                code: "professionalCategory",
-                val: ""
-            }, {
-                label: "资质等级名称",
-                code: "level",
-                val: ""
-            }, {
-                label: "资质证书号",
-                code: "certificateNo",
-                val: ""
-            }, {
-                label: "资质证书核发机关",
-                code: "issuedBy",
-                val: ""
-            }, {
-                label: "资质证书核发日期",
-                code: "issuanceDate",
-                val: ""
-            }, {
-                label: "有效到期日期",
-                code: "validityPeriod",
-                val: ""
-            }]
-            obj[0].val = item.enterpriseName || "-"
-            obj[1].val = item.qualificationCategory || "-"
-            for (let key in item) {
-                obj.forEach(itemObj => {
-                    if (itemObj.code !== "enterpriseName" && itemObj.code !== "qualificationCategory" && itemObj.code == key) {
-                        itemObj.val = item[key] || "-"
-                    }
-                })
-            }
-            return obj
+        {
+          label: "资质类别",
+          code: "qualificationCategory",
+          val: ""
+        },
+        {
+          label: "资质专业类别",
+          code: "professionalCategory",
+          val: ""
+        },
+        {
+          label: "资质等级名称",
+          code: "level",
+          val: ""
+        },
+        {
+          label: "资质证书号",
+          code: "certificateNo",
+          val: ""
+        },
+        {
+          label: "资质证书核发机关",
+          code: "issuedBy",
+          val: ""
+        },
+        {
+          label: "资质证书核发日期",
+          code: "issuanceDate",
+          val: ""
+        },
+        {
+          label: "有效到期日期",
+          code: "validityPeriod",
+          val: ""
         }
+      ];
+      obj[0].val = item.enterpriseName || "-";
+      obj[1].val = item.qualificationCategory || "-";
+      for (let key in item) {
+        obj.forEach(itemObj => {
+          if (
+            itemObj.code !== "enterpriseName" &&
+            itemObj.code !== "qualificationCategory" &&
+            itemObj.code == key
+          ) {
+            itemObj.val = item[key] || "-";
+          }
+        });
+      }
+      return obj;
     }
-}
+  }
+};
 </script>
 
 <style lang="less" scoped>
 .descriptions-table {
-    min-height: 600px;
+  min-height: 600px;
 
-    /deep/.el-descriptions {
-        margin-bottom: 20px;
+  /deep/.el-descriptions {
+    margin-bottom: 20px;
 
-        .el-descriptions-item__cell {
-            padding: 11px 10px;
-            font-size: 16px;
-        }
+    .el-descriptions-item__cell {
+      padding: 11px 10px;
+      font-size: 16px;
+    }
 
-        .el-descriptions-item__label {
-            background: #EBF4FE;
-            width: 240px;
-            font-weight: 600;
-            color: #005EB7;
-            padding-left: 21px;
-        }
+    .el-descriptions-item__label {
+      background: #ebf4fe;
+      width: 240px;
+      font-weight: 600;
+      color: #005eb7;
+      padding-left: 21px;
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/jwtech-pc-page/src/views/enterpriseInformation/enterpriseInDetail.vue b/jwtech-pc-page/src/views/enterpriseInformation/enterpriseInDetail.vue
index f425435d..2adea6c4 100644
--- a/jwtech-pc-page/src/views/enterpriseInformation/enterpriseInDetail.vue
+++ b/jwtech-pc-page/src/views/enterpriseInformation/enterpriseInDetail.vue
@@ -1,199 +1,218 @@
 <template>
-    <div class="basic-detail">
-        <div class="basic-header">
-            <div class="header-wrap">
-                <el-breadcrumb separator-class="el-icon-arrow-right">
-                    <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
-                    <el-breadcrumb-item :to="{ path: '/enterpriseInformation' }">企业信息</el-breadcrumb-item>
-                    <el-breadcrumb-item>企业信息详情</el-breadcrumb-item>
-                </el-breadcrumb>
-            </div>
+  <div class="basic-detail">
+    <div class="basic-header">
+      <div class="header-wrap">
+        <el-breadcrumb separator-class="el-icon-arrow-right">
+          <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item :to="{ path: '/enterpriseInformation' }"
+            >企业信息</el-breadcrumb-item
+          >
+          <el-breadcrumb-item>企业信息详情</el-breadcrumb-item>
+        </el-breadcrumb>
+      </div>
+    </div>
+    <div class="basic-main">
+      <div class="main-wrap">
+        <el-tabs
+          type="border-card"
+          v-model="activeName"
+          @tab-click="handleClick"
+        >
+          <el-tab-pane label="企业基本信息" name="basic"></el-tab-pane>
+          <el-tab-pane label="资质信息" name="qualification"></el-tab-pane>
+          <el-tab-pane label="人员信息" name="personal"></el-tab-pane>
+          <el-tab-pane label="项目业绩" name="proAchievement"></el-tab-pane>
+          <el-tab-pane label="工程获奖" name="projectAward"></el-tab-pane>
+        </el-tabs>
+        <div class="descriptions-wrap">
+          <descriptionsEnterpriseTable v-if="activeName == 'basic'" />
+          <qualificationTable v-else-if="activeName == 'qualification'" />
+          <personalTable v-else-if="activeName == 'personal'" />
+          <proAchievementTable v-else-if="activeName == 'proAchievement'" />
+          <projectAwardTable v-else-if="activeName == 'projectAward'" />
+        </div>
+        <div class="real-time" v-if="activeName == 'basic'">
+          <realTimeCredit />
         </div>
-        <div class="basic-main">
-            <div class="main-wrap">
-                <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
-                    <el-tab-pane label="企业基本信息" name="basic"></el-tab-pane>
-                    <el-tab-pane label="资质信息" name="qualification"></el-tab-pane>
-                    <el-tab-pane label="人员信息" name="personal"></el-tab-pane>
-                    <el-tab-pane label="项目业绩" name="proAchievement"></el-tab-pane>
-                    <el-tab-pane label="工程获奖" name="projectAward"></el-tab-pane>
-                </el-tabs>
-                <div class="descriptions-wrap">
-                    <descriptionsEnterpriseTable v-if="activeName == 'basic'" />
-                    <qualificationTable v-else-if="activeName == 'qualification'" />
-                    <personalTable v-else-if="activeName == 'personal'" />
-                    <proAchievementTable v-else-if="activeName == 'proAchievement'" />
-                    <projectAwardTable v-else-if="activeName == 'projectAward'" />
-                </div>
-                <div class="real-time" v-if="activeName == 'basic'">
-                    <realTimeCredit />
-                </div>
-                <div v-if="activeName == 'basic'">
-                    <actionList :title="'良好行为列表'" :tableData="goodList" :total="goodTotal" @getGoodResult="getCreditList"/>
-                    <actionList :title="'不良行为列表'" :tableData="badList" :total="badTotal" @getBadResult="getCreditBadList"/>
-                </div>
-            </div>
+        <div v-if="activeName == 'basic'">
+          <actionList
+            :title="'良好行为列表'"
+            :tableData="goodList"
+            :total="goodTotal"
+            @getGoodResult="getCreditList"
+          />
+          <actionList
+            :title="'不良行为列表'"
+            :tableData="badList"
+            :total="badTotal"
+            @getBadResult="getCreditBadList"
+          />
         </div>
+      </div>
     </div>
+  </div>
 </template>
 <script>
-import { creditList } from "@/api/enterpriseInformation"
-import descriptionsEnterpriseTable from "./components/descriptionsEnterpriseTable"
-import qualificationTable from "./components/qualificationTable"
-import personalTable from "./components/personalTable"
-import proAchievementTable from "./components/proAchievementTable"
-import projectAwardTable from "./components/projectAwardTable"
-import realTimeCredit from "./components/realTimeCredit"
-import actionList from "./components/actionList"
+import { creditList } from "@/api/enterpriseInformation";
+import descriptionsEnterpriseTable from "./components/descriptionsEnterpriseTable";
+import qualificationTable from "./components/qualificationTable";
+import personalTable from "./components/personalTable";
+import proAchievementTable from "./components/proAchievementTable";
+import projectAwardTable from "./components/projectAwardTable";
+import realTimeCredit from "./components/realTimeCredit";
+import actionList from "./components/actionList";
 export default {
-    components: {
-        descriptionsEnterpriseTable,
-        qualificationTable,
-        personalTable,
-        proAchievementTable,
-        projectAwardTable,
-        realTimeCredit,
-        actionList,
-    },
-    data() {
-        return {
-            activeName: "basic",
-            enterpriseGoodForm: {
-                pageNum: 1,
-                pageSize: 10,
-                data: {
-                    enterpriseId: "",
-                    type: "1",
-                },
-            },
-            goodList:[],
-            goodTotal:0,
-            enterpriseBadForm: {
-                pageNum: 1,
-                pageSize: 10,
-                data: {
-                    enterpriseId: "",
-                    type: "0",
-                },
-            },
-            badList:[],
-            badTotal:0
+  components: {
+    descriptionsEnterpriseTable,
+    qualificationTable,
+    personalTable,
+    proAchievementTable,
+    projectAwardTable,
+    realTimeCredit,
+    actionList
+  },
+  data() {
+    return {
+      activeName: "basic",
+      enterpriseGoodForm: {
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          enterpriseId: "",
+          type: "1"
+        }
+      },
+      goodList: [],
+      goodTotal: 0,
+      enterpriseBadForm: {
+        pageNum: 1,
+        pageSize: 10,
+        data: {
+          enterpriseId: "",
+          type: "0"
         }
+      },
+      badList: [],
+      badTotal: 0
+    };
+  },
+  created() {
+    if (this.$route.query.type == "zizhi") {
+      this.activeName = "qualification";
+    }
+  },
+  mounted() {
+    this.enterpriseGoodForm.data.enterpriseId = this.$route.query.enterpriseId;
+    this.enterpriseBadForm.data.enterpriseId = this.$route.query.enterpriseId;
+    this.getCreditList();
+    this.getCreditBadList();
+  },
+  methods: {
+    getCreditList() {
+      creditList(this.enterpriseGoodForm).then(res => {
+        this.goodList = res.data.records;
+        this.goodTotal = res.data.total;
+      });
     },
-    mounted() {
-        this.enterpriseGoodForm.data.enterpriseId = this.$route.query.enterpriseId
-        this.enterpriseBadForm.data.enterpriseId = this.$route.query.enterpriseId
-        this.getCreditList()
-        this.getCreditBadList()
+    getCreditBadList() {
+      creditList(this.enterpriseBadForm).then(res => {
+        this.badList = res.data.records;
+        this.badTotal = res.data.total;
+      });
     },
-    methods: {
-        getCreditList() {
-            creditList(this.enterpriseGoodForm).then(res => {
-                this.goodList=res.data.records
-                this.goodTotal=res.data.total
-            })
-        },
-        getCreditBadList() {
-            creditList(this.enterpriseBadForm).then(res => {
-                this.badList=res.data.records
-                this.badTotal=res.data.total
-            })
-        },
-        handleClick(tab, event) {
-            // console.log(tab, event);
-        }
+    handleClick(tab, event) {
+      // console.log(tab, event);
     }
-}
+  }
+};
 </script>
 <style lang="less" scoped>
 .basic-detail {
-    .basic-header {
-        height: 40px;
-        background: #EBF4FE;
+  .basic-header {
+    height: 40px;
+    background: #ebf4fe;
 
-        .header-wrap {
-            width: 1200px;
-            margin: 0 auto;
-            display: flex;
-            align-items: center;
+    .header-wrap {
+      width: 1200px;
+      margin: 0 auto;
+      display: flex;
+      align-items: center;
 
-            /deep/.el-breadcrumb {
-                margin-top: 10px;
+      /deep/.el-breadcrumb {
+        margin-top: 10px;
 
-                .el-breadcrumb__item {
-                    .el-breadcrumb__inner {
-                        font-size: 16px;
-                        color: #005EB7 !important;
-                    }
+        .el-breadcrumb__item {
+          .el-breadcrumb__inner {
+            font-size: 16px;
+            color: #005eb7 !important;
+          }
 
-                    .el-breadcrumb__separator {
-                        font-size: 16px;
-                        color: #005EB7 !important;
-                    }
-                }
-            }
+          .el-breadcrumb__separator {
+            font-size: 16px;
+            color: #005eb7 !important;
+          }
         }
+      }
     }
+  }
 
+  .basic-main {
+    background: linear-gradient(180deg, #005eb7 0%, #edf7ff 60% #edf7ff 100%);
+    padding: 20px 0;
 
+    .main-wrap {
+      width: 1200px;
+      margin: 0 auto;
+      background: #ffffff;
+      border-radius: 8px;
+      overflow: hidden;
 
-    .basic-main {
-        background: linear-gradient(180deg, #005EB7 0%, #EDF7FF 60% #EDF7FF 100%);
-        padding: 20px 0;
-
-        .main-wrap {
-            width: 1200px;
-            margin: 0 auto;
-            background: #FFFFFF;
-            border-radius: 8px;
-            overflow: hidden;
-
-            /deep/.el-tabs {
-                .el-tabs__header {
-                    border-bottom-color: #C8DFF8;
-                }
+      /deep/.el-tabs {
+        .el-tabs__header {
+          border-bottom-color: #c8dff8;
+        }
 
-                .el-tabs__nav-wrap {
-                    height: 50px;
-                    padding-left: 5px;
+        .el-tabs__nav-wrap {
+          height: 50px;
+          padding-left: 5px;
 
-                    .el-tabs__item {
-                        height: 45px;
-                        font-size: 14px;
-                        font-weight: 600;
-                        color: #333333;
-                        margin-top: 5px;
-                        margin-left: 1px;
-                        padding-left: 0;
-                        padding-right: 0;
-                        margin-right: 18px;
-                    }
-                }
+          .el-tabs__item {
+            height: 45px;
+            font-size: 14px;
+            font-weight: 600;
+            color: #333333;
+            margin-top: 5px;
+            margin-left: 1px;
+            padding-left: 0;
+            padding-right: 0;
+            margin-right: 18px;
+          }
+        }
 
-                .el-tabs__item.is-active {
-                    padding-left: 15px;
-                    padding-right: 15px;
-                    color: #005EB7;
-                    border-right-color: #C8DFF8;
-                    border-left-color: #C8DFF8;
-                    border-top-color: #C8DFF8;
-                    border-radius: 8px 8px 0px 0px;
-                }
+        .el-tabs__item.is-active {
+          padding-left: 15px;
+          padding-right: 15px;
+          color: #005eb7;
+          border-right-color: #c8dff8;
+          border-left-color: #c8dff8;
+          border-top-color: #c8dff8;
+          border-radius: 8px 8px 0px 0px;
+        }
 
-                .el-tabs__content {
-                    padding: 0px;
-                }
-            }
+        .el-tabs__content {
+          padding: 0px;
+        }
+      }
 
-            /deep/.el-tabs--border-card {
-                border: none;
-                box-shadow: none;
-            }
+      /deep/.el-tabs--border-card {
+        border: none;
+        box-shadow: none;
+      }
 
-            .descriptions-wrap {
-                padding: 20px;
-            }
-        }
+      .descriptions-wrap {
+        padding: 20px;
+      }
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
index 5eb2205f..098d7a2a 100644
--- a/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
+++ b/jwtech-pc-page/src/views/summarizedInformation/summarizedDetail.vue
@@ -5,15 +5,19 @@
         <el-breadcrumb separator-class="el-icon-arrow-right">
           <el-breadcrumb-item :to="{ path: '/home' }">首页</el-breadcrumb-item>
           <el-breadcrumb-item :to="{ path: '/summarizedInformation' }"
-            >综合信息</el-breadcrumb-item
+            >公示公告</el-breadcrumb-item
           >
-          <el-breadcrumb-item>综合信息详情</el-breadcrumb-item>
+          <el-breadcrumb-item>公示公告详情</el-breadcrumb-item>
         </el-breadcrumb>
       </div>
     </div>
     <div class="pdf-main">
       <div class="main-wrap">
         <div class="title">{{ title }}</div>
+        <div class="sorce">
+          <span>来源：{{ info.region }}</span>
+          <span>发布时间：{{ info.publishTime }}</span>
+        </div>
         <div v-html="info.text"></div>
       </div>
     </div>
@@ -94,6 +98,14 @@ export default {
         font-weight: 600;
         color: #0055a6;
       }
+      .sorce {
+        margin-top: 20px 0;
+        display: flex;
+        justify-content: center;
+        span {
+          margin-right: 30px;
+        }
+      }
     }
   }
 }
diff --git a/jwtech-pc-page/static/config.js b/jwtech-pc-page/static/config.js
index 5e6436da..4e1a63ee 100644
--- a/jwtech-pc-page/static/config.js
+++ b/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.108:18100/tianhui-admin-web",
+  // url: "http://192.168.2.100:18082/tianhui-admin-web",
   url: "http://192.168.2.100:18080/kms-pc-web",
   // url: "http://127.0.0.1:18082/kms-pc-web",