Merge branch 'master' of http://git.ycjcjy.com/fuxingfan/foyo

# Conflicts:
#	vue-element-admin/src/api/case.js
#	vue-element-admin/src/store/modules/case.js

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

@@ -19,6 +19,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 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>
     * 案列类型表  前端控制器
@@ -43,7 +47,7 @@ public class TaCaseTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taCaseType",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/caseType/list",method= RequestMethod.GET)
     public ResponseBean taCaseTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -68,10 +72,12 @@ public class TaCaseTypeController extends BaseController {
      * @param taCaseType 实体对象
      * @return
      */
-    @RequestMapping(value="/taCaseType",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/caseType/add",method= RequestMethod.POST)
     public ResponseBean taCaseTypeAdd(@RequestBody TaCaseType taCaseType){
         ResponseBean responseBean = new ResponseBean();
         try {
+            taCaseType.setCreateBy(ConstantFoyo.USER_ADMIN);
+            taCaseType.setCreateTime(LocalDateTime.now());
             if (iTaCaseTypeService.save(taCaseType)){
                 responseBean.addSuccess(taCaseType);
             }else {
@@ -86,15 +92,15 @@ public class TaCaseTypeController extends BaseController {
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 根据id批量删除对象
      */
     @ResponseBody
-    @RequestMapping(value="/taCaseType/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taCaseTypeDelete(@PathVariable Integer id){
+    @RequestMapping(value="/admin/caseType/delete", method= RequestMethod.DELETE)
+    public ResponseBean taCaseTypeDelete(@RequestBody String[] ids){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaCaseTypeService.removeById(id)){
+            List<String> idList = Arrays.asList(ids);
+            if(iTaCaseTypeService.removeByIds(idList)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");

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

@@ -42,7 +42,30 @@ export function getCaseTypeListData(query) {
 export function addCase(data) {
   return request({
     url: '/case/add',
+    method: 'post'
+  })
+}
+
+export function serviceCaseList(query) {
+  return request({
+    url: 'caseType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addServiceCase(data) {
+  return request({
+    url: '/caseType/add',
     method: 'post',
     data
   })
 }
+
+export function deleteServiceCaseBatch(data) {
+  return request({
+    url: '/caseType/delete',
+    method: 'delete',
+    data
+  })
+}

vue-element-admin/src/router/index.js

@@ -148,6 +148,19 @@ export const constantRouterMap = [
         component: () => import('@/views/case/cover'),
         name: 'case-cover',
         meta: { title: '编辑封面图', icon: 'table' }
+      },
+      {
+        path: '/servicecase',
+        component: () => import('@/views/case/servicecase/index'),
+        name: 'servicecase-index',
+        meta: { title: '案例类型列表', icon: 'table' }
+      },
+      {
+        path: '/servicecase/add',
+        component: () => import('@/views/case/servicecase/add'),
+        name: 'servicecase-add',
+        hidden: true,
+        meta: { title: '新增案例类型', icon: 'table' }
       }
     ]
   }

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

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

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

@@ -0,0 +1,234 @@
+<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.typeName"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="排序">
+        <el-input v-model="form.sort"/>
+      </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-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogForm('0')">取 消</el-button>
+      <el-button type="primary" @click="dialogForm('1')">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+// 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
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+export default {
+  name: 'UpdateBanner',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: 0,
+      listLoading: true,
+      imageUrl: '', // 图片预览
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      communityQuery: {
+        pageNum: 1,
+        pageSize: 300,
+        communityId: undefined,
+        communityName: undefined,
+        provinceId: undefined,
+        cityId: undefined,
+        districtId: undefined
+      },
+      listQuery: [],
+      form: {
+        id: '',
+        serviceName: '',
+        sort: '',
+        serviceImageUrl: '',
+        labelList: []
+      },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      dialogStatus: '',
+      downloadLoading: false,
+      formLabelWidth: '120px',
+      showContentVisible: false,
+      showURLVisible: true,
+      bannerPositionArr: [
+        { id: 1, value: '首页banner' },
+        { id: 2, value: '服务banner' }
+      ],
+      dynamicTags: [],
+      inputVisible: false,
+      inputValue: ''
+    }
+  },
+  computed: {
+  },
+  created() {
+    this.listQuery = this.$route.params.listQuery
+  },
+  updated() {
+  },
+  methods: {
+    handleAvatarSuccess(res, file) { // 上传成功回调
+      this.imageUrl = URL.createObjectURL(file.raw)
+      this.form.serviceImageUrl = res.data[0]
+    },
+    dialogAddForm() {
+      this.dialogFormVisible = true
+      this.form.typeName = ''
+      this.form.sort = ''
+      this.form.serviceImageUrl = ''
+    },
+    dialogForm(isVaule) {
+      if (isVaule === '0') {
+        this.$router.push({ name: 'servicecase-index' })
+      } else {
+        this.createData()
+      }
+    },
+    showContent() {
+      if (this.form.bannerType === '1') {
+        this.showContentVisible = false
+        this.showURLVisible = true
+      } else {
+        this.showContentVisible = true
+        this.showURLVisible = false
+      }
+    },
+    createData() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.form.labelList = this.dynamicTags
+          this.$store.dispatch('servicecase/addServiceCase', this.form).then((res) => {
+            if (res.data.code === '0') {
+              this.$message({
+                message: res.data.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'servicecase-index' })
+            } else {
+              this.$message({
+                message: res.data.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
+      })
+    },
+    handleClose(tag) {
+      this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1)
+    },
+    showInput() {
+      this.inputVisible = true
+      this.$nextTick(_ => {
+        this.$refs.saveTagInput.$refs.input.focus()
+      })
+    },
+    handleInputConfirm() {
+      const inputValue = this.inputValue
+      if (inputValue) {
+        this.dynamicTags.push(inputValue)
+      }
+      this.inputVisible = false
+      this.inputValue = ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container {
+  width: 50%;
+  margin: auto;
+}
+.dialog-footer {
+  text-align: center;
+}
+.el-tag + .el-tag {
+    margin-left: 10px;
+  }
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+</style>
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
+.avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+

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

@@ -0,0 +1,283 @@
+<template>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <!-- <el-form-item label="业务名称">
+        <el-input v-model="listQuery.serviceName" placeholder="业务名称" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clearListQuery">清空</el-button>
+        <el-button type="primary" @click="handleFilter">查询</el-button>
+      </el-form-item> -->
+    </el-form>
+    <div class="operation">
+      <div>
+        <el-button type="primary" @click="addServiceCase">新增案例类型</el-button>
+        <el-button type="danger" @click="deleteServiceCase">删除</el-button>
+      </div>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="serviceCaseList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="类型名称" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.typeName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="排序" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.sort }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center">
+        <template slot-scope="scope">
+          <span>{{ formatDate(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import waves from '@/directive/waves' // Waves directive
+import { parseTime } from '@/utils'
+
+export default {
+  directives: { waves },
+  data() {
+    var _self = this
+    return {
+      events: {
+        click: (e) => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          _self.detail.longitude = e.lnglat.lng
+          _self.detail.latitude = e.lnglat.lat
+        }
+      },
+      markers: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      serviceCaseList: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 20,
+        typeName: undefined
+      },
+      ids: [], // id集合
+      tableKey: 0,
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    setCurrent(item) {
+      this.setDetail({ ...item })
+    },
+    getList() {
+      this.listLoading = true
+      this.$store.dispatch('servicecase/getServiceCaseList', this.listQuery).then((res) => {
+        console.log(res)
+        this.serviceCaseList = res.data.data.records
+        this.total = res.data.data.total
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
+    clearListQuery() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.billId = undefined
+      this.listQuery.billName = undefined
+      this.listQuery.billExplain = undefined
+      this.getList()
+    },
+    getInfo(billId, billStatus) {
+      if (billStatus === '2') {
+        this.$router.push({ name: 'bill-edi', query: { id: billId }})
+      } else {
+        this.$router.push({ name: 'bill-info', query: { id: billId }})
+      }
+    },
+    addServiceCase() {
+      this.$router.push({ name: 'servicecase-add' })
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.getList()
+    },
+    handleModifyStatus(row, status) {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      })
+      row.status = status
+    },
+    sortChange(data) {
+      const { prop, order } = data
+      if (prop === 'id') {
+        this.sortByID(order)
+      }
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.listQuery.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.listQuery.pageNum = val
+      this.getList()
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+    handleUpdate(row) {
+      this.setCurrent(row)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.getEditCityList()
+      this.getEditDistrictList()
+    },
+    handleLook(id) {
+      this.$router.push({ name: 'transaction-info', params: { id: id }})
+    },
+    handleCreate() {
+      this.resetDetail()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    handleDelete(row) {
+      this.$notify({
+        title: '成功',
+        message: '删除成功',
+        type: 'success',
+        duration: 2000
+      })
+      const index = this.list.indexOf(row)
+      this.list.splice(index, 1)
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+        const data = this.formatJson(filterVal, this.list)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: 'table-list'
+        })
+        this.downloadLoading = false
+      })
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = this.padDate(value.getMonth() + 1)
+      var day = this.padDate(value.getDate())
+      var hour = this.padDate(value.getHours())
+      var minutes = this.padDate(value.getMinutes())
+      var seconds = this.padDate(value.getSeconds())
+      return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    },
+    deleteServiceCase() { // 删除
+      if (this.ids.length <= 0) {
+        this.$message.error('请至少选择一项')
+        return
+      }
+      this.$store.dispatch('servicecase/deleteServiceCase', this.ids).then(res => {
+        const resCode = res.data.code
+        if (resCode === '0') {
+          this.$message.success('删除成功')
+          this.getList()
+          return
+        }
+        this.$message.error(res.data.message)
+      }).catch(() => {
+        console.log('DeleteBillBeach error')
+      })
+    },
+    handleSelectionChange(val) { // 选择
+      console.log(val)
+      this.ids = []
+
+      val.map((item, index) => {
+        console.log(item, index)
+        this.ids.push(item.id)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+</style>