Merge branch 'dev-mata-ldz' of xiongzhu/raex_back into master

src/main/vue/src/views/Admin.vue

@@ -2,7 +2,7 @@
     <el-container id="app">
         <el-aside :width="collapse ? '65px' : '200px'" class="aside">
             <div v-if="collapse" class="logo-wrapper collapse" @click="$router.push('/dashboard')"></div>
-            <div v-else class="logo-wrapper" @click="$router.push('/dashboard')">RAEX绿洲</div>
+            <div v-if="$store.state.userInfo.id != '7971347'" v-else class="logo-wrapper" @click="$router.push('/dashboard')">RAEX绿洲</div>
             <el-menu :collapse="collapse" :background-color="$theme['menu-bg']" :text-color="$theme['menu-text-color']"
                 :active-text-color="$theme['menu-text-color-active']" :unique-opened="true" :router="true"
                 :default-active="activeMenu" style="border-right: 1px solid #545c64" class="el-menu-vertical-pushUtils">

src/main/vue/src/views/MetaResourcesList.vue

@@ -30,7 +30,7 @@
                     :value="item.value"
                 ></el-option>
                 </template>
-                <template v-if="$store.state.userInfo.id !== '8266668'">
+                <template v-if="$store.state.userInfo.id != '8266668'">
                 <el-option
                     v-for="item in typeOptions"
                     :key="item.value"