彭宇 2 лет назад
Родитель
Сommit
2668911798

+ 2 - 2
.env.development

@@ -1,10 +1,10 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 
 # 开发环境配置
 # 开发环境配置
 ENV = 'development'
 ENV = 'development'
 
 
-# 通榆县乡村振兴监管平台/开发环境
+# 四平市态势感知平台/开发环境
 VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = '/dev-api'
 
 
 # 路由懒加载
 # 路由懒加载

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 
 # 生产环境配置
 # 生产环境配置
 ENV = 'production'
 ENV = 'production'

+ 1 - 1
.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
 # 页面标题
-VUE_APP_TITLE = 通榆县乡村振兴监管平台
+VUE_APP_TITLE = 四平市态势感知平台
 
 
 NODE_ENV = production
 NODE_ENV = production
 
 

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "ruoyi",
   "name": "ruoyi",
   "version": "3.4.0",
   "version": "3.4.0",
-  "description": "通榆县乡村振兴监管平台",
+  "description": "四平市态势感知平台",
   "author": "若依",
   "author": "若依",
   "license": "MIT",
   "license": "MIT",
   "scripts": {
   "scripts": {

+ 11 - 2
src/components/v-header.vue

@@ -5,7 +5,7 @@
 		<!--中间LOGO -->
 		<!--中间LOGO -->
 		<div class="title">
 		<div class="title">
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-left2.png" /> -->
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-left2.png" /> -->
-			<h3><img class="logo" src="@/assets/images/integrated/logo-small.png" />通榆县乡村振兴监管平台 {{titlename}}
+			<h3><img class="logo" src="@/assets/images/integrated/logo-small.png" />{{systemTitle.title}} {{titlename}}
 			</h3>
 			</h3>
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-right2.png" /> -->
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-right2.png" /> -->
 		</div>
 		</div>
@@ -28,6 +28,7 @@
 	import {constantRoutes} from '@/router/index'//navbar导航引用了router路由的数组
 	import {constantRoutes} from '@/router/index'//navbar导航引用了router路由的数组
 	import Clock from '@/components/clock.vue' // 时钟+天气
 	import Clock from '@/components/clock.vue' // 时钟+天气
 	import VfastMenu from '@/components/v-fastmenu.vue' // 头部右侧菜单
 	import VfastMenu from '@/components/v-fastmenu.vue' // 头部右侧菜单
+  import {fontConfig } from "@/api/login";
 	export default{
 	export default{
 		components:{
 		components:{
 			VfastMenu,
 			VfastMenu,
@@ -36,15 +37,23 @@
 		},
 		},
 		created(){
 		created(){
 			this.navbar
 			this.navbar
+      this.fontConfig();
 		},
 		},
 		data(){
 		data(){
 			return{
 			return{
-
+        systemTitle:{
+          title:'',  //标题
+        },
 			}
 			}
 		},
 		},
 		methods:{
 		methods:{
 		},
 		},
 		computed:{
 		computed:{
+      fontConfig(){
+        fontConfig().then(res => {
+          this.systemTitle.title = res.data.fontTitle;
+        })
+      },
 			titlename(){
 			titlename(){
 				return this.$route.meta.title
 				return this.$route.meta.title
 			},
 			},

+ 1 - 1
src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
-      title: '通榆县乡村振兴监管平台',
+      title: '四平市态势感知平台',
       logo: logoImg
       logo: logoImg
     }
     }
   }
   }

+ 17 - 2
src/views/bigdata/bigdata.vue

@@ -5,7 +5,7 @@
     <div class="header">
     <div class="header">
       <!-- title -->
       <!-- title -->
       <div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png"/>
       <div class="header-left"><img class="logo" src="@/assets/images/integrated/logo-small.png"/>
-        <h3 class="title">通榆县乡村振兴监管平台-数字林业-统计分析</h3>
+        <h3 class="title">{{systemTitle.title}}-{{systemTitle.subTitle}}-统计分析</h3>
       </div>
       </div>
       <div class="bignav">
       <div class="bignav">
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
@@ -170,6 +170,9 @@ import chartPitG5 from './chart-farmtype' //21 偷钓偷捕事件分析、、
 import chartPitG6 from './chart-waterTotal' //22 分析、、
 import chartPitG6 from './chart-waterTotal' //22 分析、、
 
 
 import {getRlt} from '@/api/bigdata'
 import {getRlt} from '@/api/bigdata'
+import {
+  fontConfig
+} from '@/api/login'
 
 
 export default {
 export default {
   components: {
   components: {
@@ -196,6 +199,10 @@ export default {
   data() {
   data() {
 
 
     return {
     return {
+      systemTitle:{
+        title:'',  //标题
+        subTitle:''  ,//副标题 数字资源
+      },
       visited: '',
       visited: '',
       navbar: [
       navbar: [
         {
         {
@@ -244,8 +251,16 @@ export default {
 
 
     }
     }
   },
   },
-
+  created(){
+    this.fontConfig();
+  },
   methods:{
   methods:{
+    fontConfig(){
+      fontConfig().then(res => {
+        this.systemTitle.title = res.data.fontTitle;
+        this.systemTitle.subTitle = res.data.subTitle;
+      })
+    },
     rlt() {
     rlt() {
       let that = this
       let that = this
       getRlt().then(resp => {
       getRlt().then(resp => {

+ 12 - 2
src/views/system/login-sp.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="login">
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">通榆县乡村振兴监管平台</h3>
+      <h3 class="title">{{systemTitle.title}}</h3>
       <div class="login-container">
       <div class="login-container">
         <h4>请登录</h4>
         <h4>请登录</h4>
         <el-form-item prop="username">
         <el-form-item prop="username">
@@ -42,7 +42,7 @@
 
 
 <script>
 <script>
   import {
   import {
-    getCodeImg
+    getCodeImg,fontConfig
   } from '@/api/login'
   } from '@/api/login'
   import Cookies from 'js-cookie'
   import Cookies from 'js-cookie'
   import {
   import {
@@ -54,6 +54,10 @@
     name: 'Login',
     name: 'Login',
     data() {
     data() {
       return {
       return {
+        systemTitle:{
+          title:'',  //标题
+          subTitle:''  ,//副标题 数字资源
+        },
         codeUrl: '',
         codeUrl: '',
         loginForm: {
         loginForm: {
           username: 'admin',
           username: 'admin',
@@ -98,8 +102,14 @@
     created() {
     created() {
       this.getCode()
       this.getCode()
       this.getCookie()
       this.getCookie()
+      this.fontConfig();
     },
     },
     methods: {
     methods: {
+      fontConfig(){
+        fontConfig().then(res => {
+          this.systemTitle.title = res.data.fontTitle;
+        })
+      },
       getCode() {
       getCode() {
         getCodeImg().then(res => {
         getCodeImg().then(res => {
           this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff
           this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff

+ 2 - 2
src/views/system/login.vue

@@ -70,8 +70,8 @@
 			return {
 			return {
         backgroudImg:'', //背景图片
         backgroudImg:'', //背景图片
         systemTitle:{
         systemTitle:{
-          title:'通榆县乡村振兴综合监管平台',  //标题
-          subTitle:'数字资源'  ,//副标题
+          title:'',  //标题
+          subTitle:''  ,//副标题 数字资源
         },
         },
 				codeUrl: '',
 				codeUrl: '',
 				loginForm: {
 				loginForm: {

+ 12 - 2
src/views/system/register.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="register">
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">通榆县乡村振兴监管平台</h3>
+      <h3 class="title">{{systemTitle.title}}</h3>
       <el-form-item prop="username">
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -67,7 +67,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getCodeImg, register } from "@/api/login";
+import { getCodeImg, register,fontConfig } from "@/api/login";
 
 
 export default {
 export default {
   name: "Register",
   name: "Register",
@@ -80,6 +80,10 @@ export default {
       }
       }
     };
     };
     return {
     return {
+      systemTitle:{
+        title:'',  //标题
+        subTitle:''  ,//副标题 数字资源
+      },
       codeUrl: "",
       codeUrl: "",
       registerForm: {
       registerForm: {
         username: "",
         username: "",
@@ -109,8 +113,14 @@ export default {
   },
   },
   created() {
   created() {
     this.getCode();
     this.getCode();
+    this.fontConfig();
   },
   },
   methods: {
   methods: {
+    fontConfig(){
+      fontConfig().then(res => {
+        this.systemTitle.title = res.data.fontTitle;
+      })
+    },
     getCode() {
     getCode() {
       getCodeImg().then(res => {
       getCodeImg().then(res => {
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
         this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;