Merge branch 'VERSIONS-video/iot-quanXian' into SCHOOL-XiBeiNongLin

src/api/integratedManagement/index.js

@@ -378,7 +378,7 @@ export function laboratoryBoardExportBoardInfo(query) {
 //实验室-信息牌下载-获取信息牌配置信息
 export function laboratoryAppBoardMiddleInfo(query) {
   return request({
-    url: '/laboratory/app/board/middleInfo',
+    url: '/laboratory/app/board/middleInfoWeb',
     method: 'get',
     params: query
   })

src/views/integratedManagement/personnelManage/studentInfo/index.vue

@@ -112,7 +112,7 @@
                                       v-hasPermiRouter="['system:user:edit']">编辑</el-dropdown-item>
                     <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;" :command="{row:scope.row,command:2}"
                                       v-hasPermiRouter="['system:user:del']">删除</el-dropdown-item>
-                    <el-dropdown-item style="margin:0 10px;" :command="{row:scope.row,command:3}"
+                    <el-dropdown-item style="margin:0 10px;" :command="{row:scope.row,command:3}" v-if="scope.row.source == 1"
                                       v-hasPermiRouter="['system:user:reset']">重置密码</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>

src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -174,7 +174,7 @@
                                           v-hasPermiRouter="['system:user:edit']">编辑</el-dropdown-item>
                         <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;" :command="{row:scope.row,command:2}"
                                           v-hasPermiRouter="['system:user:del']">删除</el-dropdown-item>
-                        <el-dropdown-item style="margin:0 10px;" :command="{row:scope.row,command:3}"
+                        <el-dropdown-item style="margin:0 10px;" :command="{row:scope.row,command:3}" v-if="scope.row.source == 1"
                                           v-hasPermiRouter="['system:user:reset']">重置密码</el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>