diff --git a/.env.development b/.env.development index a847f9c..845714c 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.115:9040' +VUE_APP_BASE_API = 'http://192.168.0.122:9040' # 测试环境数据库 # VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 脱敏三方测试用数据库 @@ -20,7 +20,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true #0.脱敏环境已关闭 #1.本地运行地址：http://localhost/#/login。 #2.项目中存在不同环境的下载路径，全局搜素"/demo/JinJiHu",对应位置有各个环境下载路径代码注释。 -#3.测试与正式环境的登录页不同，需要到router.js对应的登录页组件位置根据环境不同注释掉对应组件。 +#3.测试与正式环境的登录页不同，需要到router.js对应的登录页组件位置根据环境不同注释掉对应组件。W #4.部署环境 # 堡垒机地址：https://58.209.81.144:9443/  用户名：admin47   密码：Jinjihu@123456 # 登录后选择IP地址为：192.114.0.197:22  用户名：root   密码：Cloud@1234 diff --git a/.env.production b/.env.production index 97bf221..4401bfc 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 c5e339e..fde7246 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "1.0.202502050928", + "version": "1.0.202502101437", "description": "金鸡湖现代服务业品牌管理系统", "author": "若依", "license": "MIT", diff --git a/src/api/onlineDeclartion/records.js b/src/api/onlineDeclartion/records.js index 1dab9c8..bcb1df3 100644 --- a/src/api/onlineDeclartion/records.js +++ b/src/api/onlineDeclartion/records.js @@ -1,83 +1,91 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询在线申报记录列表 export function listRecords(query) { return request({ - url: '/system/declarationRecords/list', - method: 'get', - params: query - }) + url: "/system/declarationRecords/list", + method: "get", + params: query, + }); } // 查询申报模版列表 export function templateList(query) { return request({ - url: '/system/templateRecord/templateNameList', - method: 'get', - params: query - }) + url: "/system/templateRecord/templateNameList", + method: "get", + params: query, + }); } // 导出 export function exportData(data) { return request({ - url: '/system/declarationRecords/export', - method: 'post', - responseType: 'blob', - data: data - }) + url: "/system/declarationRecords/export", + method: "post", + responseType: "blob", + data: data, + }); } // 新增企业名录 export function addTemplateRecord(data) { return request({ - url: '/system/templateRecord', - method: 'post', - data: data - }) + url: "/system/templateRecord", + method: "post", + data: data, + }); } // 下载需要评定数据 export function downloadData(data) { return request({ - url: '/system/declarationRecords/exportMunicipalBureauReview', - method: 'post', - responseType: 'blob', - data: data - }) + url: "/system/declarationRecords/exportMunicipalBureauReview", + method: "post", + responseType: "blob", + data: data, + }); } // 上传单个文件 export function uploadFile(data) { return request({ - url: '/common/upload', - method: 'post', + url: "/common/upload", + method: "post", data: data, // headers: { // 'Content-type': 'multipart/form-data' // } - }) + }); } // 上传评定数据 export function putMunicipalBureauReview(data) { return request({ - url: '/system/declarationRecords/municipalReviewNew', - method: 'post', - data: data - }) + url: "/system/declarationRecords/municipalReviewNew", + method: "post", + data: data, + }); } - // 导出zip压缩包 export function exportZip(params) { return request({ - url: '/system/declarationRecords/fileList', - method: 'get', - responseType: 'blob', + url: "/system/declarationRecords/fileList", + method: "get", + responseType: "blob", headers: { "content-type": "application/json; charset=utf-8", }, - params - }) -} \ No newline at end of file + params, + }); +} + +export function exportXlsx(query) { + return request({ + url: "/jjh/jPolicyFile/getYtb", + method: "get", + params: query, + responseType: "blob", + }); +} diff --git a/src/router/index.js b/src/router/index.js index d787560..bb98a42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,8 +43,8 @@ export const constantRoutes = [ }, { path: "/login", - // component: () => import("@/views/login"), // 测试环境登录页 - component: () => import("@/views/login_v1"), // 正式环境登录页 + component: () => import("@/views/login"), // 测试环境登录页 + // component: () => import("@/views/login_v1"), // 正式环境登录页 hidden: true, }, { diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue index 00e4cb9..2d130f3 100644 --- a/src/views/enterpriselibrary/index.vue +++ b/src/views/enterpriselibrary/index.vue @@ -2,45 +2,34 @@
- + - +
@@ -166,56 +215,62 @@
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/components/activeEnterpriseList.vue b/src/views/onlineDeclaration/enterpriseDirectory/components/activeEnterpriseList.vue new file mode 100644 index 0000000..1563568 --- /dev/null +++ b/src/views/onlineDeclaration/enterpriseDirectory/components/activeEnterpriseList.vue @@ -0,0 +1,418 @@ + + diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue index 45496e1..1e91735 100644 --- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue +++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue @@ -1,6 +1,12 @@