Browse Source

草稿箱

master
jiangyy 5 years ago
parent
commit
7fa358b889
  1. 4
      epmet-oper-web/.env.development
  2. 36
      epmet-oper-web/src/js/columns/code/draft.js
  3. 4
      epmet-oper-web/src/js/columns/code/temp.js
  4. 2
      epmet-oper-web/src/js/columns/columns.js
  5. 3
      epmet-oper-web/src/js/columns/customer/manage/customer.js
  6. 2
      epmet-oper-web/src/views/components/CTableNoPage.vue
  7. 14
      epmet-oper-web/src/views/modules/customer/init/RegisterList.vue
  8. 15
      epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue
  9. 216
      epmet-oper-web/src/views/modules/productConfig/MiniDraft.vue
  10. 4
      epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue
  11. 6
      epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue
  12. 17
      epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue
  13. 13
      epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue

4
epmet-oper-web/.env.development

@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_SERVER = http://192.168.1.130:8080/api
# VUE_APP_API_SERVER = http://10.10.10.17:8080/api
# VUE_APP_API_SERVER = http://192.168.51.36:8080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
VUE_APP_NODE_ENV=dev
VUE_APP_NODE_ENV=dev

36
epmet-oper-web/src/js/columns/code/draft.js

@ -0,0 +1,36 @@
export default{
list:[
{
key: 'draftId',
title: '草稿 id',
display: ['formA', 'formU', 'table', 'model'],
fixed: false,
block: true,
width: 60
},
{
key: 'userVersion',
title: '版本号',
type: 'input',
display: ['formA', 'formU', 'table', 'model'],
fixed: false,
block: true,
width: 60
},
{
key: 'userDesc',
title: '版本描述',
display: ['formA', 'formU', 'table', 'model'],
block: true,
width: 200
},
{
key: 'createTime',
title: '上传时间',
display: ['formA', 'formU', 'table', 'model'],
fixed: false,
block: true,
width: 80
}
]
}

4
epmet-oper-web/src/js/columns/code/temp.js

@ -29,11 +29,11 @@ export default [
},
{
key: 'userDesc',
title: '代码描述',
title: '版本描述',
type: 'textarea',
rule: [{
required: true,
message: '请输入代码描述',
message: '请输入版本描述',
trigger: 'blur'
}],
display: ['formA', 'formU', 'table', 'model'],

2
epmet-oper-web/src/js/columns/columns.js

@ -7,6 +7,7 @@ import Temp from './code/temp'
import CommitCode from './code/commitCode'
import OperHistory from './code/operHistory'
import Category from './code/category'
import Draft from './code/draft'
// 产品配置
import CustomizedFunction from './miniPro/customizedFunction'
@ -23,6 +24,7 @@ export default {
MiniProList: miniProManage, // 客户管理——代小程序管理——客户小程序列表
Temp: Temp, // 客户管理——代小程序管理——版本管理——模板list
DraftList: Draft['list'], // 客户管理——代小程序管理——模板管理——草稿list
CommitCodeList: CommitCode['list'], // 客户管理——代小程序管理——版本管理——代码上传——已上传的代码列表
CommitCodeForm: CommitCode['form'], // 客户管理——代小程序管理——版本管理——代码上传——代码form
OperHistory: OperHistory, // 客户管理——代小程序管理——版本管理——操作历史

3
epmet-oper-web/src/js/columns/customer/manage/customer.js

@ -168,6 +168,9 @@ export default {
trigger: 'blur'
}
],
option:{
max:1000
},
fixed: false,
block: true,
width: 100

2
epmet-oper-web/src/views/components/CTableNoPage.vue

@ -103,7 +103,7 @@
<!--操作列-->
<el-table-column v-if="operations.length && operations.length > 0"
label="操作"
:width="operationWidth"
:min-width="operationWidth"
fixed="right"
header-align="center"
class="operate">

14
epmet-oper-web/src/views/modules/customer/init/RegisterList.vue

@ -299,14 +299,16 @@ export default {
})
},
mounted () {
this.tableParams.source = this.env
this.tableParams.source = this.env
console.log("客户初始化列表------本地环境-----------------")
console.log(this.env)
if (this.env === 'test') {//
this.workAppid = config.appId.devWorkAppid
this.resiAppid = config.appId.devResiAppid
} else if (this.env === 'prod') {//
this.workAppid = config.appId.testWorkAppid
this.resiAppid = config.appId.testResiAppid
} else if (this.env === 'prod') {//
this.workAppid = config.appId.prodWorkAppid
this.resiAppid = config.appId.prodResiAppid
} else {//
this.workAppid = config.appId.devWorkAppid
this.resiAppid = config.appId.devResiAppid
@ -423,7 +425,7 @@ export default {
this.dataListLoading = true
this.selCustomerId = customerId
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcustomerlist',
const url = '/third/subscribe/getcustomerlist'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcustomerlist'
let params = {
customerId: customerId,
workAppId: this.workAppid,
@ -473,7 +475,7 @@ export default {
this.startLoading()
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/init'
const url = '/third/subscribe/init'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/init'
let params = {
customerId: this.selCustomerId,

15
epmet-oper-web/src/views/modules/customer/miniProAgent/MiniProList.vue

@ -144,6 +144,7 @@ export default {
// }
// }
],
//
showVersion: false,
@ -204,6 +205,16 @@ export default {
})
},
//
okTemp () {
this.showTemo = false
this.refresh()
},
//
cancelTemp () {
this.showTemo = false
},
//
versionManage (row) {
this.showVersion = true
@ -212,8 +223,8 @@ export default {
//
okVersion () {
this.showVersion = false
this.refresh()
// this.showVersion = false
// this.refresh()
},
//
cancelVersion () {

216
epmet-oper-web/src/views/modules/productConfig/MiniDraft.vue

@ -0,0 +1,216 @@
<template>
<div>
<el-card shadow="never"
class="aui-card--fill">
<el-tabs @tab-click="tabClick"
v-model="activeName"
class="el-tabs">
<el-tab-pane label="草稿箱"
name="draft">
<c-table column-type="index"
ref="table_draft"
:url="tableDraftUrl"
:params="tableDraftParams"
keyword="DraftList"
:tableHeight="tableHeight"
:operations="draftOperations"
:orderOperations="orderOperations"
@addToTemp="addToTemp">
</c-table>
</el-tab-pane>
<el-tab-pane label="模板库"
name="temp">
<c-table column-type="index"
ref="table_temp"
:url="tableTempUrl"
:params="tableTempParams"
keyword="Temp"
:tableHeight="tableHeight"
:operations="tempOperations"
:orderOperations="orderOperations"
@deleteTemp="deleteTemp">
</c-table>
</el-tab-pane>
</el-tabs>
</el-card>
</div>
</template>
<script>
import CTable from '@c/CTableNoPage'
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import { requestPost } from "@/js/dai/request";
let loading //
export default {
data () {
return {
loading: false,
activeName: 'draft',
//
selTempId: '',
// tableDraftUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/templatelist',
tableDraftUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/gettemplatedraftlist',
tableDraftParams: {
type: Object, // table
default () {
return {}
}
},
draftOperations: [
{
lable: '添加到模板库', //
size: 'mini',
style: 'margin: 0 6px;',
type: 'text',
slot: '',
plain: false,
methodName: 'addToTemp', //
isShow: (row) => {
return true
}
},
],
//
selTempId: '',
tableTempUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/templatelist',
tableTempParams: {
type: Object, // table
default () {
return {}
}
},
//
tempOperations: [
{
lable: '删除', //
size: 'mini',
style: 'margin: 0 6px;',
type: 'text',
slot: '',
plain: false,
methodName: 'deleteTemp', //
isShow: (row) => {
return true
}
},
],
orderOperations: [],
}
},
components: {
CTable
},
mounted () {
this.$nextTick(() => {
this.activeName = "draft"
this.getDraft()
this.getTemp()
})
},
computed: {
tableHeight () {
return this.clientHeight - 60 - 80 - 80
},
...mapGetters(['clientHeight'])
},
methods: {
tabClick (tab) {
this.$nextTick(() => {
this.$refs['table_' + tab.name].doLayout() //
})
},
// 稿
async getDraft () {
this.$refs.table_draft.loadData()
},
//
async addToTemp (row) {
this.startLoading()
const url = "https://epmet-cloud.elinkservice.cn/api/third/code/addtotemplate"
const params = {
draftId: row.draftId
}
const { data, code, msg, internalMsg } = await requestPost(url, params)
if (code === 0) {
this.$message.success("操作成功")
this.activeName = "temp"
this.getTemp()
this.$nextTick(() => {
this.$refs['table_temp'].doLayout() //
})
} else {
this.$message.error(msg + ":" + internalMsg)
}
this.endLoading()
},
//
getTemp () {
this.$refs.table_temp.loadData()
},
//
async deleteTemp (row) {
this.$confirm('确认删除当前模板', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
this.startLoading()
const url = "https://epmet-cloud.elinkservice.cn/api/third/code/deletetemplate"
const params = {
templateId: row.id
}
const { data, code, msg, internalMsg } = await requestPost(url, params)
if (code === 0) {
this.$message.success("操作成功")
this.getTemp()
} else {
this.$message.error(msg + ":" + internalMsg)
}
this.endLoading()
})
},
//
startLoading () {
loading = Loading.service({
lock: true, //
index: 100,
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
props: {
}
}
</script>
<style scoped >
</style>

4
epmet-oper-web/src/views/modules/productConfig/subscribe/MyTempList.vue

@ -100,7 +100,7 @@ export default {
async loadData () {
this.dataListLoading = true
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/gettemplate'
const url = '/third/subscribe/gettemplate'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/gettemplate'
const params = {
appId: this.appId
}
@ -142,7 +142,7 @@ export default {
async del (row) {
this.startLoading()
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/deltemplate'
const url = '/third/subscribe/deltemplate'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/deltemplate'
const params = {
appId: this.appId,
priTmplId: row.priTmplId

6
epmet-oper-web/src/views/modules/productConfig/subscribe/TempEdit.vue

@ -109,7 +109,7 @@
</div>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button @click="handleClose()">{{ $t('cancel') }}</el-button>
<el-button type="primary"
@click="saveForm()">{{ $t('confirm') }}</el-button>
</template>
@ -167,7 +167,7 @@ export default {
async getkeywords () {
this.startLoading()
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getkeywords'
const url = '/third/subscribe/getkeywords'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getkeywords'
let _data = {
appId: this.resiAppid,
titleId: this.dataForm.tid
@ -219,7 +219,7 @@ export default {
return false
}
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/addtemplate'
const url = '/third/subscribe/addtemplate'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/addtemplate'
this.dataForm.kidList = this.kidSelIdList
this.dataForm.nameList = this.kidSelNameList
console.log(this.dataForm)

17
epmet-oper-web/src/views/modules/productConfig/subscribe/TempList.vue

@ -150,13 +150,14 @@ export default {
mounted () {
this.activeName = 'mine'
console.log("模板列表------本地环境-----------------")
console.log(this.env)
if (this.env === 'test') {//
this.workAppid = config.appId.devWorkAppid
this.resiAppid = config.appId.devResiAppid
} else if (this.env === 'prod') {//
this.workAppid = config.appId.testWorkAppid
this.resiAppid = config.appId.testResiAppid
} else if (this.env === 'prod') {//
this.workAppid = config.appId.prodWorkAppid
this.resiAppid = config.appId.prodResiAppid
} else {//
this.workAppid = config.appId.devWorkAppid
this.resiAppid = config.appId.devResiAppid
@ -187,7 +188,7 @@ export default {
async renderSelData () { // //
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getcategory'
const url = '/third/subscribe/getcategory'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getcategory'
let params = {
appId: this.resiAppid
}
@ -204,7 +205,7 @@ export default {
async loadData () {
this.dataListLoading = true
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/getpubtemplatetitles'
const url = '/third/subscribe/getpubtemplatetitles'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/getpubtemplatetitles'
this.tableParams.appId = this.resiAppid
@ -268,8 +269,8 @@ export default {
//
async syncSub () {
this.startLoading()
const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/syncpubtemplatetitles'
// const url = '/third/subscribe/syncpubtemplatetitles'
// const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/subscribe/syncpubtemplatetitles'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/subscribe/syncpubtemplatetitles'
let params = {
customerId: this.selCustomerId,

13
epmet-oper-web/src/views/modules/productConfig/topicConfig/TopicConfig.vue

@ -1,11 +1,11 @@
<template>
<div class="main_div"
:style="{height:tableHeight}">
<div class="main_div">
<div>
<el-tabs v-model="activeName"
@tab-click="tabChange"
class="el-tabs">
class="el-tabs"
:style="{height:tableHeight,overflowY:'hidden',overflowX:'hidden'}">
<!-- 话题部分 -->
<el-tab-pane label="话题"
@ -533,7 +533,7 @@ export default {
tableHeight () {
return this.clientHeight
return (this.clientHeight - 140) + 'px'
},
@ -561,11 +561,9 @@ export default {
<style scoped >
.main_div {
margin: 10px;
background-color: white;
padding: 10px;
padding: 10px 20px 10px 20px;
border-radius: 5px;
height: 500px;
}
.clearfix {
height: 25px;
@ -576,7 +574,6 @@ export default {
}
.topic_item_div {
margin: 10px 0 0px 10px;
height: 100px;
}
.topic_item_title {
margin: 0 0 10px 0;

Loading…
Cancel
Save