case

foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -94,14 +96,14 @@ public class TaCaseController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taCase/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taCaseDelete(@PathVariable Integer id){
+    @RequestMapping(value="/admin/case/delete", method= RequestMethod.DELETE)
+    public ResponseBean taCaseDelete(@RequestBody String[] ids){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaCaseService.removeById(id)){
+            List<String> idList = Arrays.asList(ids);
+            if(iTaCaseService.removeByIds(idList)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -142,7 +144,7 @@ public class TaCaseController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taCase/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/case/{id}",method= RequestMethod.GET)
     public ResponseBean taCaseGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

foyo-service/src/main/java/com/huiju/foyo/model/TaCase.java

@@ -96,6 +96,9 @@ public class TaCase implements Serializable {
      * 案例内容
      */
     private String content;
-
-
+    
+    /**
+     * 发布类型
+     */
+    private String type;
 }

vue-element-admin/src/api/case.js

@@ -42,7 +42,8 @@ export function getCaseTypeListData(query) {
 export function addCase(data) {
   return request({
     url: '/case/add',
-    method: 'post'
+    method: 'post',
+    data
   })
 }
 
@@ -69,3 +70,18 @@ export function deleteServiceCaseBatch(data) {
     data
   })
 }
+
+export function deleteCaseBatch(data) {
+  return request({
+    url: '/case/delete',
+    method: 'delete',
+    data
+  })
+}
+
+export function getCaseDetailById(id) {
+  return request({
+    url: '/case/' + id,
+    method: 'get'
+  })
+}

vue-element-admin/src/store/modules/case.js

@@ -1,4 +1,4 @@
-import { serviceCaseCover, addCaseCover, getCaseListData, deleteServiceBatch, addCase, getCaseTypeListData, serviceCaseList, addServiceCase, deleteServiceCaseBatch } from '@/api/case'
+import { serviceCaseCover, addCaseCover, getCaseListData, deleteServiceBatch, addCase, getCaseTypeListData, serviceCaseList, addServiceCase, deleteServiceCaseBatch, deleteCaseBatch, getCaseDetailById } from '@/api/case'
 
 const servicecase = {
   namespaced: true,
@@ -84,6 +84,24 @@ const servicecase = {
           reject(error)
         })
       })
+    },
+    deleteCase({ commit, state }, data) { // 删除
+      return new Promise((resolve, reject) => {
+        deleteCaseBatch(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    getCaseDetail({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getCaseDetailById(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

vue-element-admin/src/views/case/add.vue

@@ -52,6 +52,12 @@
           active-value="1"
           inactive-value="0"/>
       </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="发布类型">
+        <el-select v-model="form.type" placeholder="请选择发布类型">
+          <el-option key="case" value="case" label="案例"/>
+          <el-option key="movement" value="movement" label="动态"/>
+        </el-select>
+      </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogForm('0')">取 消</el-button>
@@ -122,7 +128,8 @@ export default {
         caseSummary: '',
         caseIndustry: '',
         topping: 0,
-        content: ''
+        content: '',
+        type: 'case'
       },
       uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',

vue-element-admin/src/views/case/edit.vue

@@ -1,13 +1,10 @@
 <template>
   <div id="app" class="app-container">
     <el-form ref="form" :model="form">
-      <el-form-item :label-width="formLabelWidth" label="业务名称">
-        <el-input v-model="form.serviceName"/>
+      <el-form-item :label-width="formLabelWidth" label="案例标题">
+        <el-input v-model="form.caseTitle"/>
       </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="权重">
-        <el-input v-model="form.sort"/>
-      </el-form-item>
-      <el-form-item :label-width="formLabelWidth" label="banner图">
+      <el-form-item :label-width="formLabelWidth" label="案例封面图">
         <el-upload
           :action= "uploadImgUrl"
           :show-file-list="false"
@@ -18,24 +15,48 @@
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
         </el-upload>
       </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="案例简介">
+        <el-input v-model="form.caseSummary"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="案例类型">
+        <el-select v-model="form.taCaseTypeId" placeholder="请选择案例类型">
+          <el-option v-for="item in caseTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="案例客户方logo">
+        <el-upload
+          :action= "uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleLogoSuccess"
+          class="avatar-uploader"
+          name="uploadFiles">
+          <img v-if="logoUrl" :src="logoUrl" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"/>
+        </el-upload>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="所属行业">
+        <el-input v-model="form.caseIndustry"/>
+      </el-form-item>
       <el-form-item>
-        <el-tag
-          v-for="tag in dynamicTags"
-          :key="tag"
-          :disable-transitions="false"
-          closable
-          @close="handleClose(tag)">
-          {{ tag }}
-        </el-tag>
-        <el-input
-          v-if="inputVisible"
-          ref="saveTagInput"
-          v-model="inputValue"
-          size="small"
-          class="input-new-tag"
-          @keyup.enter.native="handleInputConfirm"
-          @blur="handleInputConfirm"/>
-        <el-button v-else class="button-new-tag" closable @click="showInput">+ 添加标签</el-button>
+        <p class="title">案例内容</p>
+        <div id="websiteEditorElem" style="height: 400px"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="权重">
+        <el-input v-model="form.sort"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="是否置顶">
+        <el-switch
+          v-model="form.topping"
+          :active-value="1"
+          :inactive-value="0"
+          active-color="#13ce66"
+          inactive-color="#ff4949"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="发布类型">
+        <el-select v-model="form.type" placeholder="请选择发布类型">
+          <el-option key="case" value="case" label="案例"/>
+          <el-option key="movement" value="movement" label="动态"/>
+        </el-select>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -49,6 +70,7 @@
 // import { updateArticle, createBanner } from '@/api/banner' // getBanner
 import waves from '@/directive/waves' // Waves directive
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import E from 'wangeditor'
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
   { key: 'US', display_name: 'USA' },
@@ -84,6 +106,7 @@ export default {
       total: 0,
       listLoading: true,
       imageUrl: '', // 图片预览
+      logoUrl: '', // 图片预览
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
       communityQuery: {
@@ -98,10 +121,15 @@ export default {
       listQuery: [],
       form: {
         id: '',
-        serviceName: '',
+        caseTitle: '',
         sort: '',
-        serviceImageUrl: '',
-        labelList: []
+        caseCoverImg: '',
+        caseLogoImg: '',
+        caseSummary: '',
+        caseIndustry: '',
+        topping: 0,
+        content: '',
+        type: 'case'
       },
       uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',
@@ -109,6 +137,7 @@ export default {
       formLabelWidth: '120px',
       showContentVisible: false,
       showURLVisible: true,
+      caseTypeList: [],
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
@@ -118,17 +147,66 @@ export default {
       inputValue: ''
     }
   },
-  computed: {
+  mounted() {
+    const _that = this
+    const phoneEditor = new E('#websiteEditorElem')
+    phoneEditor.customConfig.zIndex = 1
+    phoneEditor.customConfig.onchange = function(html) {
+      _that.form.content = html
+      console.log('that.dynamic.url', _that.form.content)
+    }
+    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
+    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
+
+    phoneEditor.customConfig.customUploadImg = function(files, insert) {
+      _that.uploadImg(files[0]).then(data => {
+        insert(data)
+      })
+    }
+    phoneEditor.customConfig.menus = [
+      'head', // 标题
+      'bold', // 粗体
+      'fontSize', // 字号
+      'fontName', // 字体
+      'italic', // 斜体
+      'underline', // 下划线
+      'strikeThrough', // 删除线
+      'foreColor', // 文字颜色
+      'backColor', // 背景颜色
+      'justify', // 对齐方式
+      'image' // 插入图片
+    ]
+    phoneEditor.create()
+
+    this.$store.dispatch('servicecase/getCaseDetail', this.$route.params.id).then((res) => {
+      if (res.data.code === '0') {
+        console.log(res.data.data)
+        this.imageUrl = res.data.data.caseCoverImg
+        this.logoUrl = res.data.data.caseLogoImg
+        this.form = res.data.data
+        phoneEditor.txt.html(res.data.data.content)
+      } else {
+        this.$message({
+          message: res.data.message,
+          type: 'warning'
+        })
+      }
+    })
   },
   created() {
-    this.listQuery = this.$route.params.listQuery
+    this.getCaseTypeList()
+    // this.getCaseDetail(this.$route.params.id)
   },
   updated() {
   },
   methods: {
     handleAvatarSuccess(res, file) { // 上传成功回调
       this.imageUrl = URL.createObjectURL(file.raw)
-      this.form.serviceImageUrl = res.data[0]
+      this.form.caseCoverImg = res.data[0]
+    },
+    handleLogoSuccess(res, file) { // 上传成功回调
+      this.logoUrl = URL.createObjectURL(file.raw)
+      this.form.caseLogoImg = res.data[0]
     },
     dialogAddForm() {
       this.dialogFormVisible = true
@@ -138,7 +216,7 @@ export default {
     },
     dialogForm(isVaule) {
       if (isVaule === '0') {
-        this.$router.push({ name: 'service-index' })
+        this.$router.push({ name: 'case-index' })
       } else {
         this.createData()
       }
@@ -156,13 +234,13 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.form.labelList = this.dynamicTags
-          this.$store.dispatch('service/createService', this.form).then((res) => {
+          this.$store.dispatch('servicecase/createCase', this.form).then((res) => {
             if (res.data.code === '0') {
               this.$message({
                 message: res.data.message,
                 type: 'success'
               })
-              this.$router.push({ name: 'service-index' })
+              this.$router.push({ name: 'case-index' })
             } else {
               this.$message({
                 message: res.data.message,
@@ -173,6 +251,21 @@ export default {
         }
       })
     },
+    getCaseDetail(id) {
+      this.$store.dispatch('servicecase/getCaseDetail', id).then((res) => {
+        if (res.data.code === '0') {
+          console.log(res.data.data)
+          this.imageUrl = res.data.data.caseCoverImg
+          this.logoUrl = res.data.data.caseLogoImg
+          this.form = res.data.data
+        } else {
+          this.$message({
+            message: res.data.message,
+            type: 'warning'
+          })
+        }
+      })
+    },
     handleClose(tag) {
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1)
     },
@@ -189,12 +282,24 @@ export default {
       }
       this.inputVisible = false
       this.inputValue = ''
+    },
+    getCaseTypeList() {
+      this.$store.dispatch('servicecase/getCaseTypeList', this.form).then((res) => {
+        if (res.data.code === '0') {
+          this.caseTypeList = res.data.data
+        }
+      })
     }
   }
 }
 </script>
 
 <style scoped>
+.title{
+    font-size: 14px;
+    color: #606266;
+    font-weight: 600;
+}
 .app-container {
   width: 50%;
   margin: auto;

vue-element-admin/src/views/case/index.vue

@@ -59,6 +59,11 @@
           <span>{{ formatDate(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="操作" class-name="status-col" align="center">
+        <template slot-scope="scope">
+          <el-button type="primary" icon="el-icon-edit" @click="updateCase(scope.row.id)">修改</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <div class="block">
       <el-pagination
@@ -144,6 +149,9 @@ export default {
     addCase() {
       this.$router.push({ name: 'case-add' })
     },
+    updateCase(id) {
+      this.$router.push({ name: 'case-edit', params: { id }})
+    },
     handleFilter() {
       this.listQuery.pageNum = 1
       this.getList()
@@ -255,7 +263,7 @@ export default {
         this.$message.error('请至少选择一项')
         return
       }
-      this.$store.dispatch('service/deleteService', this.ids).then(res => {
+      this.$store.dispatch('servicecase/deleteCase', this.ids).then(res => {
         const resCode = res.data.code
         if (resCode === '0') {
           this.$message.success('删除成功')