吕天方 8 months ago
parent e9bd1ee4e0
commit 43b4556bcd

@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.0.105:9040'
VUE_APP_BASE_API = 'http://39.101.188.84:9040'
VUE_APP_BASE_API = 'http://192.168.0.118:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
# 路由懒加载

@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "1.0.202406210919",
"version": "1.0.202406211358",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",

@ -24,6 +24,15 @@ export function jProjectDel(params) {
})
}
// 根据信用代码查询企业id
export function getUserId(params) {
return request({
url: "/system/enterpriseBasicInfo/getCreditCode",
method: "get",
params
})
}
/**
* 备忘录

@ -0,0 +1,4 @@
@font-face {
font-family: "PingFang-SC";
src: url("./font/PingFang_Heavy.ttf");
}

@ -6,6 +6,7 @@
@import "./btn.scss";
@import "./buttonType.scss";
@import "./public.scss";
@import './font.css';
body {
height: 100%;

@ -180,6 +180,9 @@
height: 100%;
}
}
.L_row {
height: calc(100% - 40px);
}
.left-info{
height: calc(25% - 5px);
background-color: white;

@ -14,13 +14,13 @@
</transition-group>
</el-breadcrumb>
<!-- <i class="icon iconfont icon-jc-55fanhui" @click="back" v-show="$route.meta.title == '项目详情'"></i> -->
<el-button
<!-- <el-button
type="primary"
v-show="$route.meta.title == '项目详情'"
icon="icon iconfont icon-jc-55fanhui"
size="mini"
@click="back"
>返回</el-button>
>返回</el-button> -->
</div>
</template>

@ -60,7 +60,7 @@ export default {
},
data() {
return {
uploadUrl: location.origin + '/api' + "/common/upload", //
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", //
headers: {
Authorization: "Bearer " + getToken()
},
@ -194,7 +194,7 @@ export default {
//
let length = quill.getSelection().index;
// res.url
quill.insertEmbed(length, "image", location.origin + '/api' + res.fileName);
quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
//
quill.setSelection(length + 1);
} else {

@ -72,8 +72,8 @@ export default {
return {
number: 0,
uploadList: [],
baseUrl: location.origin + '/api' ,
uploadFileUrl: location.origin + '/api' + "/common/upload", //
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", //
headers: {
Authorization: "Bearer " + getToken(),
},

@ -39,7 +39,7 @@ export default {
if (isExternal(real_src)) {
return real_src;
}
return location.origin + '/api' + real_src;
return process.env.VUE_APP_BASE_API + real_src;
},
realSrcList() {
if (!this.src) {
@ -51,7 +51,7 @@ export default {
if (isExternal(item)) {
return srcList.push(item);
}
return srcList.push(location.origin + '/api' + item);
return srcList.push(process.env.VUE_APP_BASE_API + item);
});
return srcList;
},

@ -76,8 +76,8 @@ export default {
dialogImageUrl: "",
dialogVisible: false,
hideUpload: false,
baseUrl: location.origin + '/api' ,
uploadImgUrl: location.origin + '/api' + "/common/upload", //
baseUrl: process.env.VUE_APP_BASE_API,
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", //
headers: {
Authorization: "Bearer " + getToken(),
},

@ -90,7 +90,7 @@ export default {
// location.href = "/index";
// console.log("this.$store.state.user.userType",this.$store.state.user.userType);
// if(this.$store.state.user.userType == "01") {
// location.href = location.origin + '/api' + "/system/singlelogin/login"
// location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
// } else {
// this.$router.replace("/login");
// }

@ -53,7 +53,7 @@ router.beforeEach((to, from, next) => {
}).catch((err) => {
store.dispatch("LogOut").then(() => {
Message.error(err);
location.href = location.origin + '/api' + "/system/singlelogin/login"
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
});
});
} else {
@ -158,7 +158,7 @@ router.beforeEach((to, from, next) => {
}
// store.dispatch("LogOut").then(() => {
// Message.error(err);
// location.href = location.origin + '/api' + "/system/singlelogin/login"
// location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
// });
}
});

@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { blobValidate } from "@/utils/ruoyi";
const baseURL = location.origin + '/api'
const baseURL = process.env.VUE_APP_BASE_API
let downloadLoadingInstance;
export default {

@ -134,7 +134,7 @@ const user = {
getInfo().then(res => {
// console.log(res);
const user = res.user
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : location.origin + '/api' + user.avatar;
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)

@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
const service = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: location.origin + '/api' ,
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 10000
})

@ -96,7 +96,7 @@ export default {
info:[],
fileInfo:[],
loading:false,
VUE_APP_BASE_API:location.origin + '/api' ,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
}
},
mounted() {

@ -24,7 +24,7 @@
</div>
<div class="enter-footTabs" v-if="userType == '02'">
<el-button type="primary" @click="goBack"></el-button>
<el-button type="primary">导出企业清单</el-button>
<!-- <el-button type="primary">导出企业清单</el-button> -->
</div>
<div class="enter-footTabs" v-else>
<!-- <el-button type="primary" @click="goBack"></el-button> -->

@ -174,7 +174,7 @@ export default {
},
title:"导入企业",
infoVisible:false,
baseUrl: location.origin + '/api' ,
baseUrl: process.env.VUE_APP_BASE_API,
//
upload: {
//
@ -184,7 +184,7 @@ export default {
//
headers: { Authorization: "Bearer " + getToken() },
//
url: location.origin + '/api' + "/system/enterpriseBasicInfo/importEnterprise"
url: process.env.VUE_APP_BASE_API + "/system/enterpriseBasicInfo/importEnterprise"
},
fileList: [],
number: 0,

@ -123,8 +123,8 @@ export default {
return {
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
username: "", // admin
password: "", // admin123
rememberMe: false,
code: "",
uuid: "",
@ -188,7 +188,7 @@ export default {
},
handleLogin() {
if(this.userType == '01') {
location.href = location.origin + '/api' + "/system/singlelogin/login"
location.href = process.env.VUE_APP_BASE_API + "/system/singlelogin/login"
} else {
this.$refs.loginForm.validate((valid) => {
if (valid) {

@ -8,7 +8,7 @@ export default {
components: { iFrame },
data() {
return {
url: location.origin + '/api' + "/druid/login.html"
url: process.env.VUE_APP_BASE_API + "/druid/login.html"
};
},
};

@ -1269,12 +1269,12 @@
<div class="left_main">
<div class="left_title">
<el-steps :active="active" finish-status="process" align-center>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<!-- <el-step title="专家评审中"></el-step>
<el-step title="市级评定中"></el-step> -->
<!-- <el-step title="上级评定中"></el-step> -->
<el-step title="终审"></el-step>
<el-step title="终审"></el-step>
<!-- <el-step title="评定通过"></el-step> -->
</el-steps>
</div>
@ -1295,7 +1295,7 @@
</div>
<div class="operate_btn">
<el-button @click="goBack"></el-button>
<el-button @click="submitForm('ts')" >暂存</el-button>
<!-- <el-button @click="submitForm('ts')" >暂存</el-button> -->
<el-button type="success" @click="submitForm('sub')" class="btn">提交</el-button>
</div>
</div>

@ -1,7 +1,7 @@
<template>
<div class="addContent">
<div class="detail_content" ref="pdf">
<div class="left_content">
<div class="left_content" id="left_content">
<el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left" class="form">
<el-row>
<el-col :span="8" style="height: 50px">
@ -1834,12 +1834,12 @@
<div class="right_content">
<div class="left_title">
<el-steps :active="active" finish-status="process" align-center>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<!-- <el-step title="专家评审中"></el-step> -->
<!-- <el-step title="市级评定中"></el-step> -->
<!-- <el-step title="上级评定中"></el-step> -->
<el-step title="终审"></el-step>
<el-step title="终审"></el-step>
<!-- <el-step title="评定通过"></el-step> -->
</el-steps>
</div>
@ -1847,9 +1847,9 @@
<el-tabs type="border-card">
<el-tab-pane label="审批流程">
<div class="empty">
<div class="top">
<!-- <div class="top">
同步获取表单流程
</div>
</div> -->
<!-- <p v-if="pageType == 'edit'" class="bottom">
暂无审批流程
</p> -->
@ -1868,8 +1868,10 @@
<div class="attach_left" v-if="item.approvalAttachment"></div>
<div class="attach_right" v-if="item.approvalAttachment">
<div v-for="(attachment, index) in item.children" :key="index" class="attach_item">
<img src="../../../assets/images/uploadBgc.jpg" class="li_img" alt="">
<span class="icon_name">{{ attachment | dealURL }}</span>
<a :href="VUE_APP_BASE_API + item.url" target="_blank">
<img src="../../../assets/images/uploadBgc.jpg" class="li_img" alt="">
<span class="icon_name">{{ attachment | dealURL }}</span>
</a>
</div>
</div>
</div>
@ -1914,7 +1916,7 @@
</div>
<div class="operate_btn">
<el-button @click="goBack"></el-button>
<el-button v-if="pageType == 'edit'" @click="submitForm('ts')"></el-button>
<!-- <el-button v-if="pageType == 'edit'" @click="submitForm('ts')"></el-button> -->
<el-button v-if="pageType == 'edit'" type="success" @click="submitForm('sub')"></el-button>
<el-button v-if="pageType == 'detail'" @click="printOutpdf" class="btn"></el-button>
</div>
@ -1945,7 +1947,7 @@ export default {
dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'],
data() {
return {
VUE_APP_BASE_API:location.origin + '/api' ,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
size: '',
templateInfo: {},
baseInfo: {},
@ -3205,27 +3207,33 @@ export default {
printOutpdf() {
let name = ''
name = `${this.templateInfo.templateName}_${this.baseInfo.enterpriseName}`
html2canvas(this.$refs.pdf).then(function(canvas) {
let contentWidth = canvas.width;
let contentHeight = canvas.height;
//a4[595.28,841.89]htmlcanvaspdf
let imgWidth = 595.28;
let imgHeight = 595.28/contentWidth * contentHeight;
// l p
// "pt""mm", "cm", "m", "in" or "px"
let pdf = new JsPDF("p", "pt");
pdf.addImage(
canvas.toDataURL("image/jpeg", 1.0),
"JPEG",
0,
0,
imgWidth,
imgHeight
);
pdf.save(name + ".pdf");
})
document.getElementById("left_content").style.overflow = 'visible';
let _this = this
setTimeout(()=>{
html2canvas(this.$refs.pdf).then(function(canvas) {
// let contentWidth = canvas.width;
// let contentHeight = canvas.height;
let contentWidth = _this.$refs.pdf.offsetWidth;
let contentHeight = _this.$refs.pdf.offsetHeight;
//a4[595.28,841.89]htmlcanvaspdf
let imgWidth = 595.28;
let imgHeight = (595.28 / contentWidth) * contentHeight;
console.log(canvas.toDataURL("image/jpeg", 1.0));
// l p
// "pt""mm", "cm", "m", "in" or "px"
let pdf = new JsPDF("p", "pt", "a4");
pdf.addImage(
canvas.toDataURL("image/jpeg", 1.0),
"JPEG",
0,
0,
imgWidth,
imgHeight
);
pdf.save(name + ".pdf");
document.getElementById("left_content").style.overflow = 'auto';
})
},200)
}
},
}
@ -3461,15 +3469,20 @@ list-style: none; /* 清除列表项前的标记 */
// justify-content: space-between;
padding: 0 80px 0 50px;
.attach_item{
// width: 55%;
width: 85%;
display: flex;
justify-content: space-between;
// justify-content: space-between;
align-items: center;
padding: 0 5px;
color: inherit;
border: 1px solid #e4e7ed;
border-radius: 2px;
margin: 10px 20px 10px 0;
a {
display: flex;
// justify-content: space-between;
align-items: center;
}
.li_img {
width: 25px;
height: 30px;

@ -128,7 +128,7 @@
@pagination="getList"
/>
<!-- 添加或修改申报企业名录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false" v-loading="diaLoading">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">
@ -271,7 +271,7 @@
</div>
</el-dialog>
<!-- 查看企业对话框 -->
<el-dialog title="企业信息列表" :visible.sync="viewVisible" width="680px" append-to-body :close-on-click-modal="false">
<el-dialog title="企业信息列表" :visible.sync="viewVisible" width="780px" append-to-body :close-on-click-modal="false">
<el-table
v-if="refreshTable"
v-loading="businessLoading"
@ -388,6 +388,7 @@ export default {
tabHeader: undefined,
unitId: undefined,
projectId: undefined,
diaLoading:false,
};
},
mounted() {
@ -540,6 +541,7 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
this.diaLoading = true;
if(this.title == "申报补录") {
if(this.form.isFrame == 0) {
delete this.form['enterpriseDirectoryList'];
@ -547,6 +549,7 @@ export default {
delete this.form['fileList'];
}
supplementation(this.form).then(res=>{
this.diaLoading = false;
this.$modal.msgSuccess("补录成功");
this.open = false;
this.isReplace = false;
@ -554,6 +557,7 @@ export default {
})
} else if (this.form.id != undefined) {
putTemplateRecord(this.form).then(response => {
this.diaLoading = false;
this.$modal.msgSuccess("修改成功");
this.open = false;
this.isReplace = false;
@ -561,6 +565,7 @@ export default {
});
} else {
addTemplateRecord(this.form).then(response => {
this.diaLoading = false;
this.$modal.msgSuccess("新增成功");
this.open = false;
this.isReplace = false;

@ -714,7 +714,7 @@ export default {
name:"updataChange",
data() {
return {
VUE_APP_BASE_API:location.origin + '/api' ,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
openCity: false,
enterpriseInfo: {},
form:{

@ -1152,11 +1152,11 @@
<div class="left_main">
<div class="left_title">
<el-steps :active="active" finish-status="process" align-center>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<el-step title="初审"></el-step>
<el-step title="复审"></el-step>
<!-- <el-step title="专家评审中"></el-step>
<el-step title="市级评定中"></el-step> -->
<el-step title="终审"></el-step>
<el-step title="终审"></el-step>
<!-- <el-step title="上级评定中"></el-step>
<el-step title="评定通过"></el-step> -->
</el-steps>

@ -282,8 +282,8 @@ export default {
//
headers: { Authorization: "Bearer " + getToken() },
//
// url: location.origin + '/api' + "/jjh/jProject/export"
url: location.origin + '/api' + "/jjh/jProject/importTemplateProject"
// url: process.env.VUE_APP_BASE_API + "/jjh/jProject/export"
url: process.env.VUE_APP_BASE_API + "/jjh/jProject/importTemplateProject"
},
tabHeader: undefined,
};

@ -51,7 +51,7 @@
</div>
<div class="card-content-two" v-if="activity.approvalAttachment">
<span>附件</span>
<a :href="activity.approvalAttachment" target="_blank">{{ activity.approvalAttachment.split("/")[activity.approvalAttachment.split("/").length - 1] }}</a>
<a :href="VUE_APP_BASE_API + activity.approvalAttachment" target="_blank">{{ activity.approvalAttachment.split("/")[activity.approvalAttachment.split("/").length - 1] }}</a>
</div>
<div class="card-content-two" v-if="!activity.approvalAttachment">
<span>附件</span>
@ -87,7 +87,8 @@ export default {
flow:[],
Mystyle:{
height:"",
}
},
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
}
},
mounted() {

@ -71,6 +71,10 @@ export default {
obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
} else if(key == "所属类型"){
obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
} else if(key == "所属行业"){
obj["value"] = newInfo[key] == 1 ? '轻工' : newInfo[key] == 2 ? '纺织' : newInfo[key] == 3 ? '冶金' : newInfo[key] == 4 ? '化工' : newInfo[key] == 5 ? '建材' : newInfo[key] == 6 ? '机械加工' : "";
} else if(key == "类别"){
obj["value"] = newInfo[key] == 1 ? '淘汰落后生产工艺装备' : newInfo[key] == 2 ? '退出低端低效生产工艺装备' : "";
} else {
obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
}
@ -161,7 +165,7 @@ export default {
info:[],
fileInfo:[],
loading:false,
VUE_APP_BASE_API:location.origin + '/api' ,
VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
}
},
mounted() {

@ -1,13 +1,13 @@
<template>
<div class="L-public-main projectInfo" id="L-size-main">
<el-row :gutter="10">
<el-row :gutter="10" class="L_row">
<el-col :span="18">
<div class="left-info" id="L-header">
<div class="project-info-title">{{ info.projectName }}</div>
<el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
<el-descriptions-item label="项目名称">{{ info.projectName }}</el-descriptions-item>
<el-descriptions-item label="项目分类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectClassify)"><dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/></a></el-descriptions-item>
<el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit"></a></el-descriptions-item>
<el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit" @click="goEnterprice(info.creditCode)"></a></el-descriptions-item>
<el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item>
</el-descriptions>
</div>
@ -27,11 +27,15 @@
<project-progress></project-progress>
</el-col>
</el-row>
<div class="enter-footTabs">
<el-button type="primary" @click="goBack"></el-button>
<!-- <el-button type="primary">导出企业清单</el-button> -->
</div>
</div>
</template>
<script>
import { tabOne, tabTwo, tabThree, tabFour, projectProgress } from "./components"
import { jProjectId } from "@/api/jin_ji_hu/project/index"
import { jProjectId, getUserId } from "@/api/jin_ji_hu/project/index"
export default {
dicts: ['jjh_project_type','jjh_status'],
components:{
@ -74,6 +78,9 @@ export default {
window.removeEventListener('resize', this.cancalDebounce);
},
methods:{
goBack(){
this.$router.back();
},
getInfo(id){
this.loading = true;
jProjectId(id).then(res=>{
@ -81,13 +88,16 @@ export default {
this.loading = false;
this.detailedInfo = JSON.parse(res.data.otherJson);
this.fileJson = JSON.parse(res.data.fileJson);
console.log(this.fileJson,"this.fileJson");
return getUserId({getCreditCode : this.info.creditCode})
// console.log(this.fileJson,"this.fileJson");
// for (var key in obj) {
// if (obj.hasOwnProperty(key)) {
// var value = obj[key];
// console.log(key + ': ' + value);
// }
// }
}).then(res=>{
this.info.userId = res.data.id
})
},
goback(id){
@ -101,6 +111,13 @@ export default {
params: { projectId: id }
})
},
goEnterprice(creditCode){
// console.log(creditCode);
this.$router.push({
name: 'enterInfo',
query: { userId: this.info.userId, creditCode: creditCode }
})
},
//
cancalDebounce(){
const element = document.getElementById('L-size-main'); // ID
@ -109,7 +126,7 @@ export default {
const elementHeight = element.offsetHeight;
const headerHeight = header.offsetHeight;
const paginationtHeight = pagination.offsetHeight;
this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 20) + 'px';
this.tabStyle.height = (elementHeight - headerHeight - paginationtHeight - 60) + 'px';
}
},
}

@ -431,7 +431,7 @@ export default {
//
headers: { Authorization: "Bearer " + getToken() },
//
url: location.origin + '/api' + "/system/user/importData"
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
},
//
queryParams: {

@ -137,7 +137,7 @@ export default {
formData.append("avatarfile", data, this.options.filename);
uploadAvatar(formData).then(response => {
this.open = false;
this.options.img = location.origin + '/api' + response.imgUrl;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
store.commit('SET_AVATAR', this.options.img);
this.$modal.msgSuccess("修改成功");
this.visible = false;

@ -8,7 +8,7 @@ export default {
components: { iFrame },
data() {
return {
url: location.origin + '/api' + "/swagger-ui/index.html"
url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
};
},
};

Loading…
Cancel
Save