From d328bd467ffcb660e81d546a0b242e39320acb6d Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 05 六月 2025 09:53:30 +0800 Subject: [PATCH] 系统名称调整、登录页调整、项目新增发起依据 --- .env.staging | 4 +- .env.development | 4 +- src/views/login.vue | 15 ++----- vue.config.js | 2 src/layout/components/Navbar.vue | 2 package.json | 2 .env.production | 4 +- src/views/projectEngineering/projectLibrary/component/ProjectFrom.vue | 54 +++++++++++++++++++++++++++ src/views/projectEngineering/projectLibrary/projectDetails.vue | 6 +++ src/components/FileUpload/index.vue | 2 10 files changed, 74 insertions(+), 21 deletions(-) diff --git a/.env.development b/.env.development index 17348f4..2dfa74c 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ # 椤甸潰鏍囬 -VUE_APP_TITLE = 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺 +VUE_APP_TITLE = 鍐滄姇椤圭洰绠$悊绯荤粺 # 寮�鍙戠幆澧冮厤缃� ENV = 'development' -# 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺/寮�鍙戠幆澧� +# 鍐滄姇椤圭洰绠$悊绯荤粺/寮�鍙戠幆澧� VUE_APP_BASE_API = '/dev-api' # 璺敱鎳掑姞杞� diff --git a/.env.production b/.env.production index 7519423..afcc30c 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ # 椤甸潰鏍囬 -VUE_APP_TITLE = 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺 +VUE_APP_TITLE = 鍐滄姇椤圭洰绠$悊绯荤粺 # 鐢熶骇鐜閰嶇疆 ENV = 'production' -# 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺/鐢熶骇鐜 +# 鍐滄姇椤圭洰绠$悊绯荤粺/鐢熶骇鐜 VUE_APP_BASE_API = '/prod-api' # 寮�鎵撴柊鐨則ab鐨剈rl鍓嶇紑 diff --git a/.env.staging b/.env.staging index 2042b60..390f3e5 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 椤甸潰鏍囬 -VUE_APP_TITLE = 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺 +VUE_APP_TITLE = 鍐滄姇椤圭洰绠$悊绯荤粺 BABEL_ENV = production @@ -8,5 +8,5 @@ # 娴嬭瘯鐜閰嶇疆 ENV = 'staging' -# 灏勬椽鏅烘収椤圭洰绠$悊绯荤粺/娴嬭瘯鐜 +# 鍐滄姇椤圭洰绠$悊绯荤粺/娴嬭瘯鐜 VUE_APP_BASE_API = '/stage-api' diff --git a/package.json b/package.json index 9a67af6..42db010 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.8.8", - "description": "灏勬椽鏅烘収椤圭洰绠$悊绯荤粺", + "description": "鍐滄姇椤圭洰绠$悊绯荤粺", "author": "灏勬椽椤圭洰", "license": "MIT", "scripts": { diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 2cb9b1b..c41ce85 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -61,7 +61,7 @@ // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg'] fileType: { type: Array, - default: () => ["doc", "xls", "ppt", "txt", "pdf"], + default: () => ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf", "jpg", "png"], }, // 鏄惁鏄剧ず鎻愮ず isShowTip: { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d224b3a..d2e2f05 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,7 +2,7 @@ <div class="navbar"> <div class="ruoyi-logo"> <img src="@/assets/logo/logo.png" alt="" /> - <span>灏勬椽鏅烘収椤圭洰绠$悊绯荤粺</span> + <span>鍐滄姇椤圭洰绠$悊绯荤粺</span> </div> <div class="right-menu flex align-center"> <div style="color: rgb(49,48,48);margin-right: 30px;font-size: 16px"> diff --git a/src/views/login.vue b/src/views/login.vue index bb69350..296741a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -2,11 +2,11 @@ <div class="login"> <div class="nav"> <img alt="" src="../assets/images/bj.png" /> - <div class="ml-[10px]">灏勬椽鏅烘収椤圭洰绠$悊绯荤粺</div> + <div class="ml-[10px]">鍐滄姇椤圭洰绠$悊绯荤粺</div> </div> <div class="conter"> <div class="left"> - <div class="title">灏勬椽鏅烘収椤圭洰绠$悊绯荤粺</div> + <div class="title">鍐滄姇椤圭洰绠$悊绯荤粺</div> <div> 杩愮敤绯荤粺鐨勮鐐广�佹柟娉曞拰鐞嗚锛屽椤圭洰娑夊強鐨勫叏閮ㄥ伐浣滆繘琛屾湁鏁堝湴绠$悊 </div> @@ -19,14 +19,7 @@ class="login-corporation" @click="currentClick('corporation')" > - 娉曚汉鐧诲綍 - </div> - <div - :class="{ active: currentTab === 'supervise' }" - class="login-supervise" - @click="superviseClick('supervise')" - > - 鐩戠閮ㄩ棬鐧诲綍 + 璐﹀彿鐧诲綍 </div> </div> <el-form @@ -307,7 +300,7 @@ .right { border-radius: 6px; background: #ffffff; - width: 500px; + width: 450px; padding: 0px 25px 5px 25px; .tab { diff --git a/src/views/projectEngineering/projectLibrary/component/ProjectFrom.vue b/src/views/projectEngineering/projectLibrary/component/ProjectFrom.vue new file mode 100644 index 0000000..db0969d --- /dev/null +++ b/src/views/projectEngineering/projectLibrary/component/ProjectFrom.vue @@ -0,0 +1,54 @@ +<template> + <div class="basic-info"> + <el-form ref="demoFormRef" :disabled="disabled" :model="projectFromForm" class="dialog_form"> + <el-form-item label="渚濇嵁璇存槑" label-width="120px" prop="projectFromWhere" style="width: 100%"> + <el-input type="textarea" v-model="projectFromForm.projectFromWhere" style="width: 100%" + placeholder="璇疯緭鍏�"/> + </el-form-item> + <el-form-item label="渚濇嵁闄勪欢" label-width="120px" prop="projectFromFile" style="width: 100%"> + <file-upload :limit="5" :file-size="100" @input="getUploadResult" /> + </el-form-item> + </el-form> + </div> +</template> + +<script> + +import FileUpload from "@/components/FileUpload" + +export default { + name: 'ProjectForm', + components: {FileUpload}, + props: { + disabled: { + type: Boolean, + default: false, + required: true + }, + }, + data() { + return { + projectFromForm: { + projectFromWhere: '', + projectFromFile: '', + }, + } + }, + mounted() { + + + }, + beforeDestroy() { + + }, + methods: { + getUploadResult(fileList) { + console.log("涓婁紶缁撴灉", fileList) + } + } +} +</script> + +<style lang="scss" scoped> + +</style> diff --git a/src/views/projectEngineering/projectLibrary/projectDetails.vue b/src/views/projectEngineering/projectLibrary/projectDetails.vue index 446ece8..31e3678 100644 --- a/src/views/projectEngineering/projectLibrary/projectDetails.vue +++ b/src/views/projectEngineering/projectLibrary/projectDetails.vue @@ -77,6 +77,7 @@ import InvestInfo from "@/views/projectEngineering/projectLibrary/component/InvestInfo"; import InvestmentFunds from "@/views/projectEngineering/projectLibrary/component/investmentFunds"; import LegalPerson from "@/views/projectEngineering/projectLibrary/component/legalPerson"; +import ProjectFrom from "@/views/projectEngineering/projectLibrary/component/ProjectFrom"; import PolicyInfo from "@/views/projectEngineering/projectLibrary/component/PolicyInfo"; import DocumentsInfo from "@/views/projectEngineering/projectLibrary/component/DocumentsInfo"; import { editProject } from "@/api/projectEngineering/projectInfo"; @@ -115,6 +116,11 @@ value: "椤圭洰(娉曚汉)鍗曚綅鐧昏淇℃伅", componentName: LegalPerson, }, + { + label: "椤圭洰鍙戣捣渚濇嵁", + value: "椤圭洰鍙戣捣渚濇嵁", + componentName: ProjectFrom, + }, // { // label: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌", // value: "鎶曡祫椤圭洰浜т笟鏀跨瓥绗﹀悎鎯呭喌", diff --git a/vue.config.js b/vue.config.js index 8b2ced5..acc5b4a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -7,7 +7,7 @@ const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '灏勬椽鏅烘収椤圭洰绠$悊绯荤粺' // 缃戦〉鏍囬 +const name = process.env.VUE_APP_TITLE || '鍐滄姇椤圭洰绠$悊绯荤粺' // 缃戦〉鏍囬 const port = process.env.port || process.env.npm_config_port || 80 // 绔彛 -- Gitblit v1.8.0