From f173b242efc11b42eaf33f8b0ec7dc46f391b81b Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 2 Apr 2024 11:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 10 ++++++++-
src/assets/styles/public.scss | 1 +
src/layout/components/FixedHeader/index.vue | 3 ++-
src/layout/components/Navbar.vue | 3 ++-
src/utils/request.js | 4 +++-
src/views/project/index.vue | 24 ++++++++++-----------
src/views/project/projectInfo/index.vue | 6 +++---
7 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/.env.development b/.env.development
index bfc2703..066aadd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,11 @@
+###
+ # @Descripttion:
+ # @version:
+ # @Author: JC9527
+ # @Date: 2024-03-25 09:07:08
+ # @LastEditors: JC9527
+ # @LastEditTime: 2024-04-01 09:39:22
+###
# 页面标题
VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
@@ -5,7 +13,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.114:9040'
+# VUE_APP_BASE_API = 'http://192.168.0.111:9040'
VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# 路由懒加载
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 03869d3..b6ce5ce 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -562,6 +562,7 @@
.btnsFlex {
display: flex;
align-items: center;
+ margin-top: 40px;
.el-upload {
// .el-upload-dragger {
display: flex;
diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue
index a64a225..e548ee3 100644
--- a/src/layout/components/FixedHeader/index.vue
+++ b/src/layout/components/FixedHeader/index.vue
@@ -69,7 +69,8 @@ export default {
})
.then(() => {
this.$store.dispatch("LogOut").then(() => {
- location.href = "/index";
+ // location.href = "/index";
+ this.$router.replace("/login");
});
})
.catch(() => {});
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index b01c4fc..125b4b2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -110,7 +110,8 @@ export default {
})
.then(() => {
this.$store.dispatch("LogOut").then(() => {
- location.href = "/demo/JinJiHu";
+ // location.href = "/login";
+ this.$router.replace("/login");
});
})
.catch(() => {});
diff --git a/src/utils/request.js b/src/utils/request.js
index ffb0d21..d273357 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode'
import { tansParams, blobValidate } from "@/utils/ruoyi";
import cache from '@/plugins/cache'
import { saveAs } from 'file-saver'
+import router from '@/router'
let downloadLoadingInstance;
// 是否显示重新登录
@@ -87,7 +88,8 @@ service.interceptors.response.use(res => {
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- location.href = '/index';
+ // location.href = '/index';
+ router.replace("/login");
})
}).catch(() => {
isRelogin.show = false;
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index b69a491..b20d256 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -4,7 +4,7 @@
* @Author: JC9527
* @Date: 2024-03-25 09:07:08
* @LastEditors: JC9527
- * @LastEditTime: 2024-03-29 16:51:22
+ * @LastEditTime: 2024-04-01 10:29:01
-->
<template>
<div class="L-public-main" id="L-size-main">
@@ -72,23 +72,23 @@
<template slot-scope="scope">
<p class="statusisThree" v-if="scope.row.status === 1">
<span></span>
- <span>初审中</span>
+ <span>初审阶段</span>
</p>
<p class="statusisThree" v-if="scope.row.status === 2">
<span></span>
- <span>复审中</span>
+ <span>复审阶段</span>
</p>
<p class="statusisTwo" v-if="scope.row.status === 3">
<span></span>
- <span>专家评审中</span>
+ <span>专家评审阶段</span>
</p>
<p class="statusisTwo" v-if="scope.row.status === 4">
<span></span>
- <span>市级评审中</span>
+ <span>上级评审阶段</span>
</p>
<p class="statusisOne" v-if="scope.row.status === 5">
<span></span>
- <span>评审通过</span>
+ <span>已通过</span>
</p>
</template>
</el-table-column>
@@ -123,7 +123,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="年份：" class="importFormItem" prop="projectYear">
+ <!-- <el-form-item label="年份：" class="importFormItem" prop="projectYear">
<el-date-picker
class="ignoreElement"
v-model="importFrom.projectYear"
@@ -132,7 +132,7 @@
value-format="yyyy"
placeholder="选择年">
</el-date-picker>
- </el-form-item>
+ </el-form-item> -->
<el-form-item class="importFormItem">
<!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-daoru" size="mini" @click="importBtn">导入新项目</el-button> -->
<div class="btnsFlex">
@@ -248,15 +248,15 @@ export default {
title:"导入新项目",
importFrom:{
projectClassify:"",
- projectYear:"",
+ // projectYear:"",
},
rules: {
projectClassify: [
{ required: true, message: '请选择项目分类', trigger: 'change' }
],
- projectYear: [
- { required: true, message: '请选择年份', trigger: 'change' }
- ],
+ // projectYear: [
+ // { required: true, message: '请选择年份', trigger: 'change' }
+ // ],
},
// 用户导入参数
upload: {
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
index ccea059..a120269 100644
--- a/src/views/project/projectInfo/index.vue
+++ b/src/views/project/projectInfo/index.vue
@@ -3,12 +3,12 @@
<el-row :gutter="10">
<el-col :span="18">
<div class="left-info">
- <div class="project-info-title">【项目基本信息】</div>
+ <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="年份">{{ info.projectYear }}</el-descriptions-item>
+ <el-descriptions-item label="状态"><dict-tag :options="dict.type.jjh_status" :value="info.status"/></el-descriptions-item>
</el-descriptions>
</div>
<div class="left-tabs">
@@ -33,7 +33,7 @@
import { tabOne, tabTwo, tabThree, tabFour, projectProgress } from "./components"
import { jProjectId } from "@/api/jin_ji_hu/project/index"
export default {
- dicts: ['jjh_project_type'],
+ dicts: ['jjh_project_type','jjh_status'],
components:{
tabOne,
tabTwo,