Merge branch 'dev-eduadmin-20190222' of...

Merge branch 'dev-eduadmin-20190222' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-eduadmin-20190222

src/views/education/item-component.vue

@@ -32,7 +32,7 @@
                 </el-form>
             </el-row>
             <el-row :gutter="10" class="row create-button" style="margin-right:0;">
-                <el-button type="primary" size="small" :disabled="idType == 2 && masterAdministratorFlag == false" @click="createComponent">新建项目组件</el-button>
+                <el-button type="primary" size="small" :disabled="idType == 2 && masterAdministratorFlag == 'false'" @click="createComponent">新建项目组件</el-button>
             </el-row>
             <el-table 
             :data="tableData" 
@@ -146,9 +146,6 @@ export default {
         vm.search()
         vm.idType = localStorage.getItem('storageIdType')
         vm.masterAdministratorFlag = localStorage.getItem('storageMaster')
-        console.log('vm.idType===========',vm.idType)
-        console.log('vm.masterAdministratorFlag===========',vm.masterAdministratorFlag)
-        console.log(vm.idType == 2 && vm.masterAdministratorFlag == false)
     },
     // 挂载到Dom完成时
     mounted: function() {

src/views/education/item-manager.vue

@@ -71,7 +71,7 @@
       </el-row>
       <el-form :model="formInline" class="demo-form-inline">
         <el-form-item>
-          <el-button class="add-button" :disabled="idType == 2 && masterAdministratorFlag == false" size="small" type="primary" @click="toPage()">新建项目</el-button>
+          <el-button class="add-button" :disabled="idType == 2 && masterAdministratorFlag == 'false'" size="small" type="primary" @click="toPage()">新建项目</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="tableData" style="width: 100%">