Merge branch 'requirements_113'

src/main.js

@@ -203,7 +203,7 @@ router.beforeEach(async(to, from, next) => {
 router.afterEach((to, from, next) => {
   // 改变页面标题
   document.title = to.matched[to.matched.length - 1].name
-  ? `${setting.name}-${to.matched[to.matched.length - 1].name}`
+  ? `${to.matched[to.matched.length - 1].name}`
   : setting.name;
 
   window.scrollTo(0, 0);

src/views/Login.vue

@@ -413,6 +413,8 @@ export default {
                 if(res.Ret == 200){
                     this.recordInformation = res.Data.Icp?res.Data.Icp.ConfVal.split(/\s{2,}/):[]
                     this.loginTitle = res.Data.ETATitle?res.Data.ETATitle.ConfVal:''
+                    this.$setting.name = res.Data.TabName?res.Data.TabName.ConfVal:''
+                    document.title = this.$setting.name
                 }
             })
         },

src/views/system_manage/etaBaseConfig.vue

@@ -85,6 +85,10 @@
                         <el-input type="text" v-model="formData.ETATitle" placeholder="请输入登录页标题" />
                         <ConfigAnnotation picHintText="" picName="ETATitle" @showImage="previewImage"/>
                     </el-form-item>
+                    <el-form-item label="网站名称" prop="TabName">
+                        <el-input type="text" v-model="formData.TabName" placeholder="请输入登录页标题" />
+                        <ConfigAnnotation picHintText="" picName="TabName" @showImage="previewImage"/>
+                    </el-form-item>
                 </div>
             </div>
             <!-- 研报设置 -->
@@ -384,6 +388,7 @@ export default {
                 ReportApproveType:'eta',//研报审批选项
                 ICPLicense:'', //备案信息
                 ETATitle:'', //登录页标题
+                TabName:'',//网页名称
             },//表单预设值
             rules: {
                 Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
@@ -413,6 +418,7 @@ export default {
                 CnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 EnPptCoverImgs:[{ required: true, validator:ListValidator}],
                 ETATitle:[{ required: true, message: '请输入登录页标题', trigger: 'blur' }],
+                TabName:[{ required: true, message: '请输入网站名称', trigger: 'blur' }],
             },//表单校验
             disclaimerConfig:{
                 toolbarButtons:[
@@ -466,7 +472,8 @@ export default {
                 'pptBackPic':[require('@/assets/img/eta_base_config/ppt_back.jpg')],
                 'emailContentTemplate':[require('@/assets/img/eta_base_config/email_content_template.png')],
                 'ICPLicense':[require('@/assets/img/eta_base_config/record_information.jpg')],
-                'ETATitle':[require('@/assets/img/eta_base_config/ETA_title.png')]
+                'ETATitle':[require('@/assets/img/eta_base_config/ETA_title.png')],
+                'TabName':[require('@/assets/img/eta_base_config/website_title.png')]
             },
             /* loading */
             configLoading:null,