huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

样式修复

Browse Source
dev_2022-03-03
Jo 3 years ago
parent 2374bba98b
commit 90ec1ffc68
19 changed files with 1144 additions and 1136 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/components/codemirror.vue
  2. 1
      src/directive/auth/index.js
  3. 2
      src/utils/api.js
  4. 11
      src/views/course/Curriculum.vue
  5. 17
      src/views/customer/AddCustomer.vue
  6. 12
      src/views/customer/customer.vue
  7. 11
      src/views/data/Data.vue
  8. 12
      src/views/data/Framework.vue
  9. 32
      src/views/data/Introduce.vue
  10. 27
      src/views/data/Product.vue
  11. 14
      src/views/order/AddOrder.vue
  12. 11
      src/views/order/Order.vue
  13. 13
      src/views/serve/Configure.vue
  14. 4
      src/views/serve/backstage/index.vue
  15. 12
      src/views/system/addLog.vue
  16. 6
      src/views/system/index.vue
  17. 36
      src/views/system/manageLog.vue
  18. 24
      src/views/user/User.vue
  19. 19
      vue.config.js

14
src/components/codemirror.vue
Unescape View File

@ -133,7 +133,7 @@ export default {
// 页面加载完后重置编辑框大小 // 页面加载完后重置编辑框大小
ready() { ready() {
const code = this.$refs.codemirror.codemirror const code = this.$refs.codemirror.codemirror
code.setSize("auto", "calc(100vh - 400px)"); code.setSize("auto", "calc(100vh - 370px)");
code.on('keypress', function() { code.on('keypress', function() {
// 显示智能提示 // 显示智能提示
code.showHint() code.showHint()
@ -207,6 +207,15 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::-webkit-scrollbar {
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb {
width: 5px;
border-radius: 6px;
background: rgba(173,173,173,.7);
}
.wrap { .wrap {
display: flex; display: flex;
} }
@ -314,7 +323,8 @@ export default {
margin: 10px; margin: 10px;
position: absolute; position: absolute;
width: calc(100% - 14px); width: calc(100% - 14px);
height: calc(100vh - 247px); top: 0;
bottom: -8px;
overflow: auto; overflow: auto;
} }
} }

1
src/directive/auth/index.js
Unescape View File

@ -15,7 +15,6 @@ export default {
btnText = `${vnode.context.$route.path}:${el.innerText}` btnText = `${vnode.context.$route.path}:${el.innerText}`
} }
const btnPermissions = store.state.btns const btnPermissions = store.state.btns
console.log("🚀 ~ file: index.js ~ line 18 ~ inserted ~ btnPermissions", btnPermissions, btnText)
if (btnText && btnPermissions && btnPermissions.length) { if (btnText && btnPermissions && btnPermissions.length) {
const isPermission = btnPermissions.includes(btnText) const isPermission = btnPermissions.includes(btnText)
// 如果按钮集合里没有该权限,就把该按钮给去除 // 如果按钮集合里没有该权限,就把该按钮给去除

2
src/utils/api.js
Unescape View File

@ -6,7 +6,7 @@ const host1 = 'http://192.168.31.137:9000'
export default { export default {
logins: `users/users/user/login`, //登录 logins: `users/users/user/login`, //登录
verification: `${Setting.host}/users/users/user/captcha`,// 验证码图片 verification: `${Setting.host}users/users/user/captcha`,// 验证码图片
bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机 bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码 sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码

11
src/views/course/Curriculum.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -62,10 +60,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -118,8 +114,6 @@
layout="total, prev, pager, next" :total="totals"></el-pagination> layout="total, prev, pager, next" :total="totals"></el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -310,6 +304,9 @@ export default {
</script> </script>
<style scoped> <style scoped>
.card {
min-height: calc(100vh - 300px);
}
.mag { .mag {
margin-right: 20px; margin-right: 20px;
} }

17
src/views/customer/AddCustomer.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div class="flex-between"> <div class="flex-between">
<div class="per_title" v-preventReClick @click="goback()"> <div class="per_title" v-preventReClick @click="goback()">
@ -13,7 +11,7 @@
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" :class="customerId ? 'mgb20' : 'card'">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
<p class="addhr_tag"></p> <p class="addhr_tag"></p>
@ -267,8 +265,6 @@
<img :src="fileSrc" width="100%" alt=""> <img :src="fileSrc" width="100%" alt="">
</el-dialog> </el-dialog>
<pdf :visible.sync="pdfVisible" :src.sync="fileSrc"></pdf> <pdf :visible.sync="pdfVisible" :src.sync="fileSrc"></pdf>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -660,14 +656,17 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.addhr_tag{ .card {
min-height: calc(100vh - 260px);
}
.addhr_tag{
background-color: #666; background-color: #666;
width: 6px; width: 6px;
height: 17px; height: 17px;
margin-right: 5px; margin-right: 5px;
} }
.radio_icon{ .radio_icon{
font-size: 26px; font-size: 26px;
color: #9278FF; color: #9278FF;
} }
</style> </style>

12
src/views/customer/customer.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -40,10 +38,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -93,8 +89,6 @@
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -263,6 +257,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.card {
min-height: calc(100vh - 300px);
}
</style> </style>

11
src/views/data/Data.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div class="Achievement-container"> <div class="wrap">
<div class="tabs" v-if="showTabs"> <div class="tabs" v-if="showTabs">
<a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{item}}</a> <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{item}}</a>
</div> </div>
@ -64,8 +64,8 @@ export default {
}; };
</script> </script>
<style lang="scss" scopted> <style lang="scss" scoped>
.Achievement-container { .wrap {
width: 100%; width: 100%;
box-shadow: 0px 0px 21px 0px rgba(48, 115, 248, 0.1); box-shadow: 0px 0px 21px 0px rgba(48, 115, 248, 0.1);
text-align: center; text-align: center;
@ -84,8 +84,7 @@ export default {
} }
} }
.score-table { .score-table {
margin: 0 auto; margin: 18px auto 0;
margin-top: 18px;
position: relative; position: relative;
.block { .block {
position: absolute; position: absolute;
@ -98,7 +97,7 @@ export default {
color: #fff; color: #fff;
} }
} }
.tabs{ /deep/.tabs{
display: flex; display: flex;
align-items: center; align-items: center;
padding: 20px 1.5% 20px; padding: 20px 1.5% 20px;

12
src/views/data/Framework.vue
Unescape View File

@ -740,14 +740,14 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap, .el-container{ .wrap, .el-container{
min-height: calc(100vh - 290px); min-height: calc(100vh - 290px);
} }
.el-aside, .main-wrap{ .el-aside, .main-wrap{
height: calc(100vh - 290px); height: calc(100vh - 290px);
overflow: auto; overflow: auto;
} }
/deep/.el-container{ /deep/.el-container{
height: 100%; height: 100%;
padding-bottom: 0; padding-bottom: 0;
.el-aside{ .el-aside{
@ -774,5 +774,5 @@ export default {
.el-main{ .el-main{
height: 100%; height: 100%;
} }
} }
</style> </style>

32
src/views/data/Introduce.vue
Unescape View File

@ -6,8 +6,7 @@
</el-aside> </el-aside>
<el-main style="padding-top: 0"> <el-main style="padding-top: 0">
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20 teacher_tab">
<div class="flex-between" style="margin-bottom: 10px;"> <div class="flex-between" style="margin-bottom: 10px;">
<p>数据简介</p> <p>数据简介</p>
<el-button v-if="introduceText && !editing" type="primary" @click="editing = !editing" v-auth="'/data:数据简介:编辑'">编辑</el-button> <el-button v-if="introduceText && !editing" type="primary" @click="editing = !editing" v-auth="'/data:数据简介:编辑'">编辑</el-button>
@ -50,7 +49,6 @@
<el-button type="primary" @click="confirmData">确 定</el-button> <el-button type="primary" @click="confirmData">确 定</el-button>
</div> </div>
</el-card> </el-card>
</el-col>
</el-main> </el-main>
</el-container> </el-container>
</div> </div>
@ -216,7 +214,11 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.el-container{ .el-aside, .card {
height: calc(100vh - 290px);
overflow: auto;
}
/deep/.el-container{
background-color: #f0f0f0; background-color: #f0f0f0;
.el-aside{ .el-aside{
padding: 15px; padding: 15px;
@ -245,8 +247,8 @@ export default {
.btns{ .btns{
margin-top: 20px; margin-top: 20px;
} }
} }
.tag-add { .tag-add {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
@ -256,24 +258,24 @@ export default {
.el-button { .el-button {
margin-left: 5px; margin-left: 5px;
} }
} }
.mag{ .mag{
margin-right: 20px; margin-right: 20px;
margin-left: 20px; margin-left: 20px;
} }
.el-tag + .el-tag { .el-tag + .el-tag {
margin-left: 10px; margin-left: 10px;
} }
.button-new-tag { .button-new-tag {
margin-left: 10px; margin-left: 10px;
height: 32px; height: 32px;
line-height: 30px; line-height: 30px;
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
} }
.input-new-tag { .input-new-tag {
width: 90px; width: 90px;
margin-left: 10px; margin-left: 10px;
vertical-align: bottom; vertical-align: bottom;
} }
</style> </style>

27
src/views/data/Product.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -27,10 +25,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -67,8 +63,6 @@
<el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page" :total="totals"></el-pagination> <el-pagination background layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page" :total="totals"></el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
<el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="30%" center @close="closeProduct" class="dialog" :close-on-click-modal="false"> <el-dialog :title="isDetail ? '查看产品' : (id ? '编辑产品' : '新增产品')" :visible.sync="productVisible" width="30%" center @close="closeProduct" class="dialog" :close-on-click-modal="false">
<el-form ref="form" label-width="98px" :disabled="isDetail"> <el-form ref="form" label-width="98px" :disabled="isDetail">
@ -641,20 +635,23 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/ .no-mb .el-form-item{ .card {
min-height: calc(100vh - 420px);
}
/deep/ .no-mb .el-form-item{
margin-bottom: 0; margin-bottom: 0;
} }
/deep/.el-input--suffix .el-input__inner{ /deep/.el-input--suffix .el-input__inner{
padding-right: 56px; padding-right: 56px;
} }
/deep/.el-container{ /deep/.el-container{
.el-aside{ .el-aside{
padding: 15px; padding: 15px;
background-color: #fff; background-color: #fff;
} }
} }
.type-wrap{ .type-wrap{
height: 450px; height: 450px;
overflow:auto; overflow:auto;
} }
</style> </style>

14
src/views/order/AddOrder.vue
Unescape View File

@ -115,7 +115,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="课程名称" align="center" min-width="150" show-overflow-tooltip> <el-table-column prop="productName" label="课程名称" align="center" min-width="150" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column label="使用期限" align="center" min-width="170"> <el-table-column label="使用期限" align="center" min-width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input <el-input
@ -178,7 +178,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成交价" align="center" min-width="110"> <el-table-column label="成交价" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''" <el-input :class="scope.row.finalPrice === '' && whetherSubmit?'red':''"
@ -202,7 +202,7 @@
<el-button @click="configure(scope.row)">配置</el-button> <el-button @click="configure(scope.row)">配置</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="240"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex-c-c"> <div class="flex-c-c">
<el-button <el-button
@ -255,7 +255,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="productName" label="产品名称" align="center" min-width="100"> <el-table-column prop="productName" label="产品名称" align="center" min-width="100">
</el-table-column> </el-table-column>
<el-table-column label="使用期限" align="center" min-width="150"> <el-table-column label="使用期限" align="center" min-width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input onkeyup="value=this.value.replace(/\D+/g,'')" <el-input onkeyup="value=this.value.replace(/\D+/g,'')"
@ -338,7 +338,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="账号数" align="center" min-width="80"> <el-table-column label="账号数" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input :class="!scope.row.accountNum&&whetherSubmit?'red':''" <el-input :class="!scope.row.accountNum&&whetherSubmit?'red':''"
@ -352,7 +352,7 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 --> <!-- 金额自动计算，计算方式：账号数*成交价，且可以手动修改，保留两位小数 -->
<el-table-column label="总金额(元)" align="center" min-width="100"> <el-table-column label="总金额(元)" align="center" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="small"> <div class="small">
<el-input :class="scope.row.totalAmount === '' && whetherSubmit?'red':''" <el-input :class="scope.row.totalAmount === '' && whetherSubmit?'red':''"
@ -364,7 +364,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="240"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex-c-c"> <div class="flex-c-c">
<el-button <el-button

11
src/views/order/Order.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -55,10 +53,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -121,8 +117,6 @@
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -327,6 +321,9 @@ export default {
</script> </script>
<style scoped> <style scoped>
.card {
min-height: calc(100vh - 300px);
}
.mag { .mag {
margin-right: 20px; margin-right: 20px;
} }

13
src/views/serve/Configure.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -40,10 +38,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-center mgb20"> <div class="flex-center mgb20">
<p class="hr_tag"></p> <p class="hr_tag"></p>
<span>服务列表</span> <span>服务列表</span>
@ -97,8 +93,6 @@
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -213,7 +207,10 @@ export default {
}; };
</script> </script>
<style scoped> <style lang="scss" scoped>
.card {
min-height: calc(100vh - 300px);
}
.mag { .mag {
margin-right: 20px; margin-right: 20px;
} }

4
src/views/serve/backstage/index.vue
Unescape View File

@ -46,5 +46,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page {
min-height: 100%;
}
</style> </style>

12
src/views/system/addLog.vue
Unescape View File

@ -14,8 +14,8 @@
</div> </div>
</el-card> </el-card>
<el-card shadow="hover"> <el-card class="page" shadow="hover">
<el-form ref="form" label-width="120px"> <el-form class="form" ref="form" label-width="120px" center>
<el-form-item label="版本标题"> <el-form-item label="版本标题">
<el-input placeholder="请输入版本标题" v-model="form.versionName" maxlength="30" style="width: 400px"></el-input> <el-input placeholder="请输入版本标题" v-model="form.versionName" maxlength="30" style="width: 400px"></el-input>
</el-form-item> </el-form-item>
@ -160,7 +160,8 @@ export default {
versionName, versionName,
coverUrl: this.form.coverUrl, coverUrl: this.form.coverUrl,
logContents, logContents,
draft // 0:发布，1:草稿 open: draft, // 启用禁用，0:启用，1:禁用
draft // 状态，0:发布，1:草稿
} }
if (id) { if (id) {
data.logId = id data.logId = id
@ -180,6 +181,11 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page {
display: flex;
justify-content: center;
min-height: calc(100vh - 310px);
}
$avatar-width: 104px; $avatar-width: 104px;
/deep/ .avatar-uploader { /deep/ .avatar-uploader {
.el-upload { .el-upload {

6
src/views/system/index.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div class="page" style="padding: 0"> <div class="page system" style="padding: 0">
<div class="tabs"> <div class="tabs">
<a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a> <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
</div> </div>
@ -72,5 +72,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.system {
min-height: calc(100vh - 170px);
}
</style> </style>

36
src/views/system/manageLog.vue
Unescape View File

@ -5,13 +5,15 @@
<div class="per_title" v-preventReClick @click="$router.back()"> <div class="per_title" v-preventReClick @click="$router.back()">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
<span class="per_back">返回</span> <span class="per_back">返回</span>
<span class="per_school">日志更新</span> <span class="per_school">职站日志管理</span>
</div> </div>
</div> </div>
</el-card> </el-card>
<div class="page"> <div class="page">
<div class="inner">
<div class="tool"> <div class="tool">
<div class="filters"> <div class="filters">
<h6>日志更新</h6>
<div class="filter"> <div class="filter">
<label>版本查询</label> <label>版本查询</label>
<el-select v-model="versionName" size="small" placeholder="请选择版本" filterable @change="verChange"> <el-select v-model="versionName" size="small" placeholder="请选择版本" filterable @change="verChange">
@ -29,11 +31,11 @@
</div> </div>
</div> </div>
<el-timeline class="timeline"> <el-timeline class="timeline">
<el-timeline-item placement="top" v-for="(item, i) in listData" :key="i"> <el-timeline-item placement="top" v-for="(item, i) in listData" :key="i" :class="{draft: item.draft}">
<p :class="['sign', {draft: item.draft}]" :id="'ver' + i">{{ item.draft ? '未发布' : item.updateTime }}</p> <p class="sign" :id="'ver' + i">{{ item.draft ? '未发布' : item.updateTime }}</p>
<div class="ver"> <div class="ver">
<div> <div>
{{ platformName + item.versionName }} {{ platformName + item.versionName + (item.draft ? '（草稿）' : '') }}
<span class="action"> <span class="action">
<i class="el-icon-edit-outline" @click="edit(item)" v-auth="'/system:日志更新:管理:编辑日志'"></i> <i class="el-icon-edit-outline" @click="edit(item)" v-auth="'/system:日志更新:管理:编辑日志'"></i>
<i class="el-icon-delete" @click="del(item)" v-auth="'/system:日志更新:管理:删除日志'"></i> <i class="el-icon-delete" @click="del(item)" v-auth="'/system:日志更新:管理:删除日志'"></i>
@ -53,6 +55,7 @@
</el-timeline> </el-timeline>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -109,7 +112,15 @@ export default {
}, },
// 新增日志 // 新增日志
add() { add() {
if (this.listData.find(e => e.draft)) {
this.$confirm("当前有未发布的版本，是否要新增版本？", "提示", {
type: "warning"
}).then(() => {
this.$router.push(`/addLog?platformId=${this.platformId}`)
}).catch(() => {})
} else {
this.$router.push(`/addLog?platformId=${this.platformId}`) this.$router.push(`/addLog?platformId=${this.platformId}`)
}
}, },
// 编辑 // 编辑
edit(item) { edit(item) {
@ -144,7 +155,12 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page { .page {
padding: 24px 200px; min-height: calc(100vh - 300px);
padding: 24px 0;
.inner {
width: 1100px;
margin: 0 auto;
}
} }
.tool { .tool {
padding-bottom: 20px; padding-bottom: 20px;
@ -154,18 +170,21 @@ export default {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
h6 { h6 {
margin-right: 100px;
font-size: 18px; font-size: 18px;
} }
} }
.timeline { .timeline {
margin-left: 20%; margin-left: 20%;
.sign { .sign {
margin: -11px 0 0 -10%; margin: -11px 0 0 -16%;
font-size: 14px; font-size: 14px;
color: #9076FF; color: #9076FF;
} }
.draft { .draft {
color: #ccc; .ver, .sign {
color: #b1b1b1;
}
} }
.ver { .ver {
display: flex; display: flex;
@ -179,8 +198,9 @@ export default {
.action { .action {
margin-left: 15px; margin-left: 15px;
i { i {
margin-left: 5px; margin-left: 8px;
font-size: 14px; font-size: 14px;
color: #9076FF;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
opacity: .9; opacity: .9;

24
src/views/user/User.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<el-row :gutter="20">
<el-col :span="24">
<el-card shadow="hover" class="mgb20"> <el-card shadow="hover" class="mgb20">
<div> <div>
<div class="flex-center mgb20"> <div class="flex-center mgb20">
@ -61,7 +59,7 @@
</el-col> --> </el-col> -->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8" style="width: 32.8%;margin-right: 0.5333%">
<el-form-item label="创建时间" class="userRadio"> <el-form-item label="创建时间" class="userRadio">
<el-radio-group v-model="form.month"> <el-radio-group v-model="form.month">
<el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio> <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{item.name}}</el-radio>
@ -95,10 +93,8 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col>
<el-col :span="24"> <el-card shadow="hover" class="card">
<el-card shadow="hover" class="mgb20">
<div class="flex-between mgb20"> <div class="flex-between mgb20">
<div class="flex-center"> <div class="flex-center">
<p class="hr_tag"></p> <p class="hr_tag"></p>
@ -135,8 +131,6 @@
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
</el-col>
</el-row>
</div> </div>
</template> </template>
@ -407,11 +401,21 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-form-item{ .card {
min-height: calc(100vh - 380px);
}
.el-form-item{
margin-bottom: 0; margin-bottom: 0;
/deep/.el-radio {
width: 87px;
text-align: center;
.el-radio__label {
padding-left: 0;
}
}
.el-radio.is-bordered+.el-radio.is-bordered{ .el-radio.is-bordered+.el-radio.is-bordered{
margin-left: 0; margin-left: 0;
} }
} }
</style> </style>

19
vue.config.js
Unescape View File

@ -1,24 +1,5 @@
// 引入等比适配插件
const px2rem = require("postcss-px2rem");
// 配置基本大小
const postcss = px2rem({
// 基准大小 baseSize，需要和rem.js中相同
remUnit: 16
});
// 使用等比适配插件
module.exports = { module.exports = {
lintOnSave: true, lintOnSave: true,
css: {
loaderOptions: {
postcss: {
plugins: [
postcss
]
}
}
},
publicPath: "./", publicPath: "./",
outputDir: "dist", outputDir: "dist",
assetsDir: "static", assetsDir: "static",

Write Preview
Loading…
Cancel
Save