Browse Source

Merge branch 'gn_fix' into debug

Karsa 5 months ago
parent
commit
f823fbf231

+ 6 - 2
src/views/Home.vue

@@ -35,7 +35,7 @@
                   v-if="!item.children || item.children.length === 0"
                 >
                   <a
-                    :href="`/${item.path}`"
+                    :href="`${prefixPath}${item.path}`"
                     class="el-level-path"
                     :style="`display: block;color:${
                       item.path === activePath
@@ -97,7 +97,7 @@
                       v-if="!second.children || second.children.length === 0"
                     >
                       <a
-                        :href="`/${second.path}`"
+                        :href="`${prefixPath}${second.path}`"
                         :style="`display: flex;align-items:center;color:${
                           second.path === activePath
                             ? $setting.theme_color
@@ -506,6 +506,10 @@ export default {
 
     logoLarge() {
       return this.$store.state.baseInfo.logoCh || this.$setting.g_logo
+    },
+
+    prefixPath() {
+      return process.env.VUE_APP_BASE_URL
     }
   },
   data() {

+ 1 - 1
src/views/dataEntry_manage/databaseList.vue

@@ -418,7 +418,7 @@
 								@editEnName="openEnNameDia"/>
 							<div class="info">
 								<span>{{$t('Edb.Detail.source')}}:{{EdbData.SourceName}}</span>
-								<span>{{$t('Edb.creater')}}:{{EdbData.SysUserRealName}}</span>
+								<span v-show="EdbData.SysUserRealName">{{$t('Edb.creater')}}:{{EdbData.SysUserRealName}}</span>
 							</div>
 							<ul class="value-ul"
 								v-show="showTable&&dataList.length">

+ 1 - 1
src/views/predictEdb_manage/components/edbDetail.vue

@@ -10,7 +10,7 @@
             />
             <div class="info" style="display: flex;justify-content: flex-end;">
             <!--   <span>数据来源:{{edbData.EdbInfo.SourceName}}</span> -->
-                <span><!-- 添加人 -->{{$t('Edb.creater')}}:{{edbData.EdbInfo.SysUserRealName}}</span>
+                <span v-if="edbData.EdbInfo.SysUserRealName"><!-- 添加人 -->{{$t('Edb.creater')}}:{{edbData.EdbInfo.SysUserRealName}}</span>
             </div>
             <ul
                 class="value-ul"