@@ -469,12 +479,12 @@ export default {
.role-list-box{
.role-tree {
position: absolute;
- //top: 134px;
- top: 94px;
+ //top: 94px;
+ top: 72px;
left: 0;
width: 250px;
- //height: calc(100% - 134px);
- height: calc(100% - 94px);
+ //height: calc(100% - 94px);
+ height: calc(100% - 72px);
overflow: hidden;
overflow-y: auto;
padding-left: 20px;
diff --git a/src/views/upms/views/userLoginLogs/index.vue b/src/views/upms/views/userLoginLogs/index.vue
index ef8806f661ae2ecf002dab93825565ea2efe2097..ca825ef09c0cbc0c3053120bbfa03a58076e2545 100644
--- a/src/views/upms/views/userLoginLogs/index.vue
+++ b/src/views/upms/views/userLoginLogs/index.vue
@@ -33,18 +33,22 @@ export default {
page: true,
search: true,
showOverflow: true,
+ hideTop: true,
column: [
{
label: "账号",
prop: "accountName",
+ search: true
},
{
label: "姓名",
prop: "realName",
+ search: true
},
{
label: "登录类型",
- prop: "loginType"
+ prop: "loginType",
+ search: true
},
{
label: "IP",
diff --git a/src/views/weixin-mp/api/wx-account-fans.js b/src/views/weixin-mp/api/wx-account-fans.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ecad034e51eecb69259af01c1e2fcad3b0bb48e
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-account-fans.js
@@ -0,0 +1,48 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/list`,
+ method: 'get',
+ params: data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/update`,
+ method: 'post',
+ data: data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/delete`,
+ method: 'post',
+ params: data
+ })
+}
+
+export function syncAccountFans(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/syncAccountFans`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function sendMsg(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/fans/sendMsg`,
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/views/weixin-mp/api/wx-account.js b/src/views/weixin-mp/api/wx-account.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e3fea760c6a32d9ec74d4db21a708f0518f886b
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-account.js
@@ -0,0 +1,54 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: '/mgr/weixin-mp/wx/account/list',
+ method: 'get',
+ params: data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/update`,
+ method: 'post',
+ data: data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/delete`,
+ method: 'post',
+ params: data
+ })
+}
+
+export function fetchAllAccount() {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/listAll`,
+ method: 'post'
+ })
+}
+
+export function generateQRUrl(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/generateQRUrl`,
+ method: 'post',
+ data
+ })
+}
+
+export function listTreeWxAccount() {
+ return request({
+ url: `/mgr/weixin-mp/wx/account/listTreeWxAccount`,
+ method: 'post'
+ })
+}
diff --git a/src/views/weixin-mp/api/wx-fans-msg.js b/src/views/weixin-mp/api/wx-fans-msg.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fb3502056dceb6d67e975642a08475e39086cd7
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-fans-msg.js
@@ -0,0 +1,41 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/fans/msg/list`,
+ method: 'get',
+ params: data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/fans/msg/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/fans/msg/update`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateResContent(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/fans/msg/updateResContent`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/fans/msg/delete`,
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/views/weixin-mp/api/wx-menu.js b/src/views/weixin-mp/api/wx-menu.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd11d68f09194f0f52eb310ba1cf0d9da50ed988
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-menu.js
@@ -0,0 +1,53 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/list`,
+ method: 'post',
+ params:data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/update`,
+ method: 'post',
+ data: data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/delete`,
+ method: 'post',
+ params: data
+ })
+}
+
+export function listTreeMenu() {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/listTreeMenu`,
+ method: 'post'
+ })
+}
+export function validateData(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/validateData`,
+ method: 'post',
+ data
+ })
+}
+export function syncAccountMenu(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/menu/syncAccountMenu`,
+ method: 'post',
+ data
+ })
+}
diff --git a/src/views/weixin-mp/api/wx-news-template.js b/src/views/weixin-mp/api/wx-news-template.js
new file mode 100644
index 0000000000000000000000000000000000000000..ab4213f8be7d8f7861758d46f39680c4f4fce851
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-news-template.js
@@ -0,0 +1,82 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/list`,
+ method: 'get',
+ params:data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/add`,
+ method: 'post',
+ data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/update`,
+ method: 'post',
+ data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/delete`,
+ method: 'post',
+ params:data
+ })
+}
+
+export function addNews(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/addNews`,
+ method: 'post',
+ data
+ })
+}
+
+export function getNews(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/getNews`,
+ method: 'post',
+ params:data
+ })
+}
+
+export function uploadNews(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/uploadNews`,
+ method: 'post',
+ data
+ })
+}
+//查询已经上传的图文
+export function fetchAllNewsTpl(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/listAll`,
+ method: 'post',
+ params:data
+ })
+}
+
+//查询过滤某个公众号下的粉丝
+export function filterFans(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/filterFans`,
+ method: 'post',
+ params:data
+ })
+}
+
+export function sendNewsPreview(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/news/template/sendNewsPreview`,
+ method: 'post',
+ data
+ })
+}
+
diff --git a/src/views/weixin-mp/api/wx-text-template.js b/src/views/weixin-mp/api/wx-text-template.js
new file mode 100644
index 0000000000000000000000000000000000000000..33ed4e2f104e8cb6c5c35064f30ba69fcf70387a
--- /dev/null
+++ b/src/views/weixin-mp/api/wx-text-template.js
@@ -0,0 +1,39 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: '/mgr/weixin-mp//wx/text/template/list',
+ method: 'get',
+ params: data
+ })
+}
+
+export const createRow = (data) => {
+ return request({
+ url: `/mgr/weixin-mp/wx/text/template/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: '/mgr/weixin-mp/wx/text/template/update',
+ method: 'post',
+ data: data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: '/mgr/weixin-mp/wx/text/template/delete',
+ method: 'post',
+ data:data
+ })
+}
+
+export function fetchAllTextTpl() {
+ return request({
+ url: '/mgr/weixin-mp/wx/text/template/listAll',
+ method: 'post'
+ })
+}
diff --git a/src/views/weixin-mp/api/wx_receive_text.js b/src/views/weixin-mp/api/wx_receive_text.js
new file mode 100644
index 0000000000000000000000000000000000000000..95d731bd4bcb23389cdad03c648f22c1b08c67fa
--- /dev/null
+++ b/src/views/weixin-mp/api/wx_receive_text.js
@@ -0,0 +1,32 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: '/api/wx/receive/text/list',
+ method: 'post',
+ params:data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: '/api/wx/receive/text/add',
+ method: 'post',
+ data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: '/api/wx/receive/text/update',
+ method: 'post',
+ data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: '/api/wx/receive/text/delete',
+ method: 'post',
+ params:data
+ })
+}
diff --git a/src/views/weixin-mp/api/wx_subscribe_text.js b/src/views/weixin-mp/api/wx_subscribe_text.js
new file mode 100644
index 0000000000000000000000000000000000000000..87db639d30e455192725fbac9fa7ed9092066e55
--- /dev/null
+++ b/src/views/weixin-mp/api/wx_subscribe_text.js
@@ -0,0 +1,33 @@
+import request from "@/router/axios";
+
+export function fetchList(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/subscribe/text/list`,
+ method: 'get',
+ params: data
+ })
+}
+
+export function createRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/subscribe/text/add`,
+ method: 'post',
+ data: data
+ })
+}
+
+export function updateRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/subscribe/text/update`,
+ method: 'post',
+ data: data
+ })
+}
+export function deleteRow(data) {
+ return request({
+ url: `/mgr/weixin-mp/wx/subscribe/text/delete`,
+ method: 'post',
+ params: data
+ })
+}
+
diff --git a/src/views/weixin-mp/router.js b/src/views/weixin-mp/router.js
new file mode 100644
index 0000000000000000000000000000000000000000..eae451ef8d5c00f55907dafb7f08c484d20e69ac
--- /dev/null
+++ b/src/views/weixin-mp/router.js
@@ -0,0 +1,92 @@
+export default [
+ {
+ path: '/accountList',
+ name: '账号管理',
+ component: () =>
+ import( /* webpackChunkName: "page" */ './views/system/accountList'),
+ meta: {
+ keepAlive: true,
+ isTab: true,
+ isAuth: false
+ }
+ },
+ {
+ path: "/subscribeTextList",
+ name: "欢迎语管理",
+ component: () =>
+ import(/* webpackChunkName: "page" */ "./views/system/subscribeTextList"),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+ {
+ path: "/menuList",
+ name: "公众号菜单",
+ component: () =>
+ import(/* webpackChunkName: "page" */ "./views/system/menuList"),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+ {
+ path: "/accountFansList",
+ name: "粉丝管理",
+ component: () =>
+ import(/* webpackChunkName: "page" */ "./views/system/accountFansList"),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+ {
+ path: "/fansMsgList",
+ name: "粉丝消息",
+ component: () =>
+ import(/* webpackChunkName: "page" */ "./views/system/fansMsgList"),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+
+ // 素材管理
+ {
+ path: "/textTemplateList",
+ name: "文本管理",
+ component: () =>
+ import(/* webpackChunkName: "page" */ "./views/material/textTemplateList"),
+ meta: {
+ keepAlive: true,
+ isTab: false,
+ isAuth: false
+ }
+ },
+ {
+ path: '/newsTemplateList',
+ name: '图文管理',
+ component: () =>
+ import( /* webpackChunkName: "page" */ './views/material/newsTemplateList'),
+ meta: {
+ keepAlive: true,
+ isTab: true,
+ isAuth: false
+ }
+ },
+ {
+ path: '/newsTemplateForm',
+ name: '编辑图文',
+ component: () =>
+ import( /* webpackChunkName: "page" */ './views/material/newsTemplateForm'),
+ meta: {
+ keepAlive: true,
+ isTab: true,
+ isAuth: false
+ }
+ }
+]
diff --git a/src/views/weixin-mp/views/components/TreeTable/README-table.md b/src/views/weixin-mp/views/components/TreeTable/README-table.md
new file mode 100644
index 0000000000000000000000000000000000000000..05326dfad820cd58af9a235e4dd2c708c1715ec9
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/README-table.md
@@ -0,0 +1,220 @@
+
+- [Enlgish](#Brief)
+
+# 中文
+
+## 写在前面
+
+此组件仅提供一个创建 `TreeTable` 的解决思路。它基于`element-ui`的 table 组件实现，通过`el-table`的`row-style`方法，在里面判断元素是否需要隐藏或者显示，从而实现`TreeTable`的展开与收起。
+
+并且本组件充分利用 `vue` 插槽的特性来方便用户自定义。
+
+`evel.js` 里面，`addAttrs` 方法会给数据添加几个属性，`treeTotable` 会对数组扁平化。这些操作都不会破坏源数据，只是会新增属性。
+
+## Props 说明
+
+| Attribute | Description | Type | Default |
+| :--------------: | :--------------------------------- | :-----: | :------: |
+| data | 原始展示数据 | Array | [] |
+| columns | 列属性 | Array | [] |
+| defaultExpandAll | 默认是否全部展开 | Boolean | false |
+| defaultChildren | 指定子树为节点对象的某个属性值 | String | children | |
+| indent | 相邻级节点间的水平缩进，单位为像素 | Number | 50 |
+
+> 任何 `el-table` 的属性都支持，例如`border`、`fit`、`size`或者`@select`、`@cell-click`等方法。详情属性见`el-table`文档。
+
+---
+
+### 代码示例
+
+```html
+
+```
+
+#### data(**必填**)
+
+```js
+const data = [
+ {
+ name:'1'
+ children: [
+ {
+ name: '1-1'
+ },
+ {
+ name: '1-2'
+ }
+ ]
+ },
+ {
+ name: `2`
+ }
+]
+```
+
+#### columns(**必填**)
+
+- label: 显示在表头的文字
+- key: 对应 data 的 key。treeTable 将显示相应的 value
+- expand: `true` or `false`。若为 true，则在该列显示展开收起图标
+- checkbox: `true` or `false`。若为 true，则在该列显示`checkbox`
+- width: 每列的宽度，为一个数字(可选)。例如`200`
+- align: 对齐方式 `left/center/right`
+- header-align: 表头对齐方式 `left/center/right`
+
+```javascript
+const columns = [
+ {
+ label: 'Checkbox',
+ checkbox: true
+ },
+ {
+ label: '',
+ key: 'id',
+ expand: true
+ },
+ {
+ label: 'Event',
+ key: 'event',
+ width: 200,
+ align: 'left'
+ },
+ {
+ label: 'Scope',
+ key: 'scope'
+ }
+]
+```
+
+> 树表组件将会根据 columns 的 key 属性生成具名插槽，如果你需要对列数据进行自定义，通过插槽即可实现
+
+```html
+
+ level: {{ scope.row._level }}
+ expand: {{ scope.row._expand }}
+ select: {{ scope.row._select }}
+
+```
+
+## Events
+
+目前提供了几个方法，不过只是`beta`版本，之后很可能会修改。
+
+```js
+this.$refs.TreeTable.addChild(row, data) //添加子元素
+this.$refs.TreeTable.addBrother(row, data) //添加兄弟元素
+this.$refs.TreeTable.delete(row) //删除该元素
+```
+
+## 其他
+
+如果有其他的需求，请参考[el-table](http://element-cn.eleme.io/#/en-US/component/table)的 api 自行修改 index.vue
+
+# English
+
+## Brief
+
+This component only provides a solution for creating `TreeTable`. It is based on the `element-ui` table component. It uses the `row-style` method of `el-table` to determine whether the element needs to be hidden or displayed.
+
+And this component makes full use of the features of the `vue` slot to make it user-friendly.
+
+In `evel.js`, the `addAttrs` method adds several properties to the data, and `treeTotable` flattens the array. None of these operations will destroy the source data, just add properties.
+
+## Props
+
+| Attribute | Description | Type | Default |
+| :--------------: | :----------------------------------------------------------- | :-----: | :------: |
+| data | original display data | Array | [] |
+| columns | column attribute | Array | [] |
+| defaultExpandAll | whether to expand all nodes by default | Boolean | false |
+| defaultChildren | specify which node object is used as the node's subtree | String | children | |
+| indent | horizontal indentation of nodes in adjacent levels in pixels | Number | 50 |
+
+> Any of the `el-table` properties are supported, such as `border`, `fit`, `size` or `@select`, `@cell-click`. See the ʻel-table` documentation for details.
+
+---
+
+### Example
+
+```html
+
+```
+
+#### data(**Required**)
+
+```js
+const data = [
+ {
+ name:'1'
+ children: [
+ {
+ name: '1-1'
+ },
+ {
+ name: '1-2'
+ }
+ ]
+ },
+ {
+ name: `2`
+ }
+]
+```
+
+#### columns(**Required**)
+
+- label: text displayed in the header
+- key: data.key will show in column
+- expand: `true` or `false`
+- checkbox: `true` or `false`
+- width: column width 。such as `200`
+- align: alignment `left/center/right`
+- header-align: alignment of the table header `left/center/right`
+
+```javascript
+const columns = [
+ {
+ label: 'Checkbox',
+ checkbox: true
+ },
+ {
+ label: '',
+ key: 'id',
+ expand: true
+ },
+ {
+ label: 'Event',
+ key: 'event',
+ width: 200,
+ align: 'left'
+ },
+ {
+ label: 'Scope',
+ key: 'scope'
+ }
+]
+```
+
+> The tree table component will generate a named slot based on the key property of columns. If you need to customize the column data, you can do it through the slot.
+
+```html
+
+ level: {{ scope.row._level }}
+ expand: {{ scope.row._expand }}
+ select: {{ scope.row._select }}
+
+```
+
+## Events
+
+Several methods are currently available, but only the `beta` version, which is likely to be modified later.
+
+```js
+this.$refs.TreeTable.addChild(row, data) //Add child elements
+this.$refs.TreeTable.addBrother(row, data) //Add a sibling element
+this.$refs.TreeTable.delete(row) //Delete the element
+```
+
+## Other
+
+If you have other requirements, please refer to the [el-table](http://element-cn.eleme.io/#/en-US/component/table) api to modify the index.vue
diff --git a/src/views/weixin-mp/views/components/TreeTable/eval-bak.js b/src/views/weixin-mp/views/components/TreeTable/eval-bak.js
new file mode 100644
index 0000000000000000000000000000000000000000..e388c2cda7efc628bafa683a8cfe0921de49726e
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/eval-bak.js
@@ -0,0 +1,29 @@
+/**
+ * @Author: jianglei
+ * @Date: 2017-10-12 12:06:49
+ */
+'use strict'
+import Vue from 'vue'
+export default function treeToArray(data, expandAll, parent = null, level = null) {
+ let tmp = []
+ Array.from(data).forEach(function(record) {
+ if (record._expanded === undefined) {
+ Vue.set(record, '_expanded', expandAll)
+ }
+ let _level = 1
+ if (level !== undefined && level !== null) {
+ _level = level + 1
+ }
+ Vue.set(record, '_level', _level)
+ // 如果有父元素
+ if (parent) {
+ Vue.set(record, 'parent', parent)
+ }
+ tmp.push(record)
+ if (record.children && record.children.length > 0) {
+ const children = treeToArray(record.children, expandAll, record, _level)
+ tmp = tmp.concat(children)
+ }
+ })
+ return tmp
+}
diff --git a/src/views/weixin-mp/views/components/TreeTable/eval.js b/src/views/weixin-mp/views/components/TreeTable/eval.js
new file mode 100644
index 0000000000000000000000000000000000000000..8659ead813f95e33c18b919d475faf120d7e6f04
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/eval.js
@@ -0,0 +1,48 @@
+import Vue from 'vue'
+
+// Flattened array
+export default function treeToArray(data, children = 'children') {
+ let tmp = []
+ data.forEach((item, index) => {
+ Vue.set(item, '_index', index)
+ tmp.push(item)
+ if (item[children] && item[children].length > 0) {
+ const res = treeToArray(item[children], children)
+ tmp = tmp.concat(res)
+ }
+ })
+ return tmp
+}
+
+export function addAttrs(data, { parent = null, preIndex = false, level = 0, expand = false, children = 'children', show = true, select = false } = {}) {
+ data.forEach((item, index) => {
+ const _id = (preIndex ? `${preIndex}-${index}` : index) + ''
+ Vue.set(item, '_id', _id)
+ Vue.set(item, '_level', level)
+ Vue.set(item, '_expand', expand)
+ Vue.set(item, '_parent', parent)
+ Vue.set(item, '_show', show)
+ Vue.set(item, '_select', select)
+ if (item[children] && item[children].length > 0) {
+ addAttrs(item[children], {
+ parent: item,
+ level: level + 1,
+ expand,
+ preIndex: _id,
+ children,
+ status,
+ select
+ })
+ }
+ })
+}
+
+export function cleanParentAttr(data, children = 'children') {
+ data.forEach(item => {
+ item._parent = null
+ if (item[children] && item[children].length > 0) {
+ addAttrs(item[children], children)
+ }
+ })
+ return data
+}
diff --git a/src/views/weixin-mp/views/components/TreeTable/index-bak.vue b/src/views/weixin-mp/views/components/TreeTable/index-bak.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f559a74de0bf0f01dae6db7bc6643ec23938ba58
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/index-bak.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[column.value] }}
+
+
+
+ {{ scope.row[column.value] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/weixin-mp/views/components/TreeTable/index.vue b/src/views/weixin-mp/views/components/TreeTable/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..65aa1f4c1fcc1f422170d4c17c0a06fb66464817
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/index.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.key] }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/weixin-mp/views/components/TreeTable/readme-bak.md b/src/views/weixin-mp/views/components/TreeTable/readme-bak.md
new file mode 100644
index 0000000000000000000000000000000000000000..05326dfad820cd58af9a235e4dd2c708c1715ec9
--- /dev/null
+++ b/src/views/weixin-mp/views/components/TreeTable/readme-bak.md
@@ -0,0 +1,220 @@
+
+- [Enlgish](#Brief)
+
+# 中文
+
+## 写在前面
+
+此组件仅提供一个创建 `TreeTable` 的解决思路。它基于`element-ui`的 table 组件实现，通过`el-table`的`row-style`方法，在里面判断元素是否需要隐藏或者显示，从而实现`TreeTable`的展开与收起。
+
+并且本组件充分利用 `vue` 插槽的特性来方便用户自定义。
+
+`evel.js` 里面，`addAttrs` 方法会给数据添加几个属性，`treeTotable` 会对数组扁平化。这些操作都不会破坏源数据，只是会新增属性。
+
+## Props 说明
+
+| Attribute | Description | Type | Default |
+| :--------------: | :--------------------------------- | :-----: | :------: |
+| data | 原始展示数据 | Array | [] |
+| columns | 列属性 | Array | [] |
+| defaultExpandAll | 默认是否全部展开 | Boolean | false |
+| defaultChildren | 指定子树为节点对象的某个属性值 | String | children | |
+| indent | 相邻级节点间的水平缩进，单位为像素 | Number | 50 |
+
+> 任何 `el-table` 的属性都支持，例如`border`、`fit`、`size`或者`@select`、`@cell-click`等方法。详情属性见`el-table`文档。
+
+---
+
+### 代码示例
+
+```html
+
+```
+
+#### data(**必填**)
+
+```js
+const data = [
+ {
+ name:'1'
+ children: [
+ {
+ name: '1-1'
+ },
+ {
+ name: '1-2'
+ }
+ ]
+ },
+ {
+ name: `2`
+ }
+]
+```
+
+#### columns(**必填**)
+
+- label: 显示在表头的文字
+- key: 对应 data 的 key。treeTable 将显示相应的 value
+- expand: `true` or `false`。若为 true，则在该列显示展开收起图标
+- checkbox: `true` or `false`。若为 true，则在该列显示`checkbox`
+- width: 每列的宽度，为一个数字(可选)。例如`200`
+- align: 对齐方式 `left/center/right`
+- header-align: 表头对齐方式 `left/center/right`
+
+```javascript
+const columns = [
+ {
+ label: 'Checkbox',
+ checkbox: true
+ },
+ {
+ label: '',
+ key: 'id',
+ expand: true
+ },
+ {
+ label: 'Event',
+ key: 'event',
+ width: 200,
+ align: 'left'
+ },
+ {
+ label: 'Scope',
+ key: 'scope'
+ }
+]
+```
+
+> 树表组件将会根据 columns 的 key 属性生成具名插槽，如果你需要对列数据进行自定义，通过插槽即可实现
+
+```html
+
+ level: {{ scope.row._level }}
+ expand: {{ scope.row._expand }}
+ select: {{ scope.row._select }}
+
+```
+
+## Events
+
+目前提供了几个方法，不过只是`beta`版本，之后很可能会修改。
+
+```js
+this.$refs.TreeTable.addChild(row, data) //添加子元素
+this.$refs.TreeTable.addBrother(row, data) //添加兄弟元素
+this.$refs.TreeTable.delete(row) //删除该元素
+```
+
+## 其他
+
+如果有其他的需求，请参考[el-table](http://element-cn.eleme.io/#/en-US/component/table)的 api 自行修改 index.vue
+
+# English
+
+## Brief
+
+This component only provides a solution for creating `TreeTable`. It is based on the `element-ui` table component. It uses the `row-style` method of `el-table` to determine whether the element needs to be hidden or displayed.
+
+And this component makes full use of the features of the `vue` slot to make it user-friendly.
+
+In `evel.js`, the `addAttrs` method adds several properties to the data, and `treeTotable` flattens the array. None of these operations will destroy the source data, just add properties.
+
+## Props
+
+| Attribute | Description | Type | Default |
+| :--------------: | :----------------------------------------------------------- | :-----: | :------: |
+| data | original display data | Array | [] |
+| columns | column attribute | Array | [] |
+| defaultExpandAll | whether to expand all nodes by default | Boolean | false |
+| defaultChildren | specify which node object is used as the node's subtree | String | children | |
+| indent | horizontal indentation of nodes in adjacent levels in pixels | Number | 50 |
+
+> Any of the `el-table` properties are supported, such as `border`, `fit`, `size` or `@select`, `@cell-click`. See the ʻel-table` documentation for details.
+
+---
+
+### Example
+
+```html
+
+```
+
+#### data(**Required**)
+
+```js
+const data = [
+ {
+ name:'1'
+ children: [
+ {
+ name: '1-1'
+ },
+ {
+ name: '1-2'
+ }
+ ]
+ },
+ {
+ name: `2`
+ }
+]
+```
+
+#### columns(**Required**)
+
+- label: text displayed in the header
+- key: data.key will show in column
+- expand: `true` or `false`
+- checkbox: `true` or `false`
+- width: column width 。such as `200`
+- align: alignment `left/center/right`
+- header-align: alignment of the table header `left/center/right`
+
+```javascript
+const columns = [
+ {
+ label: 'Checkbox',
+ checkbox: true
+ },
+ {
+ label: '',
+ key: 'id',
+ expand: true
+ },
+ {
+ label: 'Event',
+ key: 'event',
+ width: 200,
+ align: 'left'
+ },
+ {
+ label: 'Scope',
+ key: 'scope'
+ }
+]
+```
+
+> The tree table component will generate a named slot based on the key property of columns. If you need to customize the column data, you can do it through the slot.
+
+```html
+
+ level: {{ scope.row._level }}
+ expand: {{ scope.row._expand }}
+ select: {{ scope.row._select }}
+
+```
+
+## Events
+
+Several methods are currently available, but only the `beta` version, which is likely to be modified later.
+
+```js
+this.$refs.TreeTable.addChild(row, data) //Add child elements
+this.$refs.TreeTable.addBrother(row, data) //Add a sibling element
+this.$refs.TreeTable.delete(row) //Delete the element
+```
+
+## Other
+
+If you have other requirements, please refer to the [el-table](http://element-cn.eleme.io/#/en-US/component/table) api to modify the index.vue
diff --git a/src/views/weixin-mp/views/material/newsTemplateForm.vue b/src/views/weixin-mp/views/material/newsTemplateForm.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ba5c5de841f3f9b6f8b59158528171256e8451e1
--- /dev/null
+++ b/src/views/weixin-mp/views/material/newsTemplateForm.vue
@@ -0,0 +1,433 @@
+
+
+
+ 防止达到微信API接口访问上限，请先保存草稿，再发布到微信
+ 草稿
+ 发布
+
+
+
+
+
+
+
![]()
+
{{item.title ? item.title : '标题'}}
+
+
+
+
+
{{item.title ? item.title : '标题'}}
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ {{scope.row.isUpload ? '是' : '否'}}
+
+
+ 编辑
+ 图文
+ 预览
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/weixin-mp/views/material/textTemplateList.vue b/src/views/weixin-mp/views/material/textTemplateList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cf21e81f25972593a218c6c6f7c1db1f7f2a336b
--- /dev/null
+++ b/src/views/weixin-mp/views/material/textTemplateList.vue
@@ -0,0 +1,156 @@
+
+
+
+
+ 新增
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/weixin-mp/views/system/accountFansList.vue b/src/views/weixin-mp/views/system/accountFansList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1bf200b7786373bc6d0313ee734bfb999187ad69
--- /dev/null
+++ b/src/views/weixin-mp/views/system/accountFansList.vue
@@ -0,0 +1,310 @@
+
+
+
+
+
+
+
+ {{ scope.row.nicknameStr }}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 回复
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 编辑
+ 生成二维码
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/weixin-mp/views/system/fansMsgList.vue b/src/views/weixin-mp/views/system/fansMsgList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..74af5d0e5f95d58c52deecb58482bb81c516918c
--- /dev/null
+++ b/src/views/weixin-mp/views/system/fansMsgList.vue
@@ -0,0 +1,236 @@
+
+
+
+
+ {{ scope.row.nicknameStr }}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 回复
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 同步菜单
+ 刷新
+ {{ expandAllTitle }}
+ 新增
+
+
+
+
+
+
+ {{ formatMenuType(scope.row) }}
+
+
+ {{ formatMenuLevel(scope.row) }}
+
+
+
+ 添加下级
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 刷新
+ 新增
+
+
+
+
+
+ {{ scope.row.wxAccountName }}
+
+
+
+
+ {{ scope.row.receiveText }}
+
+
+
+
+ {{ scope.row.msgType == '1' ? '文本消息':'图文消息' }}
+
+
+
+
+ {{ scope.row.tplName }}
+
+
+
+
+ {{ scope.row.tplContent }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/vue.config.js b/vue.config.js
index ab7d2b3e1ffc8bcc0cfddb008271132d159bc391..9840e1e580a956c4104671de2f1f9a5c7debba86 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,9 @@
* https://cli.vuejs.org/zh/config/#%E7%9B%AE%E6%A0%87%E6%B5%8F%E8%A7%88%E5%99%A8
*
*/
-// const url = "http://www.demo.jvs.bctools.cn" // "http://10.1.0.48:10000"
-const url = "http://www.bctools.cn" // "http://10.1.0.48:10000"
+const url = "http://localhost:10000" // "http://10.1.0.48:10000"
// 基础路径，发布前修改这里,当前配置打包出来的资源都是相对路径
-// const wsUrl = "http://www.demo.jvs..bctools.cn" // "http://10.1.0.48:10000"
-const wsUrl = "http://www.bctools.cn" //
+const wsUrl = "http://localhost:10000" // "http://10.1.0.48:10000"
let path = "jvs-ui";
module.exports = {
@@ -17,8 +15,6 @@ module.exports = {
assetsDir: path + "/static",
//静太资源文件
indexPath: path + "/index.html",
- //打包文件路径
- outputDir: 'docker/dist',
lintOnSave: true,
productionSourceMap: false,
+ 
+ 折线图
+
+ 
+ 条形图
+
+ 
+ 柱状图
+
+ 
+ 饼图
+
+ 
+ 散点图
+
+ 
+ 面积图
+
+ 
+ 仪表盘
+
+ 
+ 漏斗图
+
+ 
+ 卡片
+
+ 
+ 
+