浏览代码

Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

chenmy 3 年之前
父节点
当前提交
ff70ac2cc2

+ 0 - 1
TEAMModeBI/TEAMModeBI.csproj

@@ -24,7 +24,6 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
-    <ProjectReference Include="..\TEAMModelOS\TEAMModelOS.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 1 - 1
TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -511,7 +511,7 @@ export default {
                     permission: '',
                     permission: '',
                     menuName: 'mgtPlatform',
                     menuName: 'mgtPlatform',
                     child: [],
                     child: [],
-                    isShow: process.env.NODE_ENV == 'development' && this.checkHost()
+                    isShow: this.checkHost()
                 }
                 }
             ] : []
             ] : []
             this.teacherMenu = [
             this.teacherMenu = [

+ 8 - 6
TEAMModelOS/ClientApp/src/view/mgtPlatform/MgtPlatform.vue

@@ -16,11 +16,13 @@
                     <Icon type="md-add-circle" class="add-platform-icon" />
                     <Icon type="md-add-circle" class="add-platform-icon" />
                     <p class="add-platform-text">{{$t('platform.addPlatform')}}</p>
                     <p class="add-platform-text">{{$t('platform.addPlatform')}}</p>
                 </div>
                 </div>
-                <EmptyData v-show="!platformList.links.length" :textContent="$t('platform.noPlatform')" :top="120"></EmptyData>
-                <p class="add-platform" v-show="!platformList.links.length && isArea" @click="addStatus = true">
-                    <Icon type="md-add" />
-                    {{$t('platform.addPlatform')}}
-                </p>
+                <div v-show="!platformList.links.length" style="margin:auto">
+                    <EmptyData :textContent="$t('platform.noPlatform')" :top="120"></EmptyData>
+                    <p class="add-platform" v-show="isArea" @click="addStatus = true">
+                        <Icon type="md-add" />
+                        {{$t('platform.addPlatform')}}
+                    </p>
+                </div>
             </div>
             </div>
 
 
         </vuescroll>
         </vuescroll>
@@ -31,7 +33,7 @@
                         <div style="width: 100px;height:58px;line-height: 58px;">
                         <div style="width: 100px;height:58px;line-height: 58px;">
                             <Icon type="ios-image" size="20"></Icon>
                             <Icon type="ios-image" size="20"></Icon>
                         </div>
                         </div>
-                        
+
                     </Upload>
                     </Upload>
                     <p v-show="!platform.thum">{{$t('platform.imgTips')}}</p>
                     <p v-show="!platform.thum">{{$t('platform.imgTips')}}</p>
                     <img v-show="platform.thum" :src="platform.thum+'?' + areaSas" class="poster-img">
                     <img v-show="platform.thum" :src="platform.thum+'?' + areaSas" class="poster-img">