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

public/iconfont/demo_index.html

       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe703;</span>
+                <div class="name">关注-已关注</div>
+                <div class="code-name">&amp;#xe703;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6a2;</span>
                 <div class="name">钉-面型</div>
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1711933298260') format('woff2'),
-       url('iconfont.woff?t=1711933298260') format('woff'),
-       url('iconfont.ttf?t=1711933298260') format('truetype');
+  src: url('iconfont.woff2?t=1712026774551') format('woff2'),
+       url('iconfont.woff?t=1712026774551') format('woff'),
+       url('iconfont.ttf?t=1712026774551') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-guanzhu-yiguanzhu"></span>
+            <div class="name">
+              关注-已关注
+            </div>
+            <div class="code-name">.icon-guanzhu-yiguanzhu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-ding-mianxing"></span>
             <div class="name">
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanzhu-yiguanzhu"></use>
+                </svg>
+                <div class="name">关注-已关注</div>
+                <div class="code-name">#icon-guanzhu-yiguanzhu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-ding-mianxing"></use>

public/iconfont/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 4468064 */
-  src: url('iconfont.woff2?t=1711933298260') format('woff2'),
-       url('iconfont.woff?t=1711933298260') format('woff'),
-       url('iconfont.ttf?t=1711933298260') format('truetype');
+  src: url('iconfont.woff2?t=1712026774551') format('woff2'),
+       url('iconfont.woff?t=1712026774551') format('woff'),
+       url('iconfont.ttf?t=1712026774551') format('truetype');
 }
 
 .iconfont {
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanzhu-yiguanzhu:before {
+  content: "\e703";
+}
+
 .icon-ding-mianxing:before {
   content: "\e6a2";
 }

public/iconfont/iconfont.json

   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "9974412",
+      "name": "关注-已关注",
+      "font_class": "guanzhu-yiguanzhu",
+      "unicode": "e703",
+      "unicode_decimal": 59139
+    },
     {
       "icon_id": "24267510",
       "name": "钉-面型",

src/api/school.js

 /**
  * 3.2.0.1用户--验证码登录
  */
-export const ulogin_login_code = (data) => setRequest("ulogin/login_code", data);
+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);
+export const ulogin_check_login = (data) =>
+  setRequest("ulogin/check_login", data);
 /**
  * 3.2.0.3用户--退出登录
  */
 /**
  * 3.2.3.2用户--启用
  */
-export const user_enable= (data) => setRequest("user/enable", data);
+export const user_enable = (data) => setRequest("user/enable", data);
 /**
  * 3.2.3.2用户--启用
  */
-export const user_disabled= (data) => setRequest("user/disabled", data);
+export const user_disabled = (data) => setRequest("user/disabled", data);
 /**
  * 3.2.3.4用户--关注
  */
-export const user_care= (data) => setRequest("user/care", data);
+export const user_care = (data) => setRequest("user/care", data);
 /**
  * 3.2.3.5用户--取消关注
  */
-export const user_un_care= (data) => setRequest("user/un_care", data);
+export const user_un_care = (data) => setRequest("user/un_care", data);
 /**
  * 3.2.3.6用户--管控
  */
-export const user_control= (data) => setRequest("user/control", data);
+export const user_control = (data) => setRequest("user/control", data);
 /**
  * 3.2.3.7用户--取消管控
  */
-export const user_un_control= (data) => setRequest("user/un_control", data);
+export const user_un_control = (data) => setRequest("user/un_control", data);
 /**
  * 3.2.4用户--删除
  */
 /**
  * 3.2.5用户--导入
  */
-export const user_import = (data) => setRequest("user/import", data);
+export const user_import = (data) => setRequest("user/import", data);

src/views/schoolSection/userManage/userManage.vue

       <div class="class_list">
         <div v-for="item in schoolInfo.children" :key="item.id">
           <div
-            :class="[curClass === item.id ? 'active' : '']"
+            :class="[curClass.id === item.id ? 'active' : '']"
             :title="item.name"
             @click="selectClass(item)"
           >
           />
         </div>
         <div>
-          <Button type="primary" class="primary_btn" @click="userExport()"
+          <Button type="primary" class="primary_btn" @click="userImport()"
             >用户导入</Button
           >
           <Button
             style="margin: 0 10px"
             type="primary"
             class="primary_btn"
-            @click="toAdd()"
+            @click="userExport()"
             >用户导出</Button
           >
           <Button type="primary" class="primary_btn" @click="toAdd()"
       </div>
       <div class="table_wrap">
         <Table :columns="columns" :data="searchForm.list">
+          <template slot-scope="{ row }" slot="loginname">
+            <span
+              v-if="row.care === 1"
+              style="color: #fcc138"
+              class="ivu-icon iconfont icon-guanzhu-yiguanzhu"
+            ></span>
+            {{ row.loginname }}
+          </template>
           <template slot-scope="{ row }" slot="enabled">
             <i-switch
               size="large"
           <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 class="action_success" @click="toCare(row)">
+                <span v-if="row.care === 2">重点关注</span>
+                <span v-else>取消关注</span>
+              </div>
             </div>
           </template>
         </Table>
         ></Page>
       </div>
     </div>
+    <!-- 已存在列表 -->
+    <Modal
+      v-model="exitInfo.show"
+      :mask-closable="false"
+      class="exit_modal modal1"
+      title="提示"
+    >
+      <div class="exit">
+        <div>
+          <div v-if="exitInfo.studentsExisted.length > 0">
+            以下学生信息已存在
+            <Table border :columns="columns2" :data="exitInfo.studentsExisted">
+              <template slot-scope="{ row }" slot="usersex">
+                <span>
+                  {{
+                    row.usersex == 1 ? "男" : row.usersex == 2 ? "女" : "未知"
+                  }}
+                </span>
+              </template>
+            </Table>
+          </div>
+          <div v-if="exitInfo.usersExisted.length > 0">
+            已存在非本校账号列表
+            <Table border :columns="columns2" :data="exitInfo.usersExisted">
+              <template slot-scope="{ row }" slot="usersex">
+                <span>
+                  {{
+                    row.usersex == 1 ? "男" : row.usersex == 2 ? "女" : "未知"
+                  }}
+                </span>
+              </template>
+            </Table>
+          </div>
+        </div>
+      </div>
+    </Modal>
+    <!-- 导入 -->
+    <Modal
+      :mask-closable="false"
+      v-model="importInfo.show"
+      class="modal_tip"
+      title="导入"
+    >
+      <Upload
+        v-if="importInfo.show"
+        type="drag"
+        action
+        accept=".xls,.xlsx"
+        :before-upload="handleUpload"
+      >
+        <div style="padding: 30px 0; background: #f8f8f9">
+          <Button type="primary" class="primary_btn" style="font-size: 16px">
+            <Icon type="ios-cloud-upload-outline" size="18"></Icon>上传excel
+          </Button>
+          <div style="margin-top: 10px; color: #999">支持上传xlsx/xls文件</div>
+        </div>
+      </Upload>
+      <div v-if="importInfo.file" class="files_list">
+        {{ importInfo.file.name }}
+      </div>
+      <div class="import_tip">
+        导入数据需按照模板填写信息，
+        <span class="theme_color" @click="download()">下载表格模板</span>
+      </div>
+      <div slot="footer">
+        <Button @click="importInfo.show = false">取消</Button>
+        <Button
+          @click="ok_import"
+          class="primary_btn"
+          :loading="wait_flag"
+          type="primary"
+          >保存</Button
+        >
+      </div>
+    </Modal>
     <!-- 新建 -->
     <Modal
       class="modal1"
           <Input v-model="addInfo.username" placeholder="请输入姓名"></Input>
         </FormItem>
         <FormItem label="性别" style="width: calc(50% - 10px)">
-          <RadioGroup v-model="addInfo.sex">
+          <RadioGroup v-model="addInfo.usersex">
             <Radio :label="1">男</Radio>
             <Radio :label="2">女</Radio>
             <Radio :label="0">未知</Radio>
 <script>
 import {
   class_list,
+  user_care,
+  user_delete,
   user_disabled,
   user_enable,
-  user_list
+  user_export,
+  user_import,
+  user_list,
+  user_un_care
 } from "@/api/school";
-import {user_add, user_edit} from "@/api/school";
-import {generateRandomString} from "@/utils";
+import { user_add, user_edit } from "@/api/school";
+import { exportToExcel } from "@/utils/exportToExcel";
 
 export default {
   data() {
     const reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,32}$/;
     // 密码验证
     const pwdCheck = (rule, value, callback) => {
-      console.log(value)
-      if (!reg.test(this.addInfo.loginpwd)) {
+      if (!reg.test(value)) {
         return callback(new Error("密码格式不正确!"));
       }
-      console.log(this.addInfo.loginpwd)
+      callback();
     };
     // 重复密码验证
     const pwdAgainCheck = async (rule, value, callback) => {
-      if (!reg.test(this.addInfo.loginpwd1)) {
+      if (!value) {
         return callback(new Error("确认密码不能为空!"));
       }
-      if (!reg.test(this.addInfo.loginpwd1)) {
+      if (!reg.test(value)) {
         return callback(new Error("密码格式不正确!"));
       }
-      if (this.addInfo.loginpwd != this.addInfo.loginpwd1) {
+      if (this.addInfo.loginpwd != value) {
         return callback(new Error("两次输入密码不一致！"));
       }
+      callback();
     };
     return {
       userInfo: {},
+      importInfo: {
+        show: false,
+        file: null
+      },
+      exitInfo: {
+        show: false,
+        studentsExisted: [],
+        usersExisted: []
+      },
+      columns2: [
+        {
+          title: "姓名",
+          key: "username",
+          minWidth: 140,
+          align: "center"
+        },
+        {
+          title: "登录名",
+          key: "loginname",
+          minWidth: 140,
+          align: "center"
+        },
+        {
+          title: "性别",
+          key: "usersex",
+          align: "center",
+          slot: "usersex"
+        }
+      ],
+      form_data: null,
+      wait_flag: false,
       showLoading: false,
       care_list: [
         { id: 0, title: "请选择关注状态" },
         { id: 1, title: "管控中" },
         { id: 2, title: "解除管控" }
       ],
-      curClass: 0,
+      curClass: {
+        id: 0,
+        name: ""
+      },
       addInfo: {
         show: false,
         userid: null,
         },
         {
           title: "登录名",
-          key: "loginname",
+          slot: "loginname",
           align: "center"
         },
         {
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
     ).content;
-    console.log(this.userInfo);
     this.init();
     this.searchList();
   },
   methods: {
     classChange() {
-      if(this.schoolInfo.children.length === 0){
+      if (this.schoolInfo.children.length === 0) {
         return;
       }
-      let classInfo = this.schoolInfo.children.filter(v=>v.id === this.addInfo.classid)[0];
+      let classInfo = this.schoolInfo.children.filter(
+        (v) => v.id === this.addInfo.classid
+      )[0];
       this.addInfo.classname = classInfo.name;
     },
-    userImport() {},
-    userExport() {},
+    download() {
+      //下载模版
+      let url = "../../../../doc/student.xls";
+      const a = document.createElement("a"); // 创建a标签
+      a.setAttribute("download", "学生信息模版"); // download属性
+      a.setAttribute("href", url); // href链接
+      a.click(); // 自执行点击事件
+    },
+    //确定导入
+    ok_import() {
+      if (!this.importInfo.file) {
+        this.$Message.error("请选择上传文件");
+        return;
+      }
+      this.wait_flag = true;
+      let that = this;
+      user_import(this.form_data)
+        .then((res) => {
+          this.wait_flag = false;
+          if (res.code == 0) {
+            this.importInfo = {
+              show: false,
+              file: null
+            };
+            if (res.obj.code == 0) {
+              this.$Message.success("导入成功");
+              this.searchList();
+            } else {
+              this.exitInfo = {
+                show: true,
+                studentsExisted: res.obj.studentsExisted,
+                usersExisted: res.obj.usersExisted
+              };
+            }
+          } else {
+            this.$Message.error(res.msg);
+          }
+          this.form_data = null;
+        })
+        .catch(() => {
+          that.wait_flag = false;
+        });
+    },
+    //导入
+    userImport() {
+      this.importInfo = {
+        show: true,
+        file: null
+      };
+    },
+    // 上传文件
+    handleUpload(file) {
+      let str = file.name.split(".");
+      let suffix = str[str.length - 1];
+      suffix = suffix.toLowerCase();
+      if (suffix === "xls" || suffix === "xlsx") {
+        this.importInfo.file = file;
+        this.import_img = true;
+        this.form_data = new FormData();
+        this.form_data.append("file", file);
+        this.form_data.append("schoolid", 1);
+        this.form_data.append("regionid", this.userInfo.regionid);
+      } else {
+        this.importInfo.file = null;
+        this.$Message.error("请上传excel文件");
+      }
+      return false;
+    },
+    //导出
+    userExport() {
+      user_export({ schoolid: 1 }).then((res) => {
+        if (res.code === 0) {
+          exportToExcel(
+            [
+              {
+                list: res.obj.map((item) => {
+                  return {
+                    登录名: item.loginname,
+                    姓名: item.username,
+                    班级: item.classname,
+                    状态: item.enabled === 1 ? "启用" : "禁用",
+                    最后登录时间: item.lasttime || ""
+                  };
+                }),
+                name: this.curClass.name
+              }
+            ],
+            this.curClass.name
+          );
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     toAdd() {
       this.addInfo = {
         show: true,
         userid: null,
-        sex: 1,
+        usersex: 1,
         username: "",
         loginname: "",
         loginpwd: "",
       };
     },
     saveAddInfo() {
-      console.log(this.addInfo);
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          console.log(this.addInfo.classid)
-           if(!this.addInfo.classid){
-             this.$Message.error("请选择班级!")
-             return
-           }
+          if (this.addInfo.userphone) {
+            var filter = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+            if (!filter.test(this.addInfo.userphone)) {
+              this.$Message.error("手机号码格式不正确!");
+              return;
+            }
+          }
+          if (!this.addInfo.classid) {
+            this.$Message.error("请选择班级!");
+            return;
+          }
           let form = {
             username: this.addInfo.username,
             loginname: this.addInfo.loginname,
+            usersex: this.addInfo.usersex,
             loginpwd: this.addInfo.loginpwd,
             classid: this.addInfo.classid,
             classname: this.addInfo.classname,
-            schoolid: this.addInfo.schoolid,
-            regionid: this.addInfo.regionid,
+            schoolid: this.addInfo.schoolid || 1,
+            regionid: this.userInfo.regionid,
             enabled: this.addInfo.enabled,
             studentno: this.addInfo.studentno,
             userphone: this.addInfo.userphone,
             cardid: this.addInfo.cardid
           };
-          //编辑
-          // if (this.addInfo.appid) {
-          //   form.userid = this.addInfo.userid;
-          //   form.rversion = this.addInfo.rversion;
-          // }
-          console.log(form);
           let api = this.addInfo.userid ? user_edit : user_add;
           api(form).then((res) => {
             if (res.code === 0) {
               this.addInfo.show = false;
-              console.log(res.obj);
               this.$Message.success(res.msg);
               this.searchList();
             } else {
         }
       });
     },
-    toCare(row) {},
-    toDel(row) {},
+    toCare(row) {
+      let api = row.care === 1 ? user_un_care : user_care;
+      api({ userid: row.userid, rversion: row.rversion }).then((res) => {
+        if (res.code === 0) {
+          this.searchList();
+          this.$Message.success(res.msg);
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
+    toDel(row) {
+      user_delete({ userid: row.userid, rversion: row.rversion }).then(
+        (res) => {
+          if (res.code === 0) {
+            this.searchList();
+            this.$Message.success(res.msg);
+          } else {
+            this.$Message.error(res.msg);
+          }
+        }
+      );
+    },
     enabledChange(row) {
       let api = row.enabled === 1 ? user_enable : user_disabled;
       api({
       });
     },
     selectClass(item) {
-      this.curClass = item.id;
+      this.curClass = item;
+      this.searchList();
     },
     init() {
       this.showLoading = true;
         if (res.code === 0) {
           this.schoolInfo = res.obj;
           if (this.schoolInfo.children.length > 0) {
-            this.curClass = this.schoolInfo.children[0].id;
+            this.curClass = this.schoolInfo.children[0];
           }
-          console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
         }
         page: this.searchForm.page,
         size: this.searchForm.size,
         schoolid: this.searchForm.schoolid,
-        classid: this.curClass,
+        classid: this.curClass.id,
         care: this.searchForm.care,
         enabled: this.searchForm.enabled,
         control: this.searchForm.control,
         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);
         }
         line-height: 30px;
         height: 30px;
         text-align: center;
-        cursor: p;
+        cursor: pointer;
       }
       .active {
         border-radius: 6px;
   .user_list {
     width: calc(100% - 216px);
     height: 100%;
+    overflow-y: auto;
     border-radius: 15px;
     background-color: white;
   }
     }
   }
 }
+.modal_tip {
+  .files_list {
+    height: 30px;
+    line-height: 30px;
+  }
+  .import_tip {
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    .theme_color {
+      color: #339dff;
+      cursor: pointer;
+    }
+  }
+}
+// 存在信息
+.exit_modal {
+  /deep/ .ivu-modal {
+    .ivu-modal-content {
+      .exit {
+        div {
+          // margin-bottom: 10px;
+          font-size: 18px;
+          line-height: 40px;
+        }
+      }
+      .ivu-table {
+        -moz-user-select: none;
+        -khtml-user-select: none;
+        user-select: none;
+      }
+      div .ivu-table-header thead tr > th {
+        height: 40px;
+      }
+      .ivu-modal-footer {
+        display: none;
+      }
+    }
+  }
+}
 </style>