Merge remote-tracking branch 'origin/visu_village' into visu_village

.env.development

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

.env.production

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

.env.staging

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

package.json

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

src/components/v-header.vue

@@ -5,7 +5,7 @@
 		<!--中间LOGO -->
 		<div class="title">
 			<!-- <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>
 			<!-- <img src="@/assets/images/integrated/bigdata-header-nav-right2.png" /> -->
 		</div>
@@ -28,6 +28,8 @@
 	import {constantRoutes} from '@/router/index'//navbar导航引用了router路由的数组
 	import Clock from '@/components/clock.vue' // 时钟+天气
 	import VfastMenu from '@/components/v-fastmenu.vue' // 头部右侧菜单
+  import { fontConfig } from '@/api/login'
+
 	export default{
 		components:{
 			VfastMenu,
@@ -35,16 +37,24 @@
 
 		},
 		created(){
+      this.fontConfig()
 			this.navbar
 		},
 		data(){
 			return{
-
+        systemTitle:{
+          title:'',  //标题
+        },
 			}
 		},
 		methods:{
 		},
 		computed:{
+      fontConfig(){
+        fontConfig().then(res => {
+          this.systemTitle.title = res.data.fontTitle;
+        })
+      },
 			titlename(){
 				return this.$route.meta.title
 			},

src/layout/components/Sidebar/Logo.vue

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

src/router/index.js

@@ -39,7 +39,7 @@ export const constantRoutes = [{
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '通榆云图'
+			title: '四平云图'
 		}
 	},
   // {
@@ -65,7 +65,7 @@ export const constantRoutesNew = [{
 		name: 'forest',
 		component: () => import('@/views/forest'),
 		meta: {
-			title: '通榆云图'
+			title: '四平云图'
 		}
 	},
   // {

src/views/bigdata/bigdata.vue

@@ -5,7 +5,7 @@
     <div class="header">
       <!-- title -->
       <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 class="bignav">
         <img src="@/assets/images/integrated/bigdata-header-nav-left.png"/>
@@ -154,7 +154,8 @@ import chartGridStaff from './chart-gridStaff.vue' //13 网格人员、、
 import chartWeatherStation from './chart-weatherStation.vue' //14 气象站、、
 import chartEquipmentDistribution from './chart-equipmentDistribution' //16 设备分布、、
 
-import {getRlt} from '@/api/bigdata'
+import { getRlt } from '@/api/bigdata'
+import { fontConfig } from '@/api/login'
 
 export default {
   components: {
@@ -178,12 +179,16 @@ export default {
   data() {
 
     return {
+      systemTitle: {
+        title: '',  //标题
+        subTitle: ''//副标题 数字通榆
+      },
       visited: '',
       navbar: [
         {
           //林业中心
           path: '/forest',
-          name: '通榆云图'
+          name: '四平云图'
         },
         // {
         //   //数据中心
@@ -226,8 +231,16 @@ export default {
 
     }
   },
-
-  methods:{
+created() {
+  this.fontConfig()
+},
+  methods: {
+    fontConfig(){
+      fontConfig().then(res => {
+        this.systemTitle.title = res.data.fontTitle;
+        this.systemTitle.subTitle = res.data.subTitle;
+      })
+    },
     rlt() {
       let that = this
       getRlt().then(resp => {
@@ -244,8 +257,6 @@ export default {
 }
 
 
-
-
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

src/views/system/login-sp.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">通榆县乡村振兴监管平台</h3>
+      <h3 class="title">四平市态势感知平台</h3>
       <div class="login-container">
         <h4>请登录</h4>
         <el-form-item prop="username">

src/views/system/login.vue

@@ -70,8 +70,8 @@
 			return {
         backgroudImg:'', //背景图片
         systemTitle:{
-          title:'通榆县乡村振兴综合监管平台',  //标题
-          subTitle:'数字通榆'  ,//副标题
+          title:'',  //标题
+          subTitle:''  ,//副标题 数字通榆
         },
 				codeUrl: '',
 				loginForm: {
@@ -117,7 +117,7 @@
 		created() {
 			this.getCode()
 			this.getCookie()
-      this.fontConfig();
+      this.fontConfig()
 		},
 		methods: {
       fontConfig(){

src/views/system/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">通榆县乡村振兴监管平台</h3>
+      <h3 class="title">四平市态势感知平台</h3>
       <el-form-item prop="username">
         <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" />

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 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 // 端口