From bc349b8b5eda714c5c6f5622db46aae336ade62b Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 12 Jun 2024 16:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E7=9A=84api=E5=9C=B0=E5=9D=80=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=93=E5=8C=85=E5=90=8E=E7=9A=84=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E3=80=81=E5=8F=8A=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  3 ++-
 .env.production                                     |  4 +++-
 package.json                                        |  2 +-
 src/permission.js                                   |  6 +++++-
 .../enterInfo/components/tabOne/index.vue           | 13 +++++++++++--
 src/views/enterpriselibrary/enterInfo/index.vue     |  2 +-
 src/views/enterpriselibrary/index.vue               |  7 +++++--
 .../project/projectInfo/components/tabTwo/index.vue |  2 +-
 vue.config.js                                       |  3 ++-
 9 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 65db24a..f0e439f 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.105:9040'
+# VUE_APP_BASE_API = 'http://192.168.0.104:9040'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 3141812..5131780 100644
--- a/.env.production
+++ b/.env.production
@@ -6,4 +6,6 @@ ENV = 'production'
 
 # 金鸡湖现代服务业品牌管理系统/生产环境
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+
+VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
diff --git a/package.json b/package.json
index 21d92fd..aa832b6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202406031526",
+  "version": "1.0.202406121001",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/permission.js b/src/permission.js
index fe3599a..632b50e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -59,7 +59,11 @@ router.beforeEach((to, from, next) => {
     } else {
       next();
     }
-  } else if (getToken()) {
+  }
+  //  else if(window.location.href.includes("clienttoken=")){
+
+  // } 
+  else if (getToken()) {
     to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
     if (to.path === "/login") {
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
index 9bcaefc..2f6b864 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
@@ -10,6 +10,15 @@
       >
         {{ item.value }}
       </el-descriptions-item> -->
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
+        {{ info.institutionCode }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="登记注册统计类别">
+        {{ info.statisticalCategories }}
+      </el-descriptions-item>
+      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="行业代码">
+        {{ info.industryCode }}
+      </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册资本">
         {{ info.registeredCapital }}
       </el-descriptions-item>
@@ -22,9 +31,9 @@
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="曾用名">
         {{ info.formerName }}
       </el-descriptions-item>
-      <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
+      <!-- <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="组织机构代码">
         {{ info.institutionCode }}
-      </el-descriptions-item>
+      </el-descriptions-item> -->
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="注册地址">
         {{ info.enrollAddress }}
       </el-descriptions-item>
diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue
index 1b6f8b4..22bbbc0 100644
--- a/src/views/enterpriselibrary/enterInfo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/index.vue
@@ -27,7 +27,7 @@
           <el-button type="primary">导出企业清单</el-button>
         </div>
         <div class="enter-footTabs" v-else>
-          <el-button type="primary" @click="goBack">返回</el-button>
+          <!-- <el-button type="primary" @click="goBack">返回</el-button> -->
           <el-button type="primary" @click="editEnterInfo">编辑</el-button>
         </div>
       </el-col>
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index 7ebd203..b2a5d96 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -43,8 +43,11 @@
           <el-table-column label="经营状态" prop="enterTime" />
           <el-table-column label="成立日期" prop="createBy" />
           <el-table-column label="注册资本" prop="createTime" /> -->
-          <el-table-column label="企业类型" prop="" />
-          <el-table-column label="所属行业" prop="" />
+          <el-table-column label="组织机构代码" prop="institutionCode" />
+          <el-table-column label="登记注册统计类别" prop="statisticalCategories" />
+          <el-table-column label="行业代码" prop="industryCode" />
+          <el-table-column label="企业类型" prop="enterpriseType" />
+          <el-table-column label="所属行业" prop="industry" />
           <el-table-column label="成立日期" prop="createTime">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d}") }}</span>
diff --git a/src/views/project/projectInfo/components/tabTwo/index.vue b/src/views/project/projectInfo/components/tabTwo/index.vue
index 4705266..cbb59bc 100644
--- a/src/views/project/projectInfo/components/tabTwo/index.vue
+++ b/src/views/project/projectInfo/components/tabTwo/index.vue
@@ -5,7 +5,7 @@
       <el-descriptions-item label="申报类型">投资补助</el-descriptions-item>
       <el-descriptions-item label="申报企业名称"><a class="a-primary" v-show="info.declareUnit">{{ info.declareUnit }}</a></el-descriptions-item>
       <el-descriptions-item label="企业性质">内资民营</el-descriptions-item>
-      <el-descriptions-item label="统一社会信用代码">QRDVCDS1321412FDSFDS</el-descriptions-item>
+      <el-descriptions-item label="统一社会信用代码">{{ info.creditCode }}</el-descriptions-item>
       <el-descriptions-item label="邮编">215513</el-descriptions-item>
       <el-descriptions-item label="电话">0512-6782727</el-descriptions-item>
       <el-descriptions-item label="企业注册地">江苏-苏州-工业园区</el-descriptions-item>
diff --git a/vue.config.js b/vue.config.js
index 5f1e4c4..405310d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
+  // demo/JinJiHu
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）