Merge remote-tracking branch 'origin/gzb' into wzl

src/api/school.js

@@ -35,3 +35,75 @@ export const school_delete = (data) => setRequest("school/delete", data);
  * 3.1.5学校--详情
  */
 export const school_detail = (data) => setRequest("school/detail", data);
+/**
+ * 3.2.0.1用户--账号登录
+ */
+export const ulogin_login = (data) => setRequest("ulogin/login", data);
+/**
+ * 3.2.0.1用户--验证码登录
+ */
+export const ulogin_login_code = (data) => setRequest("ulogin/login_code", data);
+/**
+ * 3.2.0.2用户--校验登录状态
+ */
+export const ulogin_check_login = (data) => setRequest("ulogin/check_login", data);
+/**
+ * 3.2.0.3用户--退出登录
+ */
+export const ulogin_login_out = (data) => setRequest("ulogin/login_out", data);
+/**
+ * 3.2.1用户--管理列表
+ */
+export const user_list = (data) => setRequest("user/list", data);
+/**
+ * 3.2.1用户--导出列表
+ */
+export const user_export = (data) => setRequest("user/export", data);
+/**
+ * 3.2.2用户--学校下班级列表
+ */
+export const class_list = (data) => setRequest("class/list", data);
+/**
+ * 3.2.2用户--班级新增
+ */
+export const class_add = (data) => setRequest("class/add", data);
+/**
+ * 3.2.2用户--添加
+ */
+export const user_add = (data) => setRequest("user/add", data);
+/**
+ * 3.2.3用户--更新
+ */
+export const user_edit = (data) => setRequest("user/edit", data);
+/**
+ * 3.2.3.2用户--启用
+ */
+export const user_enable= (data) => setRequest("user/enable", data);
+/**
+ * 3.2.3.2用户--启用
+ */
+export const user_disabled= (data) => setRequest("user/disabled", data);
+/**
+ * 3.2.3.4用户--关注
+ */
+export const user_care= (data) => setRequest("user/care", data);
+/**
+ * 3.2.3.5用户--取消关注
+ */
+export const user_un_care= (data) => setRequest("user/un_care", data);
+/**
+ * 3.2.3.6用户--管控
+ */
+export const user_control= (data) => setRequest("user/control", data);
+/**
+ * 3.2.3.7用户--取消管控
+ */
+export const user_un_control= (data) => setRequest("user/un_control", data);
+/**
+ * 3.2.4用户--删除
+ */
+export const user_delete = (data) => setRequest("user/delete", data);
+/**
+ * 3.2.5用户--导入
+ */
+export const user_import = (data) => setRequest("user/import", data);

src/views/regionSection/applicationManage/applicationManage.vue

@@ -114,7 +114,7 @@
       v-model="downloadInfo.show"
       title="下载"
     >
-      <div class="content">
+      <div class="content" v-if="downloadInfo.show">
         <div class="title">{{ downloadInfo.appName }}</div>
         <div class="qrcode">
           <div id="ScanShare" ref="ScanShare"></div>
@@ -136,328 +136,330 @@
       v-model="wallpaperInfo.show"
       :title="wallpaperInfo.appid ? '编辑' : '新建'"
     >
-      <Form
-        ref="addForm"
-        :model="wallpaperInfo"
-        :rules="rules"
-        :label-width="130"
-        inline
-      >
-        <FormItem label="名称" prop="appName" style="width: 100%">
-          <Input
-            v-model="wallpaperInfo.appName"
-            placeholder="请输入名称"
-          ></Input>
-        </FormItem>
-        <FormItem label="分组" style="width: 100%" class="require">
-          <Select
-            v-model="wallpaperInfo.appgroupid"
-            placeholder="请选择分组"
-            style="width: 300px"
-            @on-change="groupChange()"
-          >
-            <template v-if="group_list.length > 0">
-              <Option
-                v-for="item in group_list"
-                :value="item.appgroupid"
-                :key="item.appgroupid"
-                >{{ item.appgroupName }}</Option
-              >
-            </template>
-          </Select>
-        </FormItem>
-        <FormItem label="状态" style="width: 300px">
-          <RadioGroup v-model="wallpaperInfo.enable">
-            <Radio :label="1">启用</Radio>
-            <Radio :label="2">禁用</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="应用属性">
-          <RadioGroup v-model="wallpaperInfo.appType">
-            <Radio :label="1">推荐应用</Radio>
-            <Radio :label="2">必装应用</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="强制安装" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.forced">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
-            </RadioGroup>
-            <span>用户进入安全桌面，该应用将被强制安装。</span>
-          </div>
-        </FormItem>
-        <FormItem label="网址白名单例外" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.whited">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
-            </RadioGroup>
-            <span>选择白名单例外则该应用访问网络不受网址白名单限制。</span>
-          </div>
-        </FormItem>
-        <FormItem label="可信任" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.trusted">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
-            </RadioGroup>
-            <span
-              >选择可信任时，应用申请权限不需要用户确认，防止用户取消。</span
+      <div v-if="wallpaperInfo.show">
+        <Form
+          ref="addForm"
+          :model="wallpaperInfo"
+          :rules="rules"
+          :label-width="130"
+          inline
+        >
+          <FormItem label="名称" prop="appName" style="width: 100%">
+            <Input
+              v-model="wallpaperInfo.appName"
+              placeholder="请输入名称"
+            ></Input>
+          </FormItem>
+          <FormItem label="分组" style="width: 100%" class="require">
+            <Select
+              v-model="wallpaperInfo.appgroupid"
+              placeholder="请选择分组"
+              style="width: 300px"
+              @on-change="groupChange()"
             >
-          </div>
-        </FormItem>
-        <FormItem label="隐藏图标" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.showico">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
+              <template v-if="group_list.length > 0">
+                <Option
+                  v-for="item in group_list"
+                  :value="item.appgroupid"
+                  :key="item.appgroupid"
+                  >{{ item.appgroupName }}</Option
+                >
+              </template>
+            </Select>
+          </FormItem>
+          <FormItem label="状态" style="width: 300px">
+            <RadioGroup v-model="wallpaperInfo.enable">
+              <Radio :label="1">启用</Radio>
+              <Radio :label="2">禁用</Radio>
             </RadioGroup>
-            <span>隐藏图标时，设备安装应用后，桌面不显示应用图标。</span>
-          </div>
-        </FormItem>
-        <FormItem label="允许清空缓存" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.cached">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
+          </FormItem>
+          <FormItem label="应用属性">
+            <RadioGroup v-model="wallpaperInfo.appType">
+              <Radio :label="1">推荐应用</Radio>
+              <Radio :label="2">必装应用</Radio>
             </RadioGroup>
-            <span>选择是时，设备上允许清除该应用对应的缓存。</span>
-          </div>
-        </FormItem>
-        <FormItem label="添加到已有策略" style="width: 100%">
-          <div class="comm">
-            <RadioGroup v-model="wallpaperInfo.strategy">
-              <Radio :label="1">是</Radio>
-              <Radio :label="0">否</Radio>
-            </RadioGroup>
-            <span
-              >选择添加到已有策略，则当前应用会被添加到其授权的且不存在相同包名应用的学校策略。</span
-            >
-          </div>
-        </FormItem>
-        <FormItem label="适配设备" style="width: 100%" class="require">
-          <div v-for="item in device_list" :key="item.dgroupid">
-            <CheckboxDevice
-              @CheckboxDevice="CheckboxDevice"
-              :dgroupid="item.dgroupid"
-              ref="checkbevice"
-              :module="item"
-            ></CheckboxDevice>
-          </div>
-        </FormItem>
-        <FormItem label="应用上传" class="require" style="width: 400px">
-          <div class="upload_box">
-            <uploader
-              ref="uploader"
-              :options="options"
-              :autoStart="true"
-              :file-status-text="statusText"
-              @file-added="onFileAdded"
-              @file-progress="onFileProgress"
-              @file-success="onFileSuccess"
-              @file-error="onFileError"
-            >
-              <uploader-unsupport></uploader-unsupport>
-              <uploader-btn
-                id="global_uploader_btn"
-                :attrs="attrs"
-                ref="uploadBtn"
+          </FormItem>
+          <FormItem label="强制安装" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.forced">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span>用户进入安全桌面，该应用将被强制安装。</span>
+            </div>
+          </FormItem>
+          <FormItem label="网址白名单例外" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.whited">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span>选择白名单例外则该应用访问网络不受网址白名单限制。</span>
+            </div>
+          </FormItem>
+          <FormItem label="可信任" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.trusted">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span
+                >选择可信任时，应用申请权限不需要用户确认，防止用户取消。</span
               >
-                <div class="primary_btn">上传应用</div>
-              </uploader-btn>
-            </uploader>
-          </div>
-          <div class="upProgress" v-if="file_list.length > 0">
-            <div v-for="file in file_list" key="file1">
-              <div class="file_name" :title="wallpaperInfo.appPackage">
-                <div class="show_name">
-                  {{ wallpaperInfo.appPackage }}
+            </div>
+          </FormItem>
+          <FormItem label="隐藏图标" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.showico">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span>隐藏图标时，设备安装应用后，桌面不显示应用图标。</span>
+            </div>
+          </FormItem>
+          <FormItem label="允许清空缓存" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.cached">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span>选择是时，设备上允许清除该应用对应的缓存。</span>
+            </div>
+          </FormItem>
+          <FormItem label="添加到已有策略" style="width: 100%">
+            <div class="comm">
+              <RadioGroup v-model="wallpaperInfo.strategy">
+                <Radio :label="1">是</Radio>
+                <Radio :label="0">否</Radio>
+              </RadioGroup>
+              <span
+                >选择添加到已有策略，则当前应用会被添加到其授权的且不存在相同包名应用的学校策略。</span
+              >
+            </div>
+          </FormItem>
+          <FormItem label="适配设备" style="width: 100%" class="require">
+            <div v-for="item in device_list" :key="item.dgroupid">
+              <CheckboxDevice
+                @CheckboxDevice="CheckboxDevice"
+                :dgroupid="item.dgroupid"
+                ref="checkbevice"
+                :module="item"
+              ></CheckboxDevice>
+            </div>
+          </FormItem>
+          <FormItem label="应用上传" class="require" style="width: 400px">
+            <div class="upload_box">
+              <uploader
+                ref="uploader"
+                :options="options"
+                :autoStart="true"
+                :file-status-text="statusText"
+                @file-added="onFileAdded"
+                @file-progress="onFileProgress"
+                @file-success="onFileSuccess"
+                @file-error="onFileError"
+              >
+                <uploader-unsupport></uploader-unsupport>
+                <uploader-btn
+                  id="global_uploader_btn"
+                  :attrs="attrs"
+                  ref="uploadBtn"
+                >
+                  <div class="primary_btn">上传应用</div>
+                </uploader-btn>
+              </uploader>
+            </div>
+            <div class="upProgress" v-if="file_list.length > 0">
+              <div v-for="file in file_list" key="file1">
+                <div class="file_name" :title="wallpaperInfo.appPackage">
+                  <div class="show_name">
+                    {{ wallpaperInfo.appPackage }}
+                  </div>
                 </div>
+                <Progress
+                  hide-info
+                  :stroke-width="8"
+                  :percent="getUploadProgress(file)"
+                  status="active"
+                />
               </div>
-              <Progress
-                hide-info
-                :stroke-width="8"
-                :percent="getUploadProgress(file)"
-                status="active"
-              />
             </div>
-          </div>
-        </FormItem>
-        <FormItem label="应用图标" class="require">
-          <div class="logo">
-            <Upload
-              action
-              :show-upload-list="false"
-              :before-upload="
-                (file) => {
-                  upLoadUserpic(file, 1);
-                  return false;
-                }
-              "
-              accept=".png,.jpeg,.jpg"
-            >
-              <Button type="primary" class="primary_btn">上传图标</Button>
-            </Upload>
-            <span>支持图片格式：jpg、jgeg、png</span>
-          </div>
-          <div class="app_img" style="border-radius: 20px">
-            <img
-              v-if="wallpaperInfo.appIcon"
-              :src="$api.showImageUrl + wallpaperInfo.appIcon"
-            />
-          </div>
-        </FormItem>
-        <FormItem label="应用截图" style="width: 100%">
-          <div class="logo">
-            <Upload
-              action
-              :show-upload-list="false"
-              :before-upload="
-                (file) => {
-                  upLoadUserpic(file, 2);
-                  return false;
-                }
-              "
-              accept=".png,.jpeg,.jpg"
-            >
-              <Button type="primary" class="primary_btn">上传截图</Button>
-            </Upload>
-            <span>支持图片格式：jpg、jgeg、png</span>
-          </div>
-          <div class="img_list">
-            <div
-              class="app_img"
-              v-for="(img, idx) in wallpaperInfo.appImg"
-              :key="idx"
-            >
-              <img :src="$api.showImageUrl + img" />
+          </FormItem>
+          <FormItem label="应用图标" class="require">
+            <div class="logo">
+              <Upload
+                action
+                :show-upload-list="false"
+                :before-upload="
+                  (file) => {
+                    upLoadUserpic(file, 1);
+                    return false;
+                  }
+                "
+                accept=".png,.jpeg,.jpg"
+              >
+                <Button type="primary" class="primary_btn">上传图标</Button>
+              </Upload>
+              <span>支持图片格式：jpg、jgeg、png</span>
+            </div>
+            <div class="app_img" style="border-radius: 20px">
               <img
-                @click="delAppImg(idx)"
-                class="del"
-                src="../../../assets/img/guanbi_red.png"
+                v-if="wallpaperInfo.appIcon"
+                :src="$api.showImageUrl + wallpaperInfo.appIcon"
               />
             </div>
-          </div>
-        </FormItem>
-        <FormItem
-          label="版本名称"
-          prop="versionName"
-          style="width: calc(50% - 10px)"
-        >
-          <Input
-            v-model="wallpaperInfo.versionName"
-            placeholder="请输入版本名称"
-          ></Input>
-        </FormItem>
-        <FormItem
-          label="版本号码"
-          class="require"
-          style="width: calc(50% - 10px)"
-        >
-          <Input
-            v-model="wallpaperInfo.versionNum"
-            placeholder="请输入版本号码"
-          ></Input>
-        </FormItem>
-        <FormItem
-          label="应用大小"
-          class="require"
-          style="width: calc(50% - 10px)"
-        >
-          <Input
-            v-model="wallpaperInfo.appSize"
-            placeholder="请输入应用大小"
-          ></Input>
-        </FormItem>
-        <FormItem label="开发者" style="width: calc(50% - 10px)">
-          <Input
-            v-model="wallpaperInfo.appDeveloper"
-            placeholder="请输入开发者"
-          ></Input>
-        </FormItem>
-        <FormItem label="应用包名" style="width: 100%">
-          <Input
-            v-model="wallpaperInfo.appPackage"
-            placeholder="请输入应用包名"
-          ></Input>
-        </FormItem>
-        <FormItem label="应用简介" style="width: 100%">
-          <Input
-            v-model="wallpaperInfo.appAbbr"
-            type="textarea"
-            :maxlength="255"
-            :rows="4"
-            placeholder="请输入应用简介"
-          ></Input>
-          <div class="appcomm">
-            应用简介不能超过255个字符<span class="red">{{
-              wallpaperInfo.appAbbr.length
-            }}</span
-            >/255
-          </div>
-        </FormItem>
-        <FormItem label="更新" style="width: 100%">
-          <Input
-            v-model="wallpaperInfo.appRenew"
-            type="textarea"
-            :rows="4"
-            :maxlength="1000"
-            placeholder="请输入更新描述"
-          ></Input>
-          <div class="appcomm">
-            更新描述不能超过1000个字符<span class="red">{{
-              wallpaperInfo.appRenew.length
-            }}</span
-            >/1000
-          </div>
-        </FormItem>
-        <FormItem label="选择学校" style="width: 100%" class="require">
-          <RadioGroup v-model="wallpaperInfo.targetSchool">
-            <Radio :label="1">所有学校</Radio>
-            <Radio :label="2">自定义学校</Radio>
-          </RadioGroup>
-          <div class="targetSchool" v-if="wallpaperInfo.targetSchool === 2">
-            <div class="allSchool">
-              <Input
-                v-model="wallpaperInfo.schoolname"
-                placeholder="请输入关键字"
-                search
-                @on-search="getSchool"
-              ></Input>
-              <div class="school_list">
-                <Tree
-                  @on-check-change="getSelectedNodes"
-                  :data="school_list"
-                  show-checkbox
-                ></Tree>
+          </FormItem>
+          <FormItem label="应用截图" style="width: 100%">
+            <div class="logo">
+              <Upload
+                action
+                :show-upload-list="false"
+                :before-upload="
+                  (file) => {
+                    upLoadUserpic(file, 2);
+                    return false;
+                  }
+                "
+                accept=".png,.jpeg,.jpg"
+              >
+                <Button type="primary" class="primary_btn">上传截图</Button>
+              </Upload>
+              <span>支持图片格式：jpg、jgeg、png</span>
+            </div>
+            <div class="img_list">
+              <div
+                class="app_img"
+                v-for="(img, idx) in wallpaperInfo.appImg"
+                :key="idx"
+              >
+                <img :src="$api.showImageUrl + img" />
+                <img
+                  @click="delAppImg(idx)"
+                  class="del"
+                  src="../../../assets/img/guanbi_red.png"
+                />
               </div>
             </div>
-            <div class="selectSchool">
-              <div class="school_num">
-                已选<span class="num">{{ select_schools.length }}</span
-                >所学校
+          </FormItem>
+          <FormItem
+            label="版本名称"
+            prop="versionName"
+            style="width: calc(50% - 10px)"
+          >
+            <Input
+              v-model="wallpaperInfo.versionName"
+              placeholder="请输入版本名称"
+            ></Input>
+          </FormItem>
+          <FormItem
+            label="版本号码"
+            class="require"
+            style="width: calc(50% - 10px)"
+          >
+            <Input
+              v-model="wallpaperInfo.versionNum"
+              placeholder="请输入版本号码"
+            ></Input>
+          </FormItem>
+          <FormItem
+            label="应用大小"
+            class="require"
+            style="width: calc(50% - 10px)"
+          >
+            <Input
+              v-model="wallpaperInfo.appSize"
+              placeholder="请输入应用大小"
+            ></Input>
+          </FormItem>
+          <FormItem label="开发者" style="width: calc(50% - 10px)">
+            <Input
+              v-model="wallpaperInfo.appDeveloper"
+              placeholder="请输入开发者"
+            ></Input>
+          </FormItem>
+          <FormItem label="应用包名" style="width: 100%">
+            <Input
+              v-model="wallpaperInfo.appPackage"
+              placeholder="请输入应用包名"
+            ></Input>
+          </FormItem>
+          <FormItem label="应用简介" style="width: 100%">
+            <Input
+              v-model="wallpaperInfo.appAbbr"
+              type="textarea"
+              :maxlength="255"
+              :rows="4"
+              placeholder="请输入应用简介"
+            ></Input>
+            <div class="appcomm">
+              应用简介不能超过255个字符<span class="red">{{
+                wallpaperInfo.appAbbr.length
+              }}</span
+              >/255
+            </div>
+          </FormItem>
+          <FormItem label="更新" style="width: 100%">
+            <Input
+              v-model="wallpaperInfo.appRenew"
+              type="textarea"
+              :rows="4"
+              :maxlength="1000"
+              placeholder="请输入更新描述"
+            ></Input>
+            <div class="appcomm">
+              更新描述不能超过1000个字符<span class="red">{{
+                wallpaperInfo.appRenew.length
+              }}</span
+              >/1000
+            </div>
+          </FormItem>
+          <FormItem label="选择学校" style="width: 100%" class="require">
+            <RadioGroup v-model="wallpaperInfo.targetSchool">
+              <Radio :label="1">所有学校</Radio>
+              <Radio :label="2">自定义学校</Radio>
+            </RadioGroup>
+            <div class="targetSchool" v-if="wallpaperInfo.targetSchool === 2">
+              <div class="allSchool">
+                <Input
+                  v-model="wallpaperInfo.schoolname"
+                  placeholder="请输入关键字"
+                  search
+                  @on-search="getSchool"
+                ></Input>
+                <div class="school_list">
+                  <Tree
+                    @on-check-change="getSelectedNodes"
+                    :data="school_list"
+                    show-checkbox
+                  ></Tree>
+                </div>
               </div>
-              <div class="school_list">
-                <span
-                  class="school_item"
-                  v-for="(item, index) in this.select_schools"
-                  :key="item.schoolid"
-                >
-                  <span class="title" :title="item.title">{{
-                    item.title
-                  }}</span>
-                  <img
-                    @click="delSchool(item)"
-                    class="del"
-                    src="../../../assets/img/guanbi_red.png"
-                  />
-                </span>
+              <div class="selectSchool">
+                <div class="school_num">
+                  已选<span class="num">{{ select_schools.length }}</span
+                  >所学校
+                </div>
+                <div class="school_list">
+                  <span
+                    class="school_item"
+                    v-for="(item, index) in this.select_schools"
+                    :key="item.schoolid"
+                  >
+                    <span class="title" :title="item.title">{{
+                      item.title
+                    }}</span>
+                    <img
+                      @click="delSchool(item)"
+                      class="del"
+                      src="../../../assets/img/guanbi_red.png"
+                    />
+                  </span>
+                </div>
               </div>
             </div>
-          </div>
-        </FormItem>
-      </Form>
+          </FormItem>
+        </Form>
+      </div>
       <div slot="footer">
         <Button @click="wallpaperInfo.show = false">取消</Button>
         <Button @click="saveAddInfo()" class="primary_btn" type="primary"
@@ -472,7 +474,7 @@
       v-model="deviceInfo.show"
       title="授权型号"
     >
-      <div class="view_content">
+      <div class="view_content" v-if="deviceInfo.show">
         <div class="view_title">名称</div>
         <div class="view_devices" style="width: 100%">
           <Input style="width: 100%" disabled v-model="deviceInfo.appName" />
@@ -506,7 +508,7 @@
       v-model="viewInfo.show"
       title="查看"
     >
-      <div class="view_conten">
+      <div class="view_conten" v-if="viewInfo.show">
         <div class="view_logo">
           <div>
             <img
@@ -1230,6 +1232,9 @@ export default {
         if (res.code === 0) {
           this.searchForm.list = res.obj.data;
           this.searchForm.total = res.obj.total;
+          if (document.querySelector(".section_main")) {
+            document.querySelector(".section_main").scrollTop = 0;
+          }
           console.log(this.searchForm.list);
         } else {
           this.$Message.error(res.msg);
@@ -1830,6 +1835,7 @@ export default {
     text-align: center;
     .title {
       font-size: 18px;
+      font-weight: bold;
       margin-bottom: 30px;
     }
     .qrcode {
@@ -1846,7 +1852,7 @@ export default {
       }
     }
     .download {
-      margin-top: 10px;
+      margin-top: 40px;
       &:hover {
         cursor: pointer;
         color: #339cff;

src/views/schoolSection/userManage/userManage.vue

@@ -1,14 +1,385 @@
 <template>
-  <div class="main_root"></div>
+  <div class="main_root">
+    <div class="schoolInfo">
+      <div class="schoolname">{{ schoolInfo.name }}</div>
+      <div class="class_list">
+        <div v-for="item in schoolInfo.children" :key="item.id">
+          <div
+            :class="[curClass === item.id ? 'active' : '']"
+            :title="item.name"
+            @click="selectClass(item)"
+          >
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="user_list">
+      <div class="search_header">
+        <div class="search_left">
+          <Select
+            :transfer="true"
+            v-model="searchForm.care"
+            style="width: 140px"
+          >
+            <Option v-for="item in care_list" :value="item.id" :key="item.id">{{
+              item.title
+            }}</Option>
+          </Select>
+          <Select
+            :transfer="true"
+            v-model="searchForm.enabled"
+            style="width: 140px; margin: 0 10px"
+          >
+            <Option
+              v-for="item in enabled_list"
+              :value="item.id"
+              :key="item.id"
+              >{{ item.title }}</Option
+            >
+          </Select>
+          <Select
+            :transfer="true"
+            v-model="searchForm.control"
+            style="width: 140px; margin-right: 10px"
+          >
+            <Option
+              v-for="item in control_list"
+              :value="item.id"
+              :key="item.id"
+              >{{ item.title }}</Option
+            >
+          </Select>
+          <Input
+            v-model="searchForm.appName"
+            placeholder="请输入名称"
+            search
+            @on-search="searchList()"
+            style="width: 150px"
+          />
+        </div>
+        <div>
+          <Button type="primary" class="primary_btn" @click="toAdd()"
+            >用户导入</Button
+          >
+          <Button
+            style="margin: 0 10px"
+            type="primary"
+            class="primary_btn"
+            @click="toAdd()"
+            >用户导出</Button
+          >
+          <Button type="primary" class="primary_btn" @click="toAdd()"
+            >新建</Button
+          >
+        </div>
+      </div>
+      <div class="table_wrap">
+        <Table :columns="columns" :data="searchForm.list">
+          <template slot-scope="{ row }" slot="enabled">
+            <i-switch
+              size="large"
+              v-model="row.enabled"
+              :true-value="1"
+              :false-value="2"
+              @on-change="enabledChange(row)"
+            >
+              <span slot="open">启用</span>
+              <span slot="close">禁用</span>
+            </i-switch>
+          </template>
+          <template slot-scope="{ row }" slot="actionSlot">
+            <div class="action_list">
+              <div class="action_del" @click="toDel(row)">删除</div>
+              <div class="action_success" @click="toCare(row)">重点关注</div>
+            </div>
+          </template>
+        </Table>
+      </div>
+      <div class="page_wrap">
+        <Page
+          :transfer="true"
+          :total="searchForm.total"
+          :current="searchForm.page"
+          :page-size="searchForm.size"
+          :page-size-opts="[10, 20, 40, 60]"
+          @on-change="pageChange"
+          @on-page-size-change="pageSizeChange"
+          show-total
+          show-sizer
+        ></Page>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
+import { app_edit_enable, app_edit_unenable, app_list } from "@/api/appgroup";
+import {
+  class_list,
+  user_disabled,
+  user_enable,
+  user_list
+} from "@/api/school";
+
 export default {
   data() {
-    return {};
+    return {
+      userInfo: {},
+      showLoading: false,
+      care_list: [
+        { id: 0, title: "请选择关注状态" },
+        { id: 1, title: "重点关注" },
+        { id: 2, title: "不关注" }
+      ],
+      enabled_list: [
+        { id: 0, title: "请选择启动状态" },
+        { id: 1, title: "启用" },
+        { id: 2, title: "禁用" }
+      ],
+      control_list: [
+        { id: 0, title: "请选择管控状态" },
+        { id: 1, title: "管控中" },
+        { id: 2, title: "解除管控" }
+      ],
+      curClass: 0,
+      searchForm: {
+        page: 1,
+        size: 10,
+        schoolid: 1,
+        classid: 0,
+        care: 0,
+        enabled: 0,
+        control: 0,
+        username: "",
+        list: [],
+        tital: 0
+      },
+      columns: [
+        {
+          title: "序号",
+          align: "center",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.searchForm.page - 1) * this.searchForm.size +
+                1
+            );
+          }
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          align: "center"
+        },
+        {
+          title: "姓名",
+          key: "username",
+          align: "center",
+          width: 140
+        },
+        {
+          title: "班级",
+          key: "classname",
+          align: "center",
+          width: 140
+        },
+        {
+          title: "状态",
+          slot: "enabled",
+          width: 100,
+          align: "center"
+        },
+        {
+          title: "最后登录时间",
+          key: "lasttime",
+          align: "center",
+          width: 180
+        },
+        {
+          title: "操作",
+          slot: "actionSlot",
+          width: 240,
+          align: "center"
+        }
+      ],
+      schoolInfo: {
+        children: [],
+        name: ""
+      }
+    };
+  },
+  created() {
+    this.userInfo = JSON.parse(
+      localStorage.getItem("xh_control_userInfo")
+    ).content;
+    console.log(this.userInfo);
+    this.init();
+    this.searchList();
   },
-  methods: {}
+  methods: {
+    toAdd(row) {},
+    toCare(row) {},
+    toDel(row) {},
+    enabledChange(row) {
+      let api = row.enabled === 1 ? user_enable : user_disabled;
+      api({
+        userid: row.userid,
+        rversion: row.rversion
+      }).then((data) => {
+        this.searchList();
+        if (data.code === 0) {
+          this.$Message.success(data.msg);
+        } else {
+          this.$Message.error(data.msg);
+        }
+      });
+    },
+    selectClass(item) {
+      this.curClass = item.id;
+    },
+    init() {
+      this.showLoading = true;
+      class_list({ schoolid: 1 }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.schoolInfo = res.obj;
+          if (this.schoolInfo.children.length > 0) {
+            this.curClass = this.schoolInfo.children[0].id;
+          }
+          console.log(res.obj);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    // 搜索
+    searchList() {
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 页码改变
+    pageChange(page) {
+      this.searchForm.page = page;
+      this.getList();
+    },
+    // 每页显示数量改变
+    pageSizeChange(size) {
+      this.searchForm.size = size;
+      this.searchForm.page = 1;
+      this.getList();
+    },
+    // 获取列表
+    getList() {
+      this.showLoading = true;
+      user_list({
+        page: this.searchForm.page,
+        size: this.searchForm.size,
+        schoolid: this.searchForm.schoolid,
+        classid: this.curClass,
+        care: this.searchForm.care,
+        enabled: this.searchForm.enabled,
+        control: this.searchForm.control,
+        username: this.searchForm.username
+      }).then((res) => {
+        this.showLoading = false;
+        if (res.code === 0) {
+          this.searchForm.list = res.obj.data;
+          this.searchForm.total = res.obj.total;
+          console.log(this.searchForm.list);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    }
+  }
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main_root {
+  width: calc(100% - 32px);
+  height: calc(100% - 60px);
+  background-color: transparent;
+  border: none;
+  display: flex;
+  .schoolInfo {
+    width: 200px;
+    border-radius: 15px;
+    margin-right: 16px;
+    height: 100%;
+    padding: 10px;
+    background-color: white;
+    .schoolname {
+      font-size: 16px;
+      line-height: 40px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .class_list {
+      div {
+        line-height: 30px;
+        height: 30px;
+        text-align: center;
+        cursor: p;
+      }
+      .active {
+        border-radius: 6px;
+        background: #dbeeff;
+      }
+    }
+  }
+  .user_list {
+    width: calc(100% - 216px);
+    height: 100%;
+    border-radius: 15px;
+    background-color: white;
+  }
+}
+.search_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin: 16px 16px;
+  .search_left {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .search_drop {
+      margin-right: 10px;
+      width: 150px;
+    }
+  }
+}
+.table_wrap {
+  .appName {
+    display: flex;
+    margin: 16px 0;
+    .app_logo {
+      flex-wrap: none;
+      width: 56px;
+      height: 56px;
+      border-radius: 20px;
+      border: 1px solid #e5e5e5;
+      background: #ffffff;
+      padding: 10px;
+      img {
+        width: 38px;
+        height: 38px;
+        object-fit: cover;
+      }
+    }
+    .app_comm {
+      flex: none;
+      width: 120px;
+      margin-left: 10px;
+      text-align: left;
+      div {
+        color: #339dff;
+      }
+    }
+  }
+}
+</style>