修改样式及功能

src/App.vue

@@ -46,7 +46,7 @@ export default {
   data() {
     return {
       isShowNav: false, // 是否显示导航 Tab
-      navTabs: ["/anliList", '/user', '/score', '/data', '/notice','/school'], // 导航
+      navTabs: ["/anliList",'/county', '/user', '/score', '/data', '/notice','/school'], // 导航
       navTabs2: ["/anliList", '/score', '/data', '/notice','/school'], // 导航
       nav: [],
     };

src/components/pages/munAdmin/county.vue

@@ -0,0 +1,575 @@
+<template>
+  <div class="pb_content">
+    <div class="pb_head">
+      <div>
+        <span>区县管理</span>
+      </div>
+    </div>
+    <div class="touTop">
+      <div class="touLeft">
+        <div>
+          <el-input v-model="suser" placeholder="请输入手机号或用户名">
+          </el-input>
+          <el-button @click="search">查询</el-button>
+        </div>
+      </div>
+      <div class="touRight">
+        <div></div>
+        <div>
+          <el-button @click="addUser">添加账号</el-button>
+        </div>
+      </div>
+    </div>
+    <div class="pb_content_body" style="margin: 0 auto">
+      <div class="student_table">
+        <el-table
+          ref="table"
+          :data="tableData"
+          border
+          :height="tableHeight"
+          :fit="true"
+          v-loading="isLoading"
+          style="width: 100%"
+          :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
+          :row-class-name="tableRowClassName"
+        >
+          <el-table-column label="姓名" min-width="10" align="center">
+            <template slot-scope="scope">
+              <div class="userImg">
+                <div>
+                  {{ scope.row.name }}
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="电话" min-width="10" align="center">
+            <template slot-scope="scope">
+              <div>{{ scope.row.phone ? scope.row.phone : "-" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="level"
+            label="权限等级"
+            min-width="10"
+            align="center"
+            ><template slot-scope="scope">
+              <div>
+                {{
+                  scope.row.type == 4
+                    ? "评审员"
+                    : scope.row.type == 1
+                    ? "教师"
+                    : scope.row.type == 5
+                    ? "县级评委"
+                    : "暂无"
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="20">
+            <template slot-scope="scope">
+              <div class="tableButton">
+                <el-button @click="upUser(scope.row)">修改</el-button>
+                <el-button @click="deUser(scope.row.userid)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="student_page">
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="total"
+          v-if="page"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
+      </div>
+    </div>
+    <el-dialog
+      title="添加管理员"
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      width="500px"
+      :before-close="handleClose"
+      class="dialog_diy"
+    >
+      <el-form class="inputClass">
+        <el-form-item label="名称" :label-width="formLabelWidth">
+          <span>
+            <el-input
+              placeholder="请输入名称"
+              clearable
+              v-model="sName"
+              class="add_input"
+            ></el-input>
+          </span>
+        </el-form-item>
+        <el-form-item label="手机号" :label-width="formLabelWidth">
+          <span>
+            <el-input
+              placeholder="请输入手机号"
+              clearable
+              v-model="sPhone"
+              class="add_input"
+            ></el-input>
+          </span>
+        </el-form-item>
+        <el-form-item label="权限" :label-width="formLabelWidth">
+          <el-select v-model="sType" placeholder="请选择权限">
+            <el-option label="教师" value="1">教师</el-option>
+            <el-option label="评审员" value="4">评审员</el-option>
+            <el-option label="区县评委" value="5">区县评委</el-option>
+          </el-select>
+        </el-form-item>
+        <div style="text-align: center; color: #adb3b7">
+          注：添加账号账号密码为123456
+        </div>
+      </el-form>
+      <span slot="footer" class="dialog-footer flex">
+        <el-button class="left" @click="dialogVisible = false">取消</el-button>
+        <el-button class="right" @click="addRaceUser" v-if="isAddOrUp == false"
+          >确认</el-button
+        >
+        <el-button
+          class="right"
+          @click="updateRaceUser"
+          v-if="isAddOrUp == true"
+          >修改</el-button
+        >
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      suser: "",
+      tableData: [],
+      tableHeight: "500px",
+      isLoading: false,
+      formLabelWidth: "100px",
+      page: 1,
+      total: 0,
+      dialogVisible: false,
+      isAddOrUp: false,
+      sName: "",
+      sPhone: "",
+      sType: "",
+      upId: "",
+      reviewer: "",
+      reviewerBox: [],
+      anliBox: [],
+      checkboxList: [],
+      checkboxIdList: [],
+      isIndeterminate: false,
+      checkAll: false,
+    };
+  },
+  mounted() {
+    this.$nextTick(function () {
+      this.tableHeight =
+        window.innerHeight - this.$refs.table.$el.offsetTop - 200;
+      if (this.tableHeight <= 530) {
+        this.tableHeight = 530;
+      }
+      // 监听窗口大小变化
+      let self = this;
+      window.onresize = function () {
+        self.tableHeight =
+          window.innerHeight - self.$refs.table.$el.offsetTop - 200;
+        if (self.tableHeight <= 530) {
+          self.tableHeight = 530;
+        }
+      };
+    });
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if ((rowIndex + 1) % 2 === 0) {
+        return "even_row";
+      } else {
+        return "";
+      }
+    },
+    handleCheckAllChange(val) {
+      if (this.checkboxIdList.length == 0) {
+        for (var i = 0; i < this.anliBox.length; i++) {
+          this.checkboxIdList.push(this.anliBox[i].id);
+        }
+      }
+      this.checkboxList = val ? this.checkboxIdList : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedAnliChange(value) {
+      let checkedCount = this.checkboxList.length;
+      this.checkAll = checkedCount === this.anliBox.length;
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.anliBox.length;
+    },
+    handleClose(done) {
+      done();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getAdmin();
+    },
+    search() {
+      this.page = 1;
+      this.getAdmin();
+    },
+    addUser() {
+      this.sName = "";
+      this.sPhone = "";
+      this.sType = "";
+      this.isAddOrUp = false;
+      this.dialogVisible = true;
+    },
+    getAdmin() {
+      let params = {
+        uid: this.$store.state.userInfo.userid,
+        cn: this.suser,
+        page: this.page,
+      };
+      this.ajax
+        .get(this.$store.state.api + "selectReviewer", params)
+        .then((res) => {
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
+          this.tableData = res.data[0];
+          this.reviewerBox = res.data[0];
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    addRaceUser() {
+      if (this.sName == "") {
+        this.$message.error("请输入名称");
+        return;
+      } else if (this.sPhone == "") {
+        this.$message.error("请输入手机号");
+        return;
+      } else if (
+        this.sId != "" &&
+        !/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)
+      ) {
+        this.$message.error("手机号格式不正确");
+        return;
+      } else if (this.sType == "") {
+        this.$message.error("请选择权限");
+        return;
+      }
+      this.isloading = true;
+      let params = [
+        {
+          reg: "",
+          res: "",
+          sch: this.$store.state.userInfo.school,
+          n: this.sName,
+          p: this.sPhone,
+          t: this.sType,
+          parent: this.$store.state.userInfo.userid,
+        },
+      ];
+      this.ajax
+        .post(this.$store.state.api + "addRaceUser", params)
+        .then((res) => {
+          this.$message({
+            message: "创建成功",
+            type: "success",
+          });
+          this.isloading = false;
+          this.sName = "";
+          this.sPhone = "";
+          this.sType = "";
+          this.dialogVisible = false;
+          this.getAdmin();
+        })
+        .catch((err) => {
+          this.isloading = false;
+          this.$message.error("创建失败");
+          console.error(err);
+        });
+    },
+    upUser(r) {
+      this.sName = r.name;
+      this.sPhone = r.phone;
+      this.sType = r.type;
+      this.upId = r.userid;
+      this.isAddOrUp = true;
+      this.dialogVisible = true;
+    },
+    updateRaceUser() {
+      let params = {
+        n: this.sName,
+        p: this.sPhone,
+        t: this.sType,
+        s: this.$store.state.userInfo.school,
+        uid: this.upId,
+      };
+      this.ajax
+        .get(this.$store.state.api + "updateReviewer", params)
+        .then((res) => {
+          this.$message({
+            message: "修改成功",
+            type: "success",
+          });
+          this.sName = "";
+          this.sPhone = "";
+          this.sType = "";
+          this.upId = "";
+          this.isAddOrUp = false;
+          this.dialogVisible = false;
+          this.getAdmin();
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    deUser(id) {
+      let params = {
+        uid: id,
+      };
+      this.ajax
+        .get(this.$store.state.api + "deleteReviewer", params)
+        .then((res) => {
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.dialogVisible = false;
+          this.getAdmin();
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    getAnliBox() {
+      this.ajax
+        .get(this.$store.state.api + "selecAnliBox")
+        .then((res) => {
+          this.anliBox = res.data[0];
+          for (var i = 0; i < this.anliBox.length; i++) {
+            this.anliBox[i].info = JSON.parse(this.anliBox[i].info);
+            this.anliBox[i].overview = JSON.parse(this.anliBox[i].overview);
+            this.anliBox[i].process = JSON.parse(this.anliBox[i].process);
+            this.anliBox[i].proact = JSON.parse(this.anliBox[i].proact);
+            this.anliBox[i].proexc = JSON.parse(this.anliBox[i].proexc);
+            this.anliBox[i].results = JSON.parse(this.anliBox[i].results);
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+  },
+  created() {
+    this.getAdmin();
+    this.getAnliBox();
+  },
+};
+</script>
+
+<style scoped>
+.dialog_diy >>> .el-dialog__header,
+.dialog_diy1 >>> .el-dialog__header {
+  background: #3d67bd !important;
+  padding: 15px 20px;
+}
+.dialog_diy1 >>> .el-dialog__header {
+  text-align: center;
+}
+.dialog_diy >>> .el-dialog__title,
+.dialog_diy1 >>> .el-dialog__title {
+  color: #fff;
+}
+
+.dialog_diy >>> .el-dialog__headerbtn,
+.dialog_diy1 >>> .el-dialog__headerbtn {
+  top: 19px;
+}
+
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close,
+.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+
+.dialog_diy >>> .el-dialog__headerbtn .el-dialog__close:hover,
+.dialog_diy1 >>> .el-dialog__headerbtn .el-dialog__close:hover {
+  color: #fff;
+}
+
+.dialog_diy >>> .el-dialog__body,
+.dialog_diy >>> .el-dialog__footer,
+.dialog_diy1 >>> .el-dialog__body,
+.dialog_diy1 >>> .el-dialog__footer {
+  background: #fafafa;
+}
+/* .inputClass.is-active >>> .el-input__inner,
+.inputClass >>> .el-input__inner:focus {
+  border-color: #5c549f;
+}
+
+.inputClass >>> .el-select .el-input.is-focus .el-input__inner {
+  border-color: #5c549f;
+}
+.inputClass >>> .el-select .el-input__inner:focus {
+  border-color: #5c549f;
+} */
+.left {
+  background: #fff !important;
+  color: #000 !important;
+}
+.right,
+.left {
+  width: 80px;
+  color: #fff;
+  background: #409efe;
+  margin-bottom: 20px;
+}
+.touTop {
+  margin: 15px auto;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: space-between;
+  width: 95%;
+}
+
+.touLeft {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.touLeft > div {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.touLeft > div > .el-button {
+  background: #2268bd;
+  color: #fff;
+  margin-left: 10px;
+}
+
+.touRight > div:nth-child(2) > .el-button {
+  background: #2268bd;
+  color: #fff;
+}
+.student_table >>> .el-table--border td {
+  border-right: 0px !important;
+}
+.student_table >>> .el-table,
+.student_table >>> .el-table__body-wrapper {
+  height: auto !important;
+}
+.student_page {
+  margin-top: 10px;
+}
+.tableButton {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.tableButton > .el-button {
+  background: #409efe;
+  color: #fff;
+  cursor: pointer;
+}
+.customWidth >>> .el-dialog {
+  min-width: 500px !important;
+}
+.people {
+  border: 1px solid rgb(229 229 229);
+  height: 495px;
+  border-radius: 5px;
+  width: 100%;
+  overflow: auto;
+  background: #fff;
+  box-shadow: 0px 0px 10px 8px #ededed;
+}
+.people::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 6px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 6px;
+}
+
+/*定义滚动条轨道 内阴影+圆角*/
+.people::-webkit-scrollbar-track {
+  border-radius: 10px;
+  background-color: #eee;
+}
+
+/*定义滑块 内阴影+圆角*/
+.people::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  background-color: rgba(0, 0, 0, 0.1);
+}
+.people_top {
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  padding: 10px 25px 10px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #f4f4f7;
+}
+
+.people_top_right {
+  height: 40px;
+  margin-bottom: 10px;
+}
+
+.people_search {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.people_search > div:nth-child(1) {
+  font-size: 20px;
+  margin-right: 10px;
+}
+.t_j_box {
+  display: flex;
+}
+.t_j_box span:nth-child(1) {
+  width: 15%;
+  overflow: hidden;
+  margin-right: 10px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.t_j_box span:nth-child(2) {
+  width: 300px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-right: 10px;
+}
+.t_j_box span:nth-child(3) {
+  width: calc(55% - 20px);
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.people_name {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  padding: 15px 0 0 15px;
+}
+.people_name >>> .el-checkbox {
+  margin-bottom: 10px;
+}
+</style>

src/components/pages/munAdmin/score.vue

@@ -114,8 +114,8 @@
             <template slot-scope="scope">
               <div class="tableButton">
                 <div @click="lookDetail(scope.row.id)">案例详情</div>
-                <div>评分修改</div>
-                <div>推荐</div>
+                <div @click="openScore(scope.row, 1)">评分修改</div>
+                <div @click="openScore(scope.row, 2)">推荐</div>
               </div>
             </template>
           </el-table-column>
@@ -134,101 +134,6 @@
         </el-pagination>
       </div>
     </div>
-    <!-- <div class="anliBox">
-      <div v-for="(a, aIndex) in tableData" :key="aIndex" class="anLi">
-        <div class="anliImg"><img :src="a.info.cover[0].url" alt="" /></div>
-        <div class="anliBot">
-          <div class="detailBox">
-            <div>{{ a.info.title }}</div>
-            <div>{{ a.time }}</div>
-          </div>
-          <div class="anliButton">
-            <div>
-              <el-button @click="goTo('/anliDetail?aid=' + a.id + '&type=1')"
-                >查看</el-button
-              >
-            </div>
-            <div>
-              <el-button @click="openScore(a, 1)">评分</el-button>
-            </div>
-            <div>
-              <el-button @click="openScore(a, 2)">推荐</el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="student_page">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :page-size="10"
-        :total="total"
-        v-if="page && tableData.length"
-        style="padding-bottom: 20px"
-        @current-change="handleCurrentChange"
-      >
-      </el-pagination>
-    </div> -->
-    <el-dialog
-      title="分配案例"
-      :visible.sync="dialogVisibleMember"
-      :append-to-body="true"
-      width="25%"
-      height="80%"
-      :before-close="handleClose"
-      class="dialog_diy1 customWidth"
-    >
-      <div class="people">
-        <div class="people_top">
-          <div class="people_top_right">
-            <div class="people_search">
-              <div>选择评委</div>
-              <el-select v-model="reviewer" placeholder="请选择评委">
-                <el-option
-                  v-for="item in reviewerBox"
-                  :key="item.userid"
-                  :label="item.name"
-                  :value="item.userid"
-                ></el-option>
-              </el-select>
-            </div>
-          </div>
-        </div>
-        <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          style="padding: 15px 0 0 15px"
-          >全选</el-checkbox
-        >
-        <el-checkbox-group
-          v-model="checkboxList"
-          class="people_name"
-          v-if="anliBox1.length"
-          @change="handleCheckedAnliChange"
-        >
-          <el-checkbox v-for="item in anliBox1" :key="item.id" :label="item.id">
-            <div class="t_j_box">
-              <div>案例名称：</div>
-              <el-tooltip
-                placement="top"
-                :content="item.info.title ? item.info.title : '暂无姓名'"
-              >
-                <span>{{
-                  item.info.title ? item.info.title : "暂无姓名"
-                }}</span>
-              </el-tooltip>
-            </div>
-          </el-checkbox>
-        </el-checkbox-group>
-        <div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleMember = false">取 消</el-button>
-        <el-button type="primary" @click="addCase">确定</el-button>
-      </span>
-    </el-dialog>
     <el-dialog
       title="评分"
       :visible.sync="dialogVisibleScore"
@@ -378,7 +283,6 @@ export default {
       checkboxIdList: [],
       isIndeterminate: false,
       checkAll: false,
-      dialogVisibleMember: false,
       dialogVisibleScore: false,
       dialogVisibleRecommend: false,
       scoreDetail: [
@@ -630,38 +534,6 @@ export default {
           console.error(err);
         });
     },
-    addCase() {
-      if (this.reviewer == "") {
-        this.$message.error("请选择评审员");
-        return;
-      } else if (this.checkboxList.length == 0) {
-        this.$message.error("请选择案例");
-        return;
-      }
-      let params = [
-        {
-          uid: this.reviewer,
-          box: this.checkboxList.join(","),
-        },
-      ];
-      this.ajax
-        .post(this.$store.state.api + "insertCase", params)
-        .then((res) => {
-          this.$message({
-            message: "分配成功",
-            type: "success",
-          });
-          this.reviewer = "";
-          this.checkboxList = [];
-          this.isIndeterminate = false;
-          this.checkAll = false;
-          this.dialogVisibleMember = false;
-        })
-        .catch((err) => {
-          this.$message.error("网络不佳");
-          console.error(err);
-        });
-    },
     openScore(a, t) {
       this.scoreDetail[0].id = a.id;
       this.scoreDetail[0].title = a.info.title;
@@ -755,6 +627,7 @@ export default {
             },
           ];
           this.dialogVisibleScore = false;
+          this.getReviewerOrAdmin();
         })
         .catch((err) => {
           console.error(err);
@@ -1229,4 +1102,15 @@ export default {
   border-radius: 5px;
   cursor: pointer;
 }
+.tableButton {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  color: #43A0F5;
+}
+.tableButton>div{
+  margin-right: 10px;
+  cursor: pointer;
+}
 </style>

src/components/pages/munAdmin/user.vue

@@ -60,7 +60,7 @@
                     : scope.row.type == 1
                     ? "教师"
                     : scope.row.type == 2
-                    ? "市级管理"
+                    ? "市级评委"
                     : "暂无"
                 }}
               </div>

src/components/pages/race/addRace.vue

@@ -71,11 +71,7 @@
       ></ProjectEffect>
     </div>
     <div class="race_btn">
-      <el-button
-        type="primary"
-        @click="goTo('/eventCenter?userid=' + userid + '&oid=' + oid)"
-        >活动信息</el-button
-      >
+      <el-button type="primary" @click="isGoto">活动信息</el-button>
       <div
         style="
           display: flex;
@@ -187,6 +183,7 @@ export default {
         title: "",
         type: [],
         cover: [],
+        autor:[],
         tableData: [],
         courseText: "",
         data: [],
@@ -238,10 +235,22 @@ export default {
         if (this.raceInfo.title == "") {
           this.$message.error("标题不能为空");
           return;
+        } else if (this.raceInfo.type.length == 0) {
+          this.$message.error("课程分类不能为空");
+          return;
+        } else if (this.raceInfo.autor.length == 0) {
+          this.$message.error("请添加联系人");
+          return;
+        } else if (this.raceInfo.tableData.length == 0) {
+          this.$message.error("请添加协作者");
+          return;
+        } else if (this.raceInfo.courseText.length == 0) {
+          this.$message.error("请填写项目简介");
+          return;
         } else if (this.raceInfo.data.length == 0) {
           this.$message.error("上传文件不能为空");
           return;
-        }else{
+        } else {
           this.steps = steps;
         }
       } else {
@@ -251,10 +260,22 @@ export default {
     nextSteps() {
       if (this.steps == 1) {
         if (this.raceInfo.title == "") {
-          this.$message.error("请填写案例名称!");
+          this.$message.error("标题不能为空");
+          return;
+        } else if (this.raceInfo.type.length == 0) {
+          this.$message.error("课程分类不能为空");
+          return;
+        } else if (this.raceInfo.autor.length == 0) {
+          this.$message.error("请添加联系人");
+          return;
+        } else if (this.raceInfo.tableData.length == 0) {
+          this.$message.error("请添加协作者");
+          return;
+        } else if (this.raceInfo.courseText.length == 0) {
+          this.$message.error("请填写项目简介");
           return;
         } else if (this.raceInfo.data.length == 0) {
-          this.$message.error("文件上传不能为空!");
+          this.$message.error("上传文件不能为空");
           return;
         } else {
           this.dialogVisible1 = true;
@@ -294,6 +315,22 @@ export default {
       this.raceExceva = raceExc;
     },
     isAddOrUpRace(t) {
+      if (this.raceInfo.title == "") {
+        this.$message.error("标题不能为空");
+        return;
+      } else if (this.raceInfo.type.length == 0) {
+        this.$message.error("课程分类不能为空");
+        return;
+      } else if (this.raceInfo.tableData.length == 0) {
+        this.$message.error("请添加作者");
+        return;
+      } else if (this.raceInfo.courseText.length == 0) {
+        this.$message.error("请填写项目简介");
+        return;
+      } else if (this.raceInfo.data.length == 0) {
+        this.$message.error("上传文件不能为空");
+        return;
+      }
       this.isJump = t;
       if (this.aid == "" || this.aid == undefined) {
         this.addRace();
@@ -414,6 +451,9 @@ export default {
           });
       }
     },
+    isGoto() {
+      this.dialogVisible1 = true;
+    },
   },
   created() {
     this.selectAnLi();

src/components/pages/race/addRace/raceDetail.vue

@@ -9,9 +9,11 @@
               <img src="../../../../assets/icon/race/progress.png" alt="" />
             </div>
             <div class="stepRightNav" @click="jump('first')">
-              <div>案例活动信息</div>
-              <div>说明</div>
-              <div class="isFinishCss" v-if="raceDetail.title != '' && raceDetail.type.length > 0">
+              <div>项目基本信息</div>
+              <div
+                class="isFinishCss"
+                v-if="raceDetail.title != '' && raceDetail.type.length > 0"
+              >
                 <div class="isFinish">
                   <img src="../../../../assets/icon/race/finish.png" alt="" />
                 </div>
@@ -24,8 +26,7 @@
               <img src="../../../../assets/icon/race/progress.png" alt="" />
             </div>
             <div class="stepRightNav" @click="jump('second')">
-              <div>封面</div>
-              <div>说明</div>
+              <div>案例封面设置</div>
               <div class="isFinishCss" v-if="raceDetail.cover.length > 0">
                 <div class="isFinish">
                   <img src="../../../../assets/icon/race/finish.png" alt="" />
@@ -39,8 +40,7 @@
               <img src="../../../../assets/icon/race/progress.png" alt="" />
             </div>
             <div class="stepRightNav" @click="jump('third')">
-              <div>成员信息</div>
-              <div>协同人员</div>
+              <div>作者</div>
               <div class="isFinishCss" v-if="raceDetail.tableData.length > 0">
                 <div class="isFinish">
                   <img src="../../../../assets/icon/race/finish.png" alt="" />
@@ -54,7 +54,6 @@
               <img src="../../../../assets/icon/race/progress.png" alt="" />
             </div>
             <div class="stepRightNav" @click="jump('fouth')">
-              <div>项目说明</div>
               <div>项目简介</div>
               <div class="isFinishCss" v-if="raceDetail.courseText != ''">
                 <div class="isFinish">
@@ -70,7 +69,6 @@
             </div>
             <div class="stepRightNav" @click="jump('fivth')">
               <div>文件上传</div>
-              <div>项目资料</div>
               <div class="isFinishCss" v-if="raceDetail.data.length > 0">
                 <div class="isFinish">
                   <img src="../../../../assets/icon/race/finish.png" alt="" />
@@ -187,19 +185,19 @@
           </div>
           <div class="whiteBg" style="border-radius: 0">
             <div class="right_first">
-              <div class="right_title" id="third">作者</div>
+              <div class="right_title" id="third">联系人</div>
               <div
                 class="addPeople"
-                @click="dialogVisibleMember = true"
-                v-if="raceDetail.tableData.length < 6"
+                @click="addAutor(0)"
+                v-if="raceDetail.autor.length == 0"
               >
-                添加作者
+                添加联系人
               </div>
               <div class="raTable">
                 <el-table
                   class="tableColor"
                   ref="table"
-                  :data="raceDetail.tableData"
+                  :data="raceDetail.autor"
                   :height="tableHeight"
                   :fit="true"
                   style="width: 100%"
@@ -226,7 +224,7 @@
                         >
                           {{ scope.row.sn }}
                         </div>
-                        <div v-if="scope.$index == 0" class="lxr">联系人</div>
+                        <div class="lxr">联系人</div>
                       </div>
                     </template>
                   </el-table-column>
@@ -265,13 +263,118 @@
                         <div
                           class="delete"
                           style="margin-left: 0"
+                          @click="updateStudent(scope.row, scope.$index, 0)"
+                        >
+                          <img src="../../../../assets/autorUp.png" alt />
+                        </div>
+                        <div
+                          class="delete"
+                          @click="deleteStudent(scope.$index, 0)"
+                        >
+                          <img src="../../../../assets/remove.png" alt />
+                        </div>
+                      </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+              <div
+                style="
+                  color: #cd0808;
+                  width: 97%;
+                  margin: 10px auto;
+                  font-size: 14px;
+                "
+              >
+                *联系人所有信息都必填
+              </div>
+            </div>
+          </div>
+          <div class="whiteBg" style="border-radius: 0">
+            <div class="right_first">
+              <div class="right_title" id="third">协作者</div>
+              <div
+                class="addPeople"
+                @click="addAutor(1)"
+                v-if="raceDetail.tableData.length < 6"
+              >
+                添加协作者
+              </div>
+              <div class="raTable">
+                <el-table
+                  class="tableColor"
+                  ref="table"
+                  :data="raceDetail.tableData"
+                  :height="tableHeight"
+                  :fit="true"
+                  style="width: 100%"
+                  :header-cell-style="{
+                    background: '#f1f1f1',
+                    fontSize: '17px',
+                  }"
+                >
+                  <el-table-column label="姓名" min-width="20" align="center">
+                    <template slot-scope="scope">
+                      <div class="userImg">
+                        <div class="tx">
+                          <img :src="tx" alt />
+                        </div>
+                        <div
+                          style="
+                            width: 50px;
+                            text-align: left;
+                            white-space: nowrap;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                          "
+                        >
+                          {{ scope.row.sn }}
+                        </div>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="学科" min-width="15" align="center">
+                    <template slot-scope="scope">
+                      <div>{{ scope.row.su ? scope.row.su : "" }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="学校" min-width="15" align="center">
+                    <template slot-scope="scope">
+                      <div>{{ scope.row.sc ? scope.row.sc : "" }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="邮箱" min-width="15" align="center">
+                    <template slot-scope="scope">
+                      <div>{{ scope.row.em ? scope.row.em : "" }}</div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="电话" min-width="15" align="center">
+                    <template slot-scope="scope">
+                      <div>
+                        {{ scope.row.ph ? scope.row.ph : "" }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" min-width="20">
+                    <template slot-scope="scope">
+                      <div class="pb_buttonBox">
+                        <!-- <el-button
+                          size="mini"
+                          type="primary"
+                          style="cursor: pointer"
                           @click="updateStudent(scope.row, scope.$index)"
+                          >修改</el-button
+                        > -->
+                        <div
+                          class="delete"
+                          style="margin-left: 0"
+                          @click="updateStudent(scope.row, scope.$index, 1)"
                         >
                           <img src="../../../../assets/autorUp.png" alt />
                         </div>
                         <div
                           class="delete"
-                          @click="deleteStudent(scope.$index)"
+                          @click="deleteStudent(scope.$index, 1)"
                         >
                           <img src="../../../../assets/remove.png" alt />
                         </div>
@@ -288,7 +391,7 @@
                   font-size: 14px;
                 "
               >
-                *作者不超过6人；默认第一位为主要负责人，联系电话必填，其余人员可以选填
+                *协作者不超过6人；名字必填其余信息非必填
               </div>
             </div>
           </div>
@@ -609,6 +712,7 @@ export default {
       choosePicVisible: false,
       sysPicVisible: false,
       isSysPic: false,
+      isAutor: false,
       sysPic: [],
       upIndex: -1,
       sName: "",
@@ -620,6 +724,7 @@ export default {
         title: "",
         type: [],
         cover: [],
+        autor: [],
         tableData: [],
         courseText: "",
         data: [],
@@ -678,6 +783,8 @@ export default {
       this.$message.error("项目封面仅支持上传一张，请删除后再进行上传");
     },
     handleClose(done) {
+      this.isAddOrUp = false;
+      this.isAutor = false;
       done();
     },
     jump(t) {
@@ -925,7 +1032,7 @@ export default {
       this.$emit("updateTitle", this.raceDetail);
     },
     isAddPPTeacher() {
-      if (this.raceDetail.tableData.length == 0) {
+      if (this.isAutor == true) {
         if (this.sName === "") {
           this.$message.error("姓名不能为空");
           return;
@@ -954,93 +1061,86 @@ export default {
             return;
           }
         }
-      } else if (this.raceDetail.tableData.length > 0) {
-        if (this.upIndex == 0) {
-          if (this.sName === "") {
-            this.$message.error("姓名不能为空");
-            return;
-          } else if (this.sSubject === "") {
-            this.$message.error("学科不能为空");
-            return;
-          } else if (this.sSchool === "") {
-            this.$message.error("学校不能为空");
-            return;
-          } else if (this.sPhone == "") {
-            this.$message.error("手机号不能为空");
-            return;
-          } else if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)) {
+      } else {
+        if (this.sName === "") {
+          this.$message.error("姓名不能为空");
+          return;
+        } else if (this.sPhone != "") {
+          if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)) {
             this.$message.error("手机号格式不正确");
             return;
-          } else if (this.sEmail == "") {
-            this.$message.error("邮箱不能为空");
-            return;
-          } else if (this.sEmail != "") {
-            if (
-              !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
-                this.sEmail
-              )
-            ) {
-              this.$message.error("邮箱格式不正确");
-              return;
-            }
           }
-        } else {
-          if (this.sName === "") {
-            this.$message.error("姓名不能为空");
+        } else if (this.sEmail != "") {
+          if (
+            !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
+              this.sEmail
+            )
+          ) {
+            this.$message.error("邮箱格式不正确");
             return;
-          } else if (this.sPhone != "") {
-            if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)) {
-              this.$message.error("手机号格式不正确");
-              return;
-            }
-          } else if (this.sEmail != "") {
-            if (
-              !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(
-                this.sEmail
-              )
-            ) {
-              this.$message.error("邮箱格式不正确");
-              return;
-            }
           }
         }
       }
-      if (this.isAddOrUp == true) {
-        this.raceDetail.tableData[this.upIndex].sn = this.sName;
-        this.raceDetail.tableData[this.upIndex].su = this.sSubject;
-        this.raceDetail.tableData[this.upIndex].sc = this.sSchool;
-        this.raceDetail.tableData[this.upIndex].em = this.sEmail;
-        this.raceDetail.tableData[this.upIndex].ph = this.sPhone;
+
+      if (this.isAutor == true) {
+        if (this.isAddOrUp == true) {
+          this.raceDetail.autor[0].sn = this.sName;
+          this.raceDetail.autor[0].su = this.sSubject;
+          this.raceDetail.autor[0].sc = this.sSchool;
+          this.raceDetail.autor[0].em = this.sEmail;
+          this.raceDetail.autor[0].ph = this.sPhone;
+        } else {
+          this.raceDetail.autor.push({
+            sn: this.sName,
+            su: this.sSubject,
+            sc: this.sSchool,
+            em: this.sEmail,
+            ph: this.sPhone,
+          });
+        }
       } else {
-        this.raceDetail.tableData.push({
-          sn: this.sName,
-          su: this.sSubject,
-          sc: this.sSchool,
-          em: this.sEmail,
-          ph: this.sPhone,
-        });
+        if (this.isAddOrUp == true) {
+          this.raceDetail.tableData[this.upIndex].sn = this.sName;
+          this.raceDetail.tableData[this.upIndex].su = this.sSubject;
+          this.raceDetail.tableData[this.upIndex].sc = this.sSchool;
+          this.raceDetail.tableData[this.upIndex].em = this.sEmail;
+          this.raceDetail.tableData[this.upIndex].ph = this.sPhone;
+        } else {
+          this.raceDetail.tableData.push({
+            sn: this.sName,
+            su: this.sSubject,
+            sc: this.sSchool,
+            em: this.sEmail,
+            ph: this.sPhone,
+          });
+        }
       }
+
       this.sName = "";
       this.sSubject = "";
       this.sSchool = "";
       this.sEmail = "";
       this.sPhone = "";
       this.isAddOrUp = false;
+      this.isAutor = false;
       this.upIndex = -1;
       this.dialogVisibleMember = false;
       this.$emit("updateTitle", this.raceDetail);
     },
-    updateStudent(r, i) {
+    updateStudent(r, i, t) {
       this.sName = r.sn;
       this.sSubject = r.su;
       this.sSchool = r.sc;
       this.sEmail = r.em;
       this.sPhone = r.ph;
       this.isAddOrUp = true;
+      if (t == 0) {
+        this.isAutor = true;
+      }
       this.upIndex = i;
       this.dialogVisibleMember = true;
     },
-    deleteStudent(i) {
+    deleteStudent(i, t) {
       this.$confirm("确定删除此作者吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1051,7 +1151,11 @@ export default {
             message: "删除成功",
             type: "success",
           });
-          this.raceDetail.tableData.splice(i, 1);
+          if (t == 0) {
+            this.raceDetail.autor = [];
+          } else {
+            this.raceDetail.tableData.splice(i, 1);
+          }
           this.$emit("updateTitle", this.raceDetail);
         })
         .catch(() => {});
@@ -1097,12 +1201,19 @@ export default {
       this.raceDetail.title = this.raceInfo.title;
       this.raceDetail.type = this.raceInfo.type;
       this.raceDetail.cover = this.raceInfo.cover;
+      this.raceDetail.autor = this.raceInfo.autor;
       this.raceDetail.tableData = this.raceInfo.tableData;
       this.raceDetail.courseText = this.raceInfo.courseText;
       this.raceDetail.data = this.raceInfo.data;
       this.imgChange1(null, null, 1, null);
       this.$forceUpdate();
     },
+    addAutor(t) {
+      if (t == 0) {
+        this.isAutor = true;
+      }
+      this.dialogVisibleMember = true;
+    },
   },
   created() {
     this.getValue();
@@ -1211,7 +1322,7 @@ export default {
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: flex-start;
-  margin-left: 10px;
+  margin: 8px 0 0 10px;
   height: 40px;
   cursor: pointer;
 }

src/components/pages/race/addRace/raceOverview.vue

@@ -19,7 +19,6 @@
             </div>
             <div class="stepRightNav" @click="jump('first')">
               <div>驱动问题</div>
-              <div>说明</div>
               <div
                 class="isFinishCss"
                 v-if="
@@ -39,7 +38,6 @@
             </div>
             <div class="stepRightNav" @click="jump('second')">
               <div>学习目标</div>
-              <div>说明</div>
               <div
                 class="isFinishCss"
                 v-if="
@@ -59,7 +57,6 @@
             </div>
             <div class="stepRightNav" @click="jump('third')">
               <div>评价设计</div>
-              <div>说明</div>
               <div
                 class="isFinishCss"
                 v-if="
@@ -110,10 +107,10 @@
               </div>
               <div>
                 <div class="basic_box">
-                  <div class="lineBox">
+                  <!-- <div class="lineBox">
                     <div class="lineTitle">附件内容</div>
                     <div class="strLine"></div>
-                  </div>
+                  </div> -->
                   <div>
                     <div
                       class="add_chapters_box"
@@ -988,7 +985,7 @@ export default {
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: flex-start;
-  margin-left: 10px;
+  margin: 8px 0 0 10px;
   height: 40px;
   cursor: pointer;
 }

src/components/pages/race/eventCenter/myAnli.vue

@@ -25,7 +25,7 @@
             <div class="anliNav">
               <div>项目名称：{{ JSON.parse(an.info).title }}</div>
               <div>单位：{{ an.schoolName }}</div>
-              <div v-if="JSON.parse(an.info).courseText">
+              <div class="xmjj" v-if="JSON.parse(an.info).courseText">
                 {{ JSON.parse(an.info).courseText }}
               </div>
               <div class="personAndAutor">
@@ -37,6 +37,16 @@
                     {{ an.info ? JSON.parse(an.info).tableData.length : 0 }}人
                   </div>
                 </div>
+                <div class="autorBox" v-if="JSON.parse(an.info).autor.length">
+                  <div>联系人：</div>
+                  <div
+                    class="Autor"
+                    v-for="(a, aIndex) in JSON.parse(an.info).autor"
+                    :key="aIndex"
+                  >
+                    {{ a.sn }}
+                  </div>
+                </div>
                 <div
                   class="autorBox"
                   v-if="JSON.parse(an.info).tableData.length"
@@ -68,6 +78,7 @@
             <div class="rightButton" @click="goTo('/addRace?aid=' + an.id)">
               编辑
             </div>
+            <div class="rightButton" @click="deleteAnli(an.id)">删除</div>
             <div
               class="rightButton"
               style="background: #225ac7"
@@ -136,6 +147,31 @@ export default {
         })
         .catch(() => {});
     },
+    deleteAnli(id) {
+      this.$confirm("确定删除此案例吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let params = {
+            id: id,
+          };
+          this.ajax
+            .get(this.$store.state.api + "deleteAnli", params)
+            .then((res) => {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.selectAnLi();
+            })
+            .catch((err) => {
+              console.error(err);
+            });
+        })
+        .catch(() => {});
+    },
     exportAnli(res) {
       console.log(res);
       let _html = "";
@@ -312,7 +348,7 @@ export default {
 
 <style scoped>
 @media screen and (max-width: 1280px) {
-  .anliNav > div:nth-child(3) {
+  .xmjj {
     width: 70% !important;
   }
   .noAnliBox {
@@ -405,7 +441,7 @@ export default {
   /* font-weight: bold; */
   margin: 10px 0 10px 0;
 }
-.anliNav > div:nth-child(3) {
+.xmjj {
   color: #aba8a8;
   margin-bottom: 10px;
   white-space: nowrap;
@@ -421,7 +457,7 @@ export default {
   justify-content: space-between;
   margin: -10px 10px 0 30px;
 }
-.bottomLeft{
+.bottomLeft {
   margin-top: 5px;
 }
 .bottomRight {
@@ -464,7 +500,7 @@ export default {
   align-items: center;
   margin-left: 10px;
 }
-.Autor{
+.Autor {
   margin: 0 5px;
 }
 </style>

src/components/tools/leftBar.vue

@@ -12,6 +12,15 @@
             </div>
             <span>案例管理</span>
           </el-menu-item>
+          <el-menu-item index="/county" v-if="nav.indexOf('/county') != -1">
+            <div class="img" v-if="path == '/county'">
+              <img src="../../assets/icon/user-active.png" alt="" />
+            </div>
+            <div class="img" v-else>
+              <img src="../../assets/icon/user.png" alt="" />
+            </div>
+            <span>区县管理</span>
+          </el-menu-item>
           <el-menu-item index="/user" v-if="nav.indexOf('/user') != -1">
             <div class="img" v-if="path == '/user'">
               <img src="../../assets/icon/user-active.png" alt="" />

src/components/tools/wangEnduit.vue

@@ -247,7 +247,8 @@ ol {
 .editor>>>.w-e-text h5, 
 .editor>>>.w-e-text table, 
 .editor>>>.w-e-text pre{
-  line-height: 1.7;
+  line-height: 1.15;
+  margin: 5px 0 !important;
 }
 .editor >>> .w-e-text-container .placeholder{
   font-size: 14px;

src/router/index.js

@@ -13,6 +13,7 @@ import data from '@/components/pages/munAdmin/data'
 import notice from '@/components/pages/munAdmin/notice'
 import score from '@/components/pages/munAdmin/score'
 import user from '@/components/pages/munAdmin/user'
+import county from '@/components/pages/munAdmin/county'
 import school from '@/components/pages/munAdmin/school'
 
 
@@ -100,6 +101,13 @@ const router = new Router({
             meta: {
                 requireAuth: true // 不需要鉴权
             }
+        }, {
+            path: '/county',
+            name: 'county',
+            component: county,
+            meta: {
+                requireAuth: true // 不需要鉴权
+            }
         }, {
             path: '/school',
             name: 'school',