From 2342bed0cd30a823cb6da364d5599e60ef764cad Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 9 Aug 2024 10:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/course/components/addCourse.vue |   8 +-
 src/views/course/components/editPane.vue  |  33 +--
 src/views/login/index copy.vue            | 251 ----------------------
 src/views/notice/components/addNotice.vue |   5 +-
 4 files changed, 29 insertions(+), 268 deletions(-)
 delete mode 100644 src/views/login/index copy.vue

diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index ec34bba..e8ef46f 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -336,7 +336,7 @@
         let pubFiles = []
         if (this.publicizeList.length > 0) {
           this.publicizeList.map(item => {
-            if (item.response.id) {
+            if (item.response) {
               pubFiles.push(item.response.id)
             } else {
               pubFiles.push(item.id)
@@ -363,12 +363,14 @@
       },
       getDetail() {
         show({
-          id: this.id,
+          id: this.id,
+          show_relations:['image']
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
           if (res.image) {
             this.imgList.push(res.image)
-          }
+          }
+          this.publicizeList = res.publicize
           this.form.dateRange = [res.start_date, res.end_date]
           this.showTinymce = true
         })
diff --git a/src/views/course/components/editPane.vue b/src/views/course/components/editPane.vue
index 2f9c56e..1e1392b 100644
--- a/src/views/course/components/editPane.vue
+++ b/src/views/course/components/editPane.vue
@@ -29,7 +29,8 @@
             placeholder="请输入排序"
           ></el-input>
         </el-form-item>
-        <el-form-item prop="select_item" label="下拉框选项">
+        <el-form-item prop="select_item" label="下拉框选项"
+        v-if="selectedForm.edit_input==='radio' || selectedForm.edit_input==='checkbox'">
           <div class="select-item">
             <div class="select-item__header">
               <span>键</span>
@@ -165,15 +166,22 @@ export default {
 
     saveField() {
       this.selectedForm.select_item = []
-      this.selectItem.forEach(i => {
-        this.selectedForm.select_item[i.key] = i.value;
-      })
+      console.log("this.selectItem",this.selectItem)
+      this.selectedForm.select_item = this.selectItem
+      // this.selectItem.map(i => {
+      //   this.selectedForm.select_item.push({
+      //     i.key : i.value
+      //   })
+      // })
+
       this.selectedForm.rule = this.validation.join(",")
       console.log("this.selectedForm",this.selectedForm)
+      // return
       save(this.selectedForm).then(res=>{
         console.log("res",res)
         this.$Message.success('保存成功')
         this.$emit("refreshFormItem",'save')
+        this.showForm = false
       })
     },
 
@@ -197,14 +205,15 @@ export default {
     selectedForm(newVal) {
       console.log("newval",newVal)
       if(newVal) {
-        this.selectItem = [];
-        if(newVal.select_item && typeof newVal.select_item === "Array") {
-          for(let key in newVal.select_item) {
-            this.selectItem.push({
-              key,
-              value: newVal.select_item[key]
-            })
-          }
+        if(newVal.select_item) {
+          this.selectItem = [];
+          this.selectItem = newVal.select_item
+          // for(let key in newVal.select_item) {
+          //   this.selectItem.push({
+          //     key,
+          //     value: newVal.select_item[key]
+          //   })
+          // }
         }
         this.validation = []
         if(newVal.rule){
diff --git a/src/views/login/index copy.vue b/src/views/login/index copy.vue
deleted file mode 100644
index d50357a..0000000
--- a/src/views/login/index copy.vue	
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="login-container">
-
-    <vue-particles color="#ffffff" :particleOpacity="0.7" :particlesNumber="80" shapeType="circle" :particleSize="4"
-      linesColor="#ffffff" :linesWidth="1" :lineLinked="true" :lineOpacity="0.4" :linesDistance="150" :moveSpeed="3"
-      :hoverEffect="true" hoverMode="grab" :clickEffect="true" clickMode="push"> </vue-particles>
-
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
-      label-position="left">
-
-      <div class="title-container">
-        <h3 class="title">{{title}}</h3>
-      </div>
-
-      <el-form-item prop="username">
-        <span class="svg-container">
-          <svg-icon icon-class="user" />
-        </span>
-        <el-input ref="username" v-model="loginForm.username" placeholder="请输入登录名" name="username" type="text"
-          tabindex="1" auto-complete="on" />
-      </el-form-item>
-
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input :key="passwordType" ref="password" v-model="loginForm.password" :type="passwordType"
-          placeholder="请输入密码" name="password" tabindex="2" auto-complete="on" @keyup.enter.native="handleLogin" />
-        <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
-      </el-form-item>
-
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
-        @click.native.prevent="handleLogin">登录</el-button>
-
-
-    </el-form>
-  </div>
-</template>
-
-<script>
-  import {
-    validUsername
-  } from '@/utils/validate'
-
-  const defaultSettings = require('../../../src/settings.js')
-  export default {
-    name: 'Login',
-    data() {
-      const validateUsername = (rule, value, callback) => {
-        if (!validUsername(value)) {
-          callback(new Error('请正确输入登录名'))
-        } else {
-          callback()
-        }
-      }
-      const validatePassword = (rule, value, callback) => {
-        if (value.length < 6) {
-          callback(new Error('密码输入错误'))
-        } else {
-          callback()
-        }
-      }
-      return {
-        title: "",
-        loginForm: {
-          username: '',
-          password: ''
-        },
-        loginRules: {
-          username: [{
-            required: true,
-            trigger: 'blur',
-            validator: validateUsername
-          }],
-          password: [{
-            required: true,
-            trigger: 'blur',
-            validator: validatePassword
-          }]
-        },
-        loading: false,
-        passwordType: 'password',
-        redirect: undefined
-      }
-    },
-    watch: {
-      $route: {
-        handler: function(route) {
-          this.redirect = route.query && route.query.redirect
-        },
-        immediate: true
-      }
-    },
-    created() {
-      this.title = defaultSettings.title;
-    },
-    methods: {
-      showPwd() {
-        if (this.passwordType === 'password') {
-          this.passwordType = ''
-        } else {
-          this.passwordType = 'password'
-        }
-        this.$nextTick(() => {
-          this.$refs.password.focus()
-        })
-      },
-      //处理登录
-      handleLogin() {
-        this.$refs.loginForm.validate(valid => {
-          if (valid) {
-            this.loading = true
-            this.$store.dispatch('user/login', this.loginForm).then(() => {
-
-              this.$router.push({
-                path: this.redirect || '/'
-              })
-              this.loading = false
-            }).catch(() => {
-              this.loading = false
-            })
-          } else {
-            console.log('error submit!!')
-            return false
-          }
-        })
-      }
-    }
-  }
-</script>
-
-<style lang="scss">
-  #particles-js {
-    width: 100%;
-    height: 99%;
-    position: absolute;
-  }
-
-  /* 修复input 背景不协调 和光标变色 */
-  /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
-
-  $bg:#122583;
-  $light_gray:#122583;
-  $cursor: #122583;
-
-  @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-    .login-container .el-input input {
-      color: $cursor;
-    }
-  }
-
-  /* reset element-ui css */
-  .login-container {
-    .el-input {
-      display: inline-block;
-      height: 47px;
-      width: 85%;
-
-      input {
-        background: transparent;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 12px 5px 12px 15px;
-        color: $light_gray;
-        height: 47px;
-        caret-color: $cursor;
-
-        &:-webkit-autofill {
-          //box-shadow: 0 0 0px 1000px $bg inset !important;
-          //-webkit-text-fill-color: $cursor !important;
-        }
-      }
-    }
-
-    .el-form-item {
-      border: 1px solid rgba(255, 255, 255, 0.1);
-      background: rgba(0, 0, 0, 0.1);
-      border-radius: 5px;
-      color: #454545;
-    }
-  }
-</style>
-
-<style lang="scss" scoped>
-  $bg:#122583;
-  $dark_gray:#122583;
-  $light_gray:#122583;
-
-  .login-container {
-    min-height: 100%;
-    width: 100%;
-    //background-color: $bg;
-    background: url("../../assets/bg.jpg") no-repeat;
-    overflow: hidden;
-
-    .login-form {
-      position: relative;
-      width: 520px;
-      max-width: 100%;
-      padding: 20px 35px 0;
-      margin: 160px auto;
-      overflow: hidden;
-      background-color: #fff;
-    }
-
-    .tips {
-      font-size: 14px;
-      color: #fff;
-      margin-bottom: 10px;
-
-      span {
-        &:first-of-type {
-          margin-right: 16px;
-        }
-      }
-    }
-
-    .svg-container {
-      padding: 6px 5px 6px 15px;
-      color: $dark_gray;
-      vertical-align: middle;
-      width: 30px;
-      display: inline-block;
-    }
-
-    .title-container {
-      position: relative;
-
-      .title {
-        font-size: 26px;
-        color: $light_gray;
-        margin: 0px auto 40px auto;
-        text-align: center;
-        font-weight: bold;
-      }
-    }
-
-    .show-pwd {
-      position: absolute;
-      right: 10px;
-      top: 7px;
-      font-size: 16px;
-      color: $dark_gray;
-      cursor: pointer;
-      user-select: none;
-    }
-  }
-</style>
diff --git a/src/views/notice/components/addNotice.vue b/src/views/notice/components/addNotice.vue
index 80ebf08..b73bce0 100644
--- a/src/views/notice/components/addNotice.vue
+++ b/src/views/notice/components/addNotice.vue
@@ -15,7 +15,7 @@
       <template v-slot:image_id>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold;">
-            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>标题图片（750*400）：
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>标题图片（370*460）：
           </div>
           <div class="xy-table-item-content">
             <el-upload :action="action" class='upload-demo' :limit="1" list-type="picture-card" :file-list="imgList"
@@ -179,7 +179,8 @@
         }
         if (this.type == 'add') {
           this.form.id = ''
-        }
+        }
+        console.log("this.form",this.form)
         save({
           table_name: this.table_name,
           ...this.form