Skip to content

Y
ybf
Commit e7fc579d authored by xd's avatar xd
Browse files
Options

处理冲突

parents eb9006a6 f55c5007
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 9 deletions
ybf_admin/package.json
View file @ e7fc579d
......@@ -20,6 +20,7 @@
"better-scroll": "^1.15.2",
"core-js": "^3.4.3",
"dayjs": "^1.8.17",
"echarts": "^4.6.0",
"element-ui": "^2.13.0",
"flex.css": "^1.1.7",
"fuse.js": "^3.4.6",
......@@ -33,6 +34,7 @@
"screenfull": "^5.0.0",
"sortablejs": "^1.10.1",
"ua-parser-js": "^0.7.20",
"v-charts": "^1.19.0",
"vue": "^2.6.11",
"vue-i18n": "^8.15.1",
"vue-router": "^3.1.3",
......
ybf_admin/src/main.js
View file @ e7fc579d
......@@ -7,6 +7,11 @@ import d2Admin from '@/plugin/d2admin'
// store
import store from '@/store/index'
// Z-VCharts
import VCharts from 'v-charts'
// 菜单和路由设置
import router from './router'
import menuHeader from '@/menu/header'
......@@ -15,6 +20,7 @@ import { frameInRoutes } from '@/router/routes'
// 核心插件
Vue.use(d2Admin)
Vue.use(VCharts)
new Vue({
router,
......
ybf_admin/src/pages/in/contact/index.vue
View file @ e7fc579d
......@@ -55,12 +55,12 @@ export default {
handleOpen (index) {
},
handleMenuChange (index) {
this.index = index
this.index = index
},
contorlHistoryShow (val) {
contorlHistoryShow (val) {
this.isHistoryShow = val
}
}
}
}
</script>
<style></style>
......
ybf_admin/src/pages/in/contact/mail.vue
View file @ e7fc579d
......@@ -475,6 +475,7 @@ export default {
padding: 10px;
margin-left: 10px;
width: 79%;
/*width: 80%;*/
}
.left,
.right {
......
ybf_admin/src/pages/task/count/index.vue
View file @ e7fc579d
......@@ -63,7 +63,7 @@
</div>
</div>
<div class="ztask-charts">
<ve-histogram class="ztask-chart" :data="list.chart" v-bind="setting.chart"></ve-histogram>
</div>
<div class="ztask-lists">
<el-table
......@@ -161,14 +161,16 @@
<el-row>
<el-col :span="24">
<el-form-item label="任务标题：" prop="taskName">
<el-input :disabled="true" v-model="data.see.taskName" autocomplete="off" placeholder="任务标题为空"></el-input>
<el-input :disabled="true" v-model="data.see.taskName" autocomplete="off"
placeholder="任务标题为空"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="作者：" prop="author">
<el-input :disabled="true" v-model="data.see.authore" autocomplete="off" placeholder="作者为空"></el-input>
<el-input :disabled="true" v-model="data.see.authore" autocomplete="off"
placeholder="作者为空"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -195,8 +197,14 @@
</div>
</div>
</template>
<script>
import list from '@/pages/task/count/list.js'
export default {
mixins: [
list
],
components: {},
data() {
return {
......@@ -239,6 +247,7 @@
}
},
list: {
chart: {},
main: [
{
id: '1001',
......@@ -381,6 +390,12 @@
taskDetail: [{required: true, message: '任务详情不能为空', trigger: 'change'}],
},
see: {},
},
setting: {
chart: {
yAxisType: ['KMB'],
yAxisName: ['数值']
}
}
};
},
......@@ -393,6 +408,19 @@
searchsDels() {
},
searchsSearch() {
this.list.chart = {}
this.list.chart = {
columns: ['日期', '访问用户', '下单用户', '下单率'],
rows: [
{'日期': '1', '访问用户': 20, '下单用户': 10, '下单率': 50, '专柜类型': '普通店铺'},
{'日期': '2', '访问用户': 30, '下单用户': 15, '下单率': 50, '专柜类型': '普通店铺'},
{'日期': '3', '访问用户': 40, '下单用户': 20, '下单率': 50, '专柜类型': '普通店铺'},
{'日期': '4', '访问用户': 50, '下单用户': 25, '下单率': 50, '专柜类型': '普通店铺'},
{'日期': '5', '访问用户': 60, '下单用户': 30, '下单率': 50, '专柜类型': '普通店铺'},
{'日期': '6', '访问用户': 70, '下单用户': 35, '下单率': 50, '专柜类型': '普通店铺'}
]
}
},
listsSelectChange() {
......@@ -476,6 +504,7 @@
flex-direction: row;
justify-content: space-between;
}
.ztask-searchs-items {
/*border: 2px solid #00c561;*/
......@@ -487,6 +516,7 @@
justify-content: flex-start;
align-items: center;
}
.ztask-searchs-forms {
/*border: 2px solid #f900ff;*/
height: 30px;
......@@ -494,17 +524,24 @@
}
.ztask-charts {
border: 2px solid green;
/*border: 2px solid green;*/
background-color: rgba(220, 220, 220, 0.5);
height: 262px;
}
.ztask-chart {
/*border: 2px solid deeppink;*/
/*height: 50%;*/
height: 50px;
width: 100%;
}
.ztask-lists {
border: 2px solid red;
/*border: 2px solid red;*/
height: calc((100vh - 600px) * 1.0);
overflow: auto;
}
.ztask-pages {
/*border: 2px solid red;*/
/*height: 56px;*/
......@@ -514,6 +551,7 @@
justify-content: flex-end;
align-items: flex-end;
}
.ztask-page {
/*border: 2px solid red;*/
position: relative;
......@@ -523,6 +561,7 @@
.buttonTextNormal {
color: #666666;
}
.buttonTextWarning {
color: #D0021B;
}
......
ybf_admin/src/pages/task/count/list.js 0 → 100644
View file @ e7fc579d
import Vue from 'vue'
import VCharts from 'v-charts'
Vue.use(VCharts)
export default {
data () {
return {
pubSetting: {
height: '100%'
}
}
}
}
ybf_admin/yarn.lock
View file @ e7fc579d
......@@ -3642,6 +3642,28 @@ ecc-jsbn@~0.1.1:
jsbn "~0.1.0"
safer-buffer "^2.1.0"
echarts-amap@1.0.0-rc.6:
version "1.0.0-rc.6"
resolved "https://registry.yarnpkg.com/echarts-amap/-/echarts-amap-1.0.0-rc.6.tgz#5782a74daee52ed44ce3f8f62577561783f09e16"
integrity sha1-V4KnTa7lLtRM4/j2JXdWF4PwnhY=
echarts-liquidfill@^2.0.2:
version "2.0.5"
resolved "https://registry.yarnpkg.com/echarts-liquidfill/-/echarts-liquidfill-2.0.5.tgz#0d505a75c2dfb69950e18d440bdf3fe1795a0eed"
integrity sha512-3G19W5ngoh1L3BXYuD34g0Vd30ORWvQtyxRuL+7vmOZ3FkF6xkgD4pfcCL7QVAQOr+XZ4OiD2ot6dNGsRhflcg==
echarts-wordcloud@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz#07b140c8ba76b19c317b43c310f3d5dc99289ff2"
integrity sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg==
echarts@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz#b5a47a1046cec93ceeef954f9ee54751340558ec"
integrity sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==
dependencies:
zrender "4.2.0"
editorconfig@^0.15.3:
version "0.15.3"
resolved "https://registry.npm.taobao.org/editorconfig/download/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
......@@ -7009,6 +7031,11 @@ number-is-nan@^1.0.0:
resolved "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
numerify@1.2.9:
version "1.2.9"
resolved "https://registry.yarnpkg.com/numerify/-/numerify-1.2.9.tgz#af4696bb1d57f8d3970a615d8b0cd53d932bd559"
integrity sha512-X4QzQiytV5ZN3TVLhzbtFzjTarUNnaa1pgNDFqt7u7Nqhxe7FvY2eYrGt4WYHlYXDqgtfC/n/a5nJ2y0LijV8w==
nwsapi@^2.0.7, nwsapi@^2.2.0:
version "2.2.0"
resolved "https://registry.npm.taobao.org/nwsapi/download/nwsapi-2.2.0.tgz?cache=0&sync_timestamp=1572825100671&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnwsapi%2Fdownload%2Fnwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
......@@ -9930,6 +9957,11 @@ utila@^0.4.0, utila@~0.4:
resolved "https://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
utils-lite@0.1.10:
version "0.1.10"
resolved "https://registry.yarnpkg.com/utils-lite/-/utils-lite-0.1.10.tgz#d2908c0482e23c31e6b082558540e7134ffad7d7"
integrity sha512-jlHvdtI8MyWURF/3u+ufIjf1Cs5WjN6WZl9qO8dEkZsVjaI7X5YMUhaCFzkvB69ljt6fo4Dd7V/Oj2NJOFDFOQ==
utils-merge@1.0.1:
version "1.0.1"
resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
......@@ -9940,6 +9972,17 @@ uuid@^3.0.1, uuid@^3.3.2:
resolved "https://registry.npm.taobao.org/uuid/download/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
integrity sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=
v-charts@^1.19.0:
version "1.19.0"
resolved "https://registry.yarnpkg.com/v-charts/-/v-charts-1.19.0.tgz#07b701800b159bd514264ffc8bf12b0405142da3"
integrity sha512-vm2HBUmxAsXK0ivwce9LytcpqrItDA5JSPLYVxZXtiuoyhcn80XX1/3dPJd/1GqG1OYv3jfBo1s9ra4q8GowqA==
dependencies:
echarts-amap "1.0.0-rc.6"
echarts-liquidfill "^2.0.2"
echarts-wordcloud "^1.1.3"
numerify "1.2.9"
utils-lite "0.1.10"
validate-npm-package-license@^3.0.1:
version "3.0.4"
resolved "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
......@@ -10540,3 +10583,8 @@ yorkie@^2.0.0:
is-ci "^1.0.10"
normalize-path "^1.0.0"
strip-indent "^2.0.0"
zrender@4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz#d001302e155f28de1f9fc7fcd5c254bad28471cf"
integrity sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA==
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment