From 867d91b66f8e2fd9e3eba1d7228e4886d0915e90 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 11 Nov 2024 13:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=81=E4=B8=9A=E9=80=9A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 ++--
 .env.production                               |  4 ++--
 package.json                                  |  2 +-
 src/api/jin_ji_hu/login/index.js              |  9 +++++++
 src/permission.js                             |  1 +
 .../enterpriselibrary/enterInfo/index.vue     | 24 ++++++++++++++++++-
 src/views/enterpriselibrary/index.vue         |  4 ++--
 src/views/login.vue                           |  2 +-
 src/views/login_v1.vue                        |  2 +-
 .../enterpriseDirectory/index.vue             |  4 ++--
 vue.config.js                                 |  4 ++--
 11 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 5f51fbb..0997661 100644
--- a/.env.development
+++ b/.env.development
@@ -5,9 +5,9 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.108:9031'
+VUE_APP_BASE_API = 'http://192.168.0.117:9040'
 # 测试环境数据库
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # 脱敏三方测试用数据库
 # VUE_APP_BASE_API = 'http://39.101.188.84:9031'
 # 正式环境数据库
diff --git a/.env.production b/.env.production
index 4401bfc..97bf221 100644
--- a/.env.production
+++ b/.env.production
@@ -7,9 +7,9 @@ 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 = 'http://39.101.188.84:9031'
 # VUE_APP_BASE_API = 'http://192.114.0.197/api'
 # 正式环境数据库
-# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
+VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
diff --git a/package.json b/package.json
index 93d5384..d8e86af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202410180915",
+  "version": "1.0.202411111353",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/api/jin_ji_hu/login/index.js b/src/api/jin_ji_hu/login/index.js
index 0e219b7..7bf87da 100644
--- a/src/api/jin_ji_hu/login/index.js
+++ b/src/api/jin_ji_hu/login/index.js
@@ -27,6 +27,15 @@ export function governmentGetInfo(params) {
   })
 }
 
+// 企业详情查看
+export function returnUrl(params){
+  return request({
+    url: "/system/chief/returnUrl",
+    method: "get",
+    params
+  })
+}
+
 // // 政务端退出登录
 // export function enterpriseLogout(params) {
 //   return request({
diff --git a/src/permission.js b/src/permission.js
index 2693192..c3ca52d 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -84,6 +84,7 @@ router.beforeEach((to, from, next) => {
     const timespan = queryOne && queryOne[1];                       // 时间戳
     const signature = queryTwo && queryTwo[1];                      // 签名
     const userToken = queryThree && queryThree[1];                  // 用户令牌
+    localStorage.setItem("otherToken",userToken)
     let info = {
       userToken,
       signature,
diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue
index 5b0c930..e1beb7c 100644
--- a/src/views/enterpriselibrary/enterInfo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/index.vue
@@ -5,7 +5,7 @@
         <div class="left-info enter-left-info" id="L-header">
           <div class="project-info-title">【企业信息】</div>
           <el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
-            <el-descriptions-item label="企业名称">{{ info.qymc }}</el-descriptions-item>
+            <el-descriptions-item label="企业名称"><span v-if="isZhengwu" @click="goGov(info.tyshxydm)" style="color: #134EE6;text-decoration: underline;cursor: pointer;">{{ info.qymc }}</span><span v-else>{{ info.qymc }}</span></el-descriptions-item>
             <el-descriptions-item label="法定代表人" contentClassName="info-link">{{ info.fddbrxm }}</el-descriptions-item>
             <el-descriptions-item label="统一社会信用代码" contentClassName="info-link">{{ info.tyshxydm }}</el-descriptions-item>
             <el-descriptions-item label="企业类型">{{ info.qylxmc }}</el-descriptions-item>
@@ -114,6 +114,7 @@
 <script>
 import { tabOne, tabTwo, tabThree, tabFour, projectProgress } from "./components"
 import { enterpriseBasicInfoId, enterpriseBasicInfoChange } from "@/api/jin_ji_hu/enterList"
+import { returnUrl } from "@/api/jin_ji_hu/login"
 import myDialog from "@/views/components/myDialog/index.vue"
 export default {
   dicts: ['jjh_project_type','jjh_status'],
@@ -172,6 +173,7 @@ export default {
         enrollType:"",
         business:"",
       },
+      isZhengwu:false,
       rules:{
         enterpriseName:[
           { required: true, message: '请填写企业名称', trigger: 'blur' }
@@ -210,6 +212,15 @@ export default {
           { required: true, message: '请填写经营范围', trigger: 'blur' }
         ],
       },
+      userToken:null,
+    }
+  },
+  created(){
+    this.userToken = localStorage.getItem('otherToken');
+    if(this.userToken) {
+      this.isZhengwu = true;
+    } else {
+      this.isZhengwu = false;
     }
   },
   mounted(){
@@ -227,6 +238,17 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    // 跳转企业详情
+    goGov(tyshxydm){
+      returnUrl({code:tyshxydm,userToken:this.userToken}).then(res => {
+        if(res.code == 200) {
+          const url = res.msg
+          console.log(url,"url");
+          window.open(url);
+        }
+      })
+    },
+    // 详情查看
     getInfo(id){
       this.loading = true;
       enterpriseBasicInfoId(id).then(res=>{
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index 03656ea..67b1f18 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -338,11 +338,11 @@ export default {
     frontDownload() {
       var a = document.createElement("a"); //创建一个<a></a>标签
       // 测试环境下载地址
-      a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
+      // a.href = "/demo/JinJiHu/static/企业库数据模板.xlsx";
       // 脱敏三方测试用下载地址
       // a.href = "/test/JinJiHuTest/static/企业库数据模板.xlsx";
       // 正式环境下载地址
-      // a.href = "./static/企业库数据模板.xlsx";
+      a.href = "./static/企业库数据模板.xlsx";
         //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
         a.download ="企业库模板.xlsx";
         //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
diff --git a/src/views/login.vue b/src/views/login.vue
index 317e720..739696b 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -121,7 +121,7 @@
 
 
     <!-- 正式环境部署命令 ： unzip /var/www/html/dist.zip -d /var/www/html/bms -->
-    <!-- process.env.VUE_APP_BASE_API 替换 location.origin + '/api'  publicPath： 由/dome/JinJiHu 更换为./ -->
+    <!-- publicPath： 由/dome/JinJiHu 更换为./ -->
   </div>
 </template>
 
diff --git a/src/views/login_v1.vue b/src/views/login_v1.vue
index ac879b1..f7718ea 100644
--- a/src/views/login_v1.vue
+++ b/src/views/login_v1.vue
@@ -96,7 +96,7 @@
 
 
     <!-- 正式环境部署命令 ： unzip /var/www/html/dist.zip -d /var/www/html/bms -->
-    <!-- process.env.VUE_APP_BASE_API 替换 location.origin + '/api'  publicPath： 由/dome/JinJiHu 更换为./ -->
+    <!-- publicPath： 由/dome/JinJiHu 更换为./ -->
   </div>
 </template>
 
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 9a9fd88..7eba604 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -847,11 +847,11 @@ export default {
     frontDownload() {
       var a = document.createElement("a"); //创建一个<a></a>标签
       // 测试环境下载地址
-      a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
+      // a.href = "/demo/JinJiHu/static/企业名录模板.xlsx";
       // 脱敏三方测试用下载地址
       // a.href = "/test/JinJiHuTest/static/企业名录模板.xlsx";
       // 正式环境下载地址
-      // a.href = "./static/企业名录模板.xlsx";
+      a.href = "./static/企业名录模板.xlsx";
         //给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
         a.download ="企业名录模板.xlsx";
         //设置下载文件文件名，这里加上.xlsx指定文件类型，pdf文件就指定.fpd即可
diff --git a/vue.config.js b/vue.config.js
index 7c09c8b..836786b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,11 +19,11 @@ module.exports = {
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   // 测试环境部署地址
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "/demo/JinJiHu" : "/",
   // 第三方测试脱敏部署地址
   // publicPath: process.env.NODE_ENV === "production" ? "/test/JinJiHuTest" : "/",
   // 正式环境部署地址
-  // publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）