Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/areaServe/areamanage.vue

@@ -257,7 +257,7 @@
                   <div :class="[adminIndex ===index ? 'patch-item':'list-item']" v-for="(item,index) in adminData" :key="index">
                     <div class="list-item-photo" @click="admintheSchool(item.id,index,item)">
                       <div class="headerPhoto">
-                        <el-image style="width: 55px; height: 55px;border-radius:50%" :src="item.picture" fit="fill" v-if="item.picture !=='' "></el-image>
+                        <el-image style="width: 55px; height: 55px;border-radius:50%" :src="item.picture" fit="fill" v-if="item.picture"></el-image>
                         <PersonalPhoto style="cursor: pointer;" :name="item.name" width="55px" height="55px" v-else></PersonalPhoto>
                       </div>
                     </div>
@@ -1154,7 +1154,7 @@ export default {
     }
     function areaSearch () {
       loading.value = true
-      let datas = optionData.value
+      let datas = originalDatas.value
       let newArr = datas.filter((item) => {
         return item.name.includes(areaValues.value)
       })
@@ -1232,6 +1232,7 @@ export default {
       }
     })
     watch(areaValues, (newdata) => {
+      console.log(newdata, '触发搜索内容')
       if (newdata.trim().length !== 0) {
         debounce(areaSearch, 500)
       } else {

TEAMModelBI/ClientApp/src/view/teachermanage/manage.vue

@@ -45,13 +45,12 @@
             <!-- <svg class="defaultAvatar" aria-hidden="true">
                             <use xlink:href="#icon-morentouxiang"></use>
                         </svg> -->
-            <PersonalPhoto style="cursor: pointer;" :name="item.name"></PersonalPhoto>
+            <PersonalPhoto style="cursor: pointer;" :name="scope.row.name"></PersonalPhoto>
           </div>
         </template>
       </el-table-column>
       <el-table-column prop="name" :label="$t(`personnelManagement.personnelTable.name`)" sortable align="center" />
       <!-- <el-table-column prop="isexist" label="状态" width="250" align="center" /> -->
-
       <el-table-column prop="mobile" :label="$t(`personnelManagement.personnelTable.phone`)" align="center" />
       <el-table-column prop="tmdId" :label="$t(`personnelManagement.personnelTable.tmdids`)" align="center">
       </el-table-column>
@@ -90,7 +89,7 @@
     </el-table>
   </div>
   <div class="personnel-drawer">
-    <el-drawer v-model="drawer" title="用户相关信息配置" :direction="direction" :modal="true" :before-close="closeDrawer()">
+    <el-drawer v-model="drawer" title="用户相关信息配置" :direction="direction" :modal="true" :before-close="closeDrawer()" size="40%">
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="权限/身份" name="first">
           <Operates ref="roaming" :userdata="nowUser" @changeShow="changeState"></Operates>