init

src/components/searchBox.vue

@@ -141,6 +141,15 @@ export default {
       },
     };
   },
+  created(){
+    var self = this
+    document.onkeydown = function (e) {
+      var key = window.event.keyCode;
+      if (key === 13) {
+        self.search();
+      }
+    };
+  },
   methods: {
     //搜索
     search() {

src/components/tableList.vue

@@ -152,6 +152,13 @@
                 ? "手动发布"
                 : "未知"
             }}</span>
+            <span v-else-if="item.scope === 'ggType'">{{
+              Number(scope.row[item.prop]) === 1
+                ? "学习中心"
+                : Number(scope.row[item.prop]) === 2
+                ? "求职中心"
+                : "未知"
+            }}</span>
             <span v-else-if="item.scope === 'statusRe'">{{
               Number(scope.row[item.prop]) === 0
                 ? "已删除"

src/view/courseQuestionBank/professionalManagement/index.vue

@@ -415,12 +415,11 @@ export default {
             item.hasChildren = true;
           });
           self.tableData = res.rows;
-          console.log(self.tableData,33)
           self.tableData.sort(self.sortBy("sort", true));
           self.navText.index = res.total;
           self.total = res.total;
           self.loading = false;
-  //        self.getCascader();
+         self.getCascader();
         })
         .catch((err) => {
           this.loading = false;

src/view/eventManagement/activeConfiguration/index.vue

@@ -179,6 +179,19 @@
               <template slot="append">月</template>
             </el-input>
           </el-col>
+          <el-col :span="24">
+            <header>活动时间：</header>
+            <el-date-picker
+              :disabled="statusPop === 2"
+              v-model="releaseTime"
+              type="datetimerange"
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="timestamp"
+            >
+            </el-date-picker>
+          </el-col>
           <el-col :span="24">
             <header>备注：</header>
             <el-input
@@ -190,7 +203,7 @@
         </el-col>
         <el-col :span="12">
           <el-col :span="24">
-            <header>活动图标：</header>
+            <header>活动封面：</header>
             <div class="imgBox">
               <label class="imgLabel" for="inputs">
                 <div class="msPhoto" v-if="formLabelAlign.activityLogo">
@@ -221,17 +234,35 @@
             </div>
           </el-col>
           <el-col :span="24">
-            <header>活动时间：</header>
-            <el-date-picker
-              :disabled="statusPop === 2"
-              v-model="releaseTime"
-              type="datetimerange"
-              range-separator="~"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="timestamp"
-            >
-            </el-date-picker>
+            <header>活动详情图：</header>
+            <div class="imgBox">
+              <label class="imgLabel" for="inputsimg">
+                <div class="msPhoto" v-if="formLabelAlign.activityContentUrl">
+                  <img
+                    :src="
+                      $methodsTools.splitImgHost(formLabelAlign.activityContentUrl)
+                    "
+                    alt="图片加载失败"
+                  />
+                </div>
+                <div class="imgbbx" v-else>
+                  <p style="margin-top: 49px">点击添加或将文件拖拽到这里上传</p>
+                  <i class="el-icon-plus"></i>
+                  <p style="margin-bottom: 37px">
+                    图片格式：.jpg/.png/jpeg/bmp
+                  </p>
+                </div>
+                <input
+                  id="inputsimg"
+                  type="file"
+                  ref="fileimg"
+                  :disabled="statusPop === 2"
+                  style="display: none"
+                  @change="getImgFileImg"
+                />
+              </label>
+              <p>请上传活动详情图</p>
+            </div>
           </el-col>
           <el-col :span="24" v-if="formLabelAlign.activityType === 2">
             <header>直播内容：</header>
@@ -491,6 +522,34 @@ export default {
         self.$set(self.formLabelAlign, "activityLogo", ev.target.result);
       };
     },
+    getImgFileImg(){
+      var self = this;
+      var file = this.$refs.fileimg.files[0];
+      if (file === undefined) {
+        self.$set(self.formLabelAlign, "activityContentUrl", "");
+        return;
+      }
+      if (file.size > 5 * 1024 * 1024) {
+        this.$message.error("图片不得大于5MB");
+        return;
+      }
+      var type = this.$refs.fileimg.value.toLowerCase().split(".").splice(-1);
+      if (
+        type[0] != "jpg" &&
+        type[0] != "png" &&
+        type[0] != "jpeg" &&
+        type[0] != "bmp"
+      ) {
+        this.$message.error("上传格式需为：.jpg/.png/.jpeg/bmp");
+        this.$refs.fileimg.value = "";
+        return;
+      }
+      var reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = function (ev) {
+        self.$set(self.formLabelAlign, "activityContentUrl", ev.target.result);
+      };
+    },
     search(v) {
       this.loading = true;
       if (v === undefined) {
@@ -563,6 +622,13 @@ export default {
         this.$message.error("请上传活动图标");
         return;
       }
+      if (
+        this.formLabelAlign.activityContentUrl === "" ||
+        this.formLabelAlign.activityContentUrl === undefined
+      ) {
+        this.$message.error("请上传活动详情图");
+        return;
+      }
       if (!this.formLabelAlign.activityUrl) {
         this.$message.error("请输入跳转链接");
         return;
@@ -601,10 +667,14 @@ export default {
       if (this.statusPop === 0) {
         var objNew = JSON.parse(this.beif);
         if (this.formLabelAlign.activityLogo !== objNew.activityLogo) {
-          const awtimg = await this.imgUpload(0);
+          const awtimg01 = await this.imgUpload(0);
+        }
+        if (this.formLabelAlign.activityContentUrl !== objNew.activityContentUrl) {
+          const awtimg02 = await this.imgUploadimg(0);
         }
       } else {
-        const awtimg = await this.imgUpload(0);
+        const awtimg1 = await this.imgUpload(0);
+        const awtimg2 = await this.imgUploadimg(0);
       }
       var data = {
         activityName: this.formLabelAlign.activityName,
@@ -614,6 +684,7 @@ export default {
         endTime: Number(this.releaseTime[1]) / 1000,
         description: this.formLabelAlign.description,
         activityLogo: this.formLabelAlign.activityLogo,
+        activityContentUrl:this.formLabelAlign.activityContentUrl
       };
       if (this.formLabelAlign.activityType !== 2) {
         if (
@@ -676,7 +747,21 @@ export default {
             resolve();
           })
           .catch((err) => {
-            this.$message.error("图片上传错误");
+            this.$message.error("活动封面图上传错误");
+          });
+      });
+    },
+    imgUploadimg(int) {
+      return new Promise((resolve, reject) => {
+        this.$upload
+          .upload(this.$refs.fileimg.files[0], int)
+          .then((res) => {
+            console.log(res);
+            this.$set(this.formLabelAlign, "activityContentUrl", res);
+            resolve();
+          })
+          .catch((err) => {
+            this.$message.error("活动详情图上传错误");
           });
       });
     },

src/view/eventManagement/advertising/index.vue

@@ -94,6 +94,17 @@
               >
             </el-radio-group>
           </el-col>
+          <el-col :span="24">
+            <header>广告类型：</header>
+            <el-radio-group v-model="formLabelAlign.type">
+              <el-radio :label="1" :disabled="statusPop === 2"
+                >学习中心</el-radio
+              >
+              <el-radio :label="2" :disabled="statusPop === 2"
+                >求职中心</el-radio
+              >
+            </el-radio-group>
+          </el-col>
           <el-col :span="24">
             <header>有效期：</header>
             <el-date-picker
@@ -228,6 +239,22 @@ export default {
             },
           ],
         },
+        {
+          label: "广告类型",
+          prop: "type",
+          placeholder: "请选择广告类型",
+          scope: "select",
+          options: [
+            {
+              label: "学习中心",
+              value: 1,
+            },
+            {
+              label: "求职中心",
+              value: 2,
+            },
+          ],
+        },
         {
           label: "添加时间",
           prop: "startTimeList",
@@ -274,6 +301,12 @@ export default {
           hidden: true,
           scope: "reStatus",
         },
+        {
+          label: "广告类型",
+          prop: "type",
+          hidden: true,
+          scope: "ggType",
+        },
         {
           label: "有效期",
           prop1: "startTime",
@@ -347,6 +380,7 @@ export default {
         advName: v.advName || "",
         status: v.status,
         reStatus: v.reStatus,
+        type: v.type,
         startCreateTime: v.startTimeList
           ? (v.startTimeList[0] / 1000).toFixed(0)
           : "",
@@ -423,6 +457,13 @@ export default {
         this.$message.error("请选择发布方式");
         return;
       }
+      if (
+        this.formLabelAlign.type !== 1 &&
+        this.formLabelAlign.type !== 2
+      ) {
+        this.$message.error("请选择广告类型");
+        return;
+      }
       if (!this.releaseTime) {
         this.$message.error("请选择有效期");
         return;
@@ -446,6 +487,7 @@ export default {
         advName: this.formLabelAlign.advName,
         jumpUrl: this.formLabelAlign.jumpUrl,
         reStatus: this.formLabelAlign.reStatus,
+        type: this.formLabelAlign.type,
         startTime: Number(this.releaseTime[0]) / 1000,
         endTime: Number(this.releaseTime[1]) / 1000,
         remarks: this.formLabelAlign.remarks,
@@ -490,7 +532,6 @@ export default {
         this.$upload
           .upload(this.$refs.file.files[0], int)
           .then((res) => {
-            console.log(res);
             this.$set(this.formLabelAlign, "adverUrl", res);
             resolve();
           })

src/view/jobSearchManagement/resumeCenter/index.vue

@@ -696,8 +696,8 @@ export default {
   },
 };
 </script>
-<style>
-.el-cascader-node > .el-radio,
+<style lang="less" scoped>
+/deep/ .el-cascader-node > .el-radio,
 .el-radio:last-child {
   width: 90%;
 }

src/view/userManagement/personalManagement/index.vue

@@ -636,7 +636,7 @@ export default {
       this.departmentList = departm;
       this.$api.inquireuserschoolList().then((res) => {
         var listAry = [];
-        res.data.forEach((item, index) => {
+        res.rows.forEach((item, index) => {
           var actliy = { value: item.id, label: item.schoolName };
           listAry.push(actliy);
         });
@@ -793,6 +793,7 @@ export default {
         type: "warning",
       })
         .then(() => {
+          this.poppleData1 = {}
           this.dialogBox = false;
           this.activeIndex = 0;
         })

src/view/userManagement/schoolManagement/index.vue

@@ -306,7 +306,7 @@ export default {
         schoolName: this.poppleData.schoolName,
         status: this.poppleData.status,
       };
-      if(this.statusPop === 1){
+      if (this.statusPop === 1) {
         this.$api.adduserschool(data).then((res) => {
           if (res.code === 200) {
             this.$message.success("新增成功");
@@ -314,8 +314,8 @@ export default {
             this.dialogBox = false;
           }
         });
-      }else{
-        data.id = this.poppleData.id
+      } else {
+        data.id = this.poppleData.id;
         this.$api.edituserschool(data).then((res) => {
           if (res.code === 200) {
             this.$message.success("修改成功");
@@ -326,12 +326,27 @@ export default {
       }
     },
     del(options) {
-      this.$api.edituserschool({ id: options.id, status: -1,schoolName:options.schoolName }).then((res) => {
-        if (res.code === 200) {
-          this.$message.success("删除成功");
-          this.search();
-        }
-      });
+      var self = this;
+      this.$confirm("此操作将删除该学校, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          self.$api
+            .edituserschool({
+              id: options.id,
+              status: -1,
+              schoolName: options.schoolName,
+            })
+            .then((res) => {
+              if (res.code === 200) {
+                self.$message.success("删除成功");
+                self.search();
+              }
+            });
+        })
+        .catch(() => {});
     },
     closeBefore() {
       this.dialogBox = false;