Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_web

src/api/modules/updateLogApi.js

@@ -0,0 +1,42 @@
+/* ETA版本更新日志api */
+import http from "@/api/http.js"
+
+export const updateLogInterface = {
+    /**
+     * 版本更新日志列表
+     * @param Keyword String
+     * @param SortType  Number
+     * @param PageSize Number
+     * @param CurrentIndex Number
+     * @param {*} params 
+     */
+    getLogList:(params)=>{
+        return http.get('/eta_version_update_log/page_list',params)
+    },
+    /**
+     * 新增更新日志
+     * @param Version String
+     * @param Content String
+     * @param UpdateDate String
+     */
+    addLogData:(params)=>{
+        return http.post('/eta_version_update_log/add',params)
+    },
+    /**
+     * 编辑更新日志
+     * @param Id Number 
+     * @param Version String
+     * @param Content String
+     * @param UpdateDate String
+     */
+    editLogData:(params)=>{
+        return http.post('/eta_version_update_log/edit',params)
+    },
+    /**
+     * 删除更新日志
+     * @param Id Number
+     */
+    deleteLogData:(params)=>{
+        return http.post('/eta_version_update_log/del',params)
+    }
+}

src/routes/modules/operateRoutes.js

@@ -55,6 +55,12 @@ export default [
 				name: '语音播报管理',
 				hidden: false,
 			},
+			{
+				path:"updateLogManage",
+				component: () => import('@/views/system_manage/updateLogManage.vue'),
+				name: '更新日志配置',
+				hidden: false,
+			},
         ]
     }
 ]

src/views/system_manage/components/logSetDialog.vue

@@ -0,0 +1,136 @@
+<template>
+    <el-dialog
+        :visible.sync="isLogSetShow"
+        :close-on-click-modal="false"
+        :modal-append-to-body='false'
+        title="添加日志"
+        @close="closeDia"
+        width="820px"
+        v-dialogDrag
+        center
+    >
+        <div class="log-set-wrap">
+            <el-form :model="formData" :rules="rules" inline label-width="80px" ref="logForm">
+                <el-form-item label="版本号" prop="Version">
+                    <el-input v-model="formData.Version" placeholder="请输入版本号" style="width:100%"></el-input>
+                </el-form-item>
+                <el-form-item label="更新内容" prop="Content" class="update-text">
+                    <div class="rich-editor-wrap">
+                        <froala :id="`log-editor`"
+                            :ref="`logEditor`" 
+                            :tag="'textarea'" 
+                            :config="richEditorConfig" v-model="formData.Content">
+                        </froala>
+                    </div>
+                </el-form-item>
+                <el-form-item label="更新日期" prop="UpdateDate">
+                    <el-date-picker
+                        v-model="formData.UpdateDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-form>
+            <div class="btn-wrap" style="text-align: center;margin-bottom: 25px;">
+                <el-button type="primary" plain style="width:200px;" @click="closeDia">取消</el-button>
+                <el-button type="primary"  style="margin-left:50px;width:200px;" @click="saveLog">保存</el-button>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    props:{
+        isLogSetShow:{
+            type:Boolean,
+            default:false
+        },
+        logInfo:{
+            type:Object,
+            default:()=>{ return {}}
+        }
+        
+    },
+    watch:{
+        isLogSetShow(newVal){
+            if(newVal){
+                this.logInfo.Version
+                ?(this.formData = _.cloneDeep(this.logInfo))
+                :(this.formData = {Content:'',UpdateDate:this.$moment(new Date()).format('yyyy-MM-DD')})
+            }
+        }
+    },
+    data() {
+        return {
+            value1:'',
+            formData:{},
+            rules:{
+                Version:[{ required: true, message: '请输入版本号', trigger: 'blur' }],
+                Content:[{ required: true, message: '请输入更新内容', trigger: 'blur' }],
+                UpdateDate:[{ required: true, message: '请选择更新日期', trigger: 'blur' }]
+            },
+            richEditorConfig:{
+                toolbarButtons:[
+                    'textColor',
+                    'bold',
+                    'italic',
+                    'underline',
+                    'fontFamily',
+                    'fontSize',
+                    'align',
+                    'outdent',
+                    'indent',
+                    'specialCharacters',
+                    'insertHR',
+                    'selectAll',
+                    'clearFormatting',
+                    'undo',
+                    'redo',
+                ],
+                height:220,
+                fontSizeDefaultSelection: "16",
+                quickInsertEnabled: false,
+                pasteAllowedStyleProps: ['font-family', 'font-size', 'color'],
+                language: "zh_cn",
+                placeholderText:'请输入更新内容',
+                wordPasteKeepFormatting:false,
+                pastePlain:true,
+                wordPasteModal:false,
+                pluginsEnabled:['colors'],//定义可用插件
+            },//富文本编辑器配置项
+        };
+    },
+    methods: {
+        closeDia(){
+            this.$emit('close')
+        },
+        saveLog(){
+            this.formData.Content = this.formData.Content.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
+            this.$refs.logForm.validate((valid)=>{
+                if(valid){
+                    this.$emit('saveLog',this.formData)
+                }
+            })
+            
+        }
+    },
+};
+</script>
+
+<style lang="scss">
+.log-set-wrap{
+    .el-form{
+        .el-form-item.update-text{
+            display: flex;
+            .el-form-item__content{
+                flex:1;
+            }
+        }
+    }
+}
+</style>
+<style scoped lang="scss">
+
+</style>

src/views/system_manage/updateLogManage.vue

@@ -0,0 +1,175 @@
+<template>
+    <div class="update-log-manage-wrap">
+        <div class="top-wrap">
+            <el-button type="primary" @click="isLogSetShow=true">添加日志</el-button>
+            <!-- <el-date-picker
+                v-model="timeRange"
+                type="daterange"
+                clearable
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+            </el-date-picker> -->
+            <el-input v-model="searchText" @input="getTableData"
+                prefix-icon="el-icon-search" placeholder="输入更新内容检索" clearable></el-input>
+        </div>
+        <div class="table-wrap">
+            <el-table :data="tableData" 
+            @sort-change="sortChangeHandle" border>
+                <el-table-column 
+                    v-for="item in tableColumns" :key="item.key"
+                    :label="item.label" :sortable="item.sort" 
+                    align="center"
+                    >
+
+                    <template slot-scope="{row}">
+                        <div v-if="item.key==='Content'" v-html="row[item.key]"></div>
+                        <span v-else>{{ row[item.key] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template slot-scope="{row}">
+                        <el-button type="text" @click="handleEditLog(row)">编辑</el-button>
+                        <el-button type="text" style="color: red;" @click="handleDeleteLog(row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination 
+                layout="prev,pager,next,total" 
+                background
+                :current-page="pageNo"
+                @current-change="currentChange"
+                :page-size="pageSize" 
+                :total="total"
+                >
+            </el-pagination>
+        </div>
+        <LogSetDialog 
+            :isLogSetShow="isLogSetShow"
+            :logInfo="logInfo"
+            @saveLog="saveLog"
+            @close="()=>{logInfo = {};isLogSetShow = false}"
+        />
+    </div>
+</template>
+
+<script>
+import LogSetDialog from './components/logSetDialog.vue';
+import {updateLogInterface} from '@/api/modules/updateLogApi';
+export default {
+    components: { LogSetDialog },
+    data() {
+        return {
+            /* select */
+            timeRange: null,
+            searchText: '',
+            /* dialog */
+            logInfo:{},
+            isLogSetShow:false,
+            /* table */
+            tableData: [],
+            tableColumns: [
+                {
+                    label: '更新内容',
+                    key: 'Content'
+                },
+                {
+                    label: '版本号',
+                    key: 'Version'
+                },
+                {
+                    label: '更新日期',
+                    key: 'UpdateDate',
+                    sort:true
+                },
+            ],
+            pageNo: 1,
+            pageSize: 10,
+            total: 0,
+            sortType:0,
+        };
+    },
+    methods: {
+        getTableData(){
+            updateLogInterface.getLogList({
+                Keyword:this.searchText,
+                SortType:this.sortType,
+                CurrentIndex:this.pageNo,
+                PageSize:this.pageSize
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.tableData = res.Data.List||[]
+                this.total = res.Data.Paging.Totals
+            })
+        },
+        currentChange(page) {
+            this.pageNo = page;
+            this.getTableData()
+        },
+        sortChangeHandle(params){
+            this.sortType = params.order === 'ascending' ? 1 :params.order === 'descending' ? 2 : 0
+            this.pageNo = 1
+            this.getTableData()
+        },
+        handleEditLog(row){
+            this.logInfo = row
+            this.isLogSetShow = true
+        },
+        handleDeleteLog(row){
+            //二次确认
+            this.$confirm('删除操作不可恢复，确认删除吗?','提示',{
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                updateLogInterface.deleteLogData({Id:row.Id}).then(res=>{
+                    if(res.Ret!==200) return
+                    this.$message.success('删除成功')
+                    this.getTableData()
+                })
+            }).catch(() => {});
+        },
+        async saveLog(form){
+            const res = form.Id
+                        ?await updateLogInterface.editLogData(form)
+                        :await updateLogInterface.addLogData(form)
+            if(res.Ret!==200) return 
+            this.$message.success(`${form.Id?'编辑':'添加'}成功`)
+            this.getTableData()
+            this.isLogSetShow = false
+        }
+    },
+    mounted(){
+        this.getTableData()
+    }
+    
+};
+</script>
+
+<style scoped lang="scss">
+.update-log-manage-wrap{
+    padding:30px;
+    background-color: #fff;
+    border-radius: 4px;
+    .top-wrap{
+        display: flex;
+        justify-content: space-between;
+        .el-date-editor{
+            margin-left: auto;
+        }
+        .el-input{
+            margin-left:30px;
+            width:420px;
+        }
+    }
+    .table-wrap{
+        margin-top: 30px;
+        .el-pagination{
+            margin-top: 30px;
+            text-align: right;
+        }
+    }
+
+}
+</style>