前台页面修改

dev
rosehan 3 years ago
parent e14c5fc31f
commit 32827631a8
  1. 60
      ruoyi-ui/src/assets/styles/picture-common.scss
  2. 3
      ruoyi-ui/src/views/components/p-dialog/BaseDialog.vue
  3. 24
      ruoyi-ui/src/views/picture/resource-monitoring/dialog-module/scenic-list.vue
  4. 38
      ruoyi-ui/src/views/picture/resource-monitoring/index.vue
  5. 10
      ruoyi-ui/src/views/picture/resource-monitoring/resoure-dialog.vue
  6. 6
      ruoyi-ui/vue.config.js

@ -711,6 +711,7 @@ body {
background-clip: text;
}
}
/* 饱和度 */
.p-flow-saturation {
padding: $p-spacer-large;
@ -796,6 +797,65 @@ body {
border-radius: 30rem;
}
}
.p-dialog {
.el-dialog {
background: $p-dark-bg;
}
.el-dialog__header {
position: relative;
padding-left: 50rem;
padding-bottom: 0;
.el-dialog__title {
z-index: 10;
font-size: 24rem;
font-family: YouSheBiaoTiHei;
color: transparent;
background-image: linear-gradient(to bottom, #fff 40%, $p-primary-color);
-webkit-background-clip: text;
background-clip: text;
}
}
.el-dialog__header:before {
content: "";
position: absolute;
left: 20rem;
bottom: 5rem;
width: 20rem;
height: 20rem;
background: url("~@/assets/images/p_dialog_tittle_icon.svg");
background-size: contain;
background-position: center;
background-repeat: no-repeat;
}
.el-dialog__body {
padding: $p-spacer-medium;
}
.el-icon-close:before {
content: '';
}
.el-dialog__headerbtn {
top: 10rem;
width: 30rem;
height: 30rem;
background-image: url('~@/assets/images/icon_close.svg');
background-size: contain;
background-repeat: no-repeat;
background-position: center;
opacity: .6;
}
.el-dialog__headerbtn:hover {
opacity: 1;
}
}
/* 分页 */
.p-pagination {
input {

@ -1,6 +1,7 @@
<template>
<!-- 基础弹框 -->
<div class="p-dialog">
<div class="p-dialog-title">
<i class="p-dialog-title-icon"></i>
<div class="p-dialog-title-text"><span>{{ title }}</span></div>
@ -68,7 +69,7 @@ export default {
background-clip: text;
}
.p-dialog-title-text:after {
.p-dialog-title-text span:after {
content: "";
position: absolute;
z-index: 9;

@ -1,7 +1,6 @@
<template>
<base-dialog :title="title">
<div class="p-container">
<el-table class="p-table" :data="WarningQueueDate" align="center" show-overflow-tooltip="true" height="450">
<div>
<el-table class="p-table" :data="data" align="center" show-overflow-tooltip="true" height="450">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column prop="area" label="区域" width="180"></el-table-column>
<el-table-column prop="name" label="资源名称" width="180"></el-table-column>
@ -11,17 +10,12 @@
<el-table-column prop="contacts" label="联系人"></el-table-column>
<el-table-column prop="phone" label="联系电话"></el-table-column>
</el-table>
</div>
</base-dialog>
</div>
</template>
<script>
//
import baseDialog from "@/views/components/p-dialog/BaseDialog";
export default {
name: "scenic-dialog",
components: {baseDialog},
props: {
title: {
type: String,
@ -30,18 +24,6 @@ export default {
},
data() {
return {
WarningQueueDate: [
{
number: '',
area: "河南郑州市登封市",
name: "少林景区",
level: 'AAAAA',
tip: '自然风光,人文景观,历史遗产,研学基地',
address: 'G207(锡海线',
contacts: " HJ",
phone: "0371-62745000",
}
]
}
}
}

@ -88,7 +88,7 @@
<base-data :text="15144" class="p-resource-seek-data"></base-data>
<div class="p-resource-search-btn"><i class="iconfont icon-search"></i></div>
</div>
<div class="p-resource-seek-list" @click="getDialog('list')"><i class="iconfont icon-list"></i></div>
<div class="p-resource-seek-list" @click="getDialog()"><i class="iconfont icon-list"></i></div>
</div>
<!-- 资源列表 筛选 -->
<div class="display-flex p-resource-top-filter">
@ -160,9 +160,18 @@
</base-module>
<!-- 旅游资源弹窗 -->
<resoure-dialog :type="dialogType" v-if="dialogStatus" :propsData="dialogData">
<base-close @handleClick="closeDialog()"></base-close>
</resoure-dialog>
<el-dialog title="景区" :visible.sync="dialogStatus" :modal="false" class="p-dialog">
<el-table class="p-table" :data="WarningQueueDate" align="center" show-overflow-tooltip="true" height="450">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column prop="area" label="区域" width="180"></el-table-column>
<el-table-column prop="name" label="资源名称" width="180"></el-table-column>
<el-table-column prop="level" label="等级"></el-table-column>
<el-table-column prop="tip" label="标签"></el-table-column>
<el-table-column prop="address" label="地址"></el-table-column>
<el-table-column prop="contacts" label="联系人"></el-table-column>
<el-table-column prop="phone" label="联系电话"></el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
@ -180,11 +189,24 @@ import baseLevel from "@/views/components/p-level/BaseLevel";
import resoureDialog from "@/views/picture/resource-monitoring/resoure-dialog";
//
import BaseClose from "@/views/components/p-close/BaseClose";
export default {
name: "index",
components: {resourceCard, baseDataWarn, baseDataIcon, baseNumBox, baseLevel, resoureDialog,BaseClose},
components: {resourceCard, baseDataWarn, baseDataIcon, baseNumBox, baseLevel, resoureDialog, BaseClose},
data() {
return {
WarningQueueDate: [
{
number: '',
area: "河南郑州市登封市",
name: "少林景区",
level: 'AAAAA',
tip: '自然风光,人文景观,历史遗产,研学基地',
address: 'G207(锡海线',
contacts: " HJ",
phone: "0371-62745000",
}
],
//
resourceTypeData: [],
//
@ -419,13 +441,9 @@ export default {
}
]
},
getDialog(type) {
this.dialogType = type
getDialog(type,data) {
this.dialogStatus = true
},
closeDialog(){
this.dialogStatus = false
},
}
}
//

@ -1,13 +1,11 @@
<template>
<div class="p-resoure-dialog">
<slot></slot>
<workDialog v-if="type == 'work'" style="width: 500rem;height: 300rem;"></workDialog>
<guideDialog v-if="type == 'guide'" style="width: 500rem;height: 400rem;"></guideDialog>
<scenicDialog v-if="type == 'scenic'" style="width: 800rem;height: 540rem;"></scenicDialog>
<scenicList v-if="type == 'list'" title="景区" style="width: 70%;height: 700rem;"></scenicList>
<workDialog v-if="type == 'work'"></workDialog>
<guideDialog v-if="type == 'guide'"></guideDialog>
<scenicDialog v-if="type == 'scenic'"></scenicDialog>
<scenicList v-if="type == 'list'"></scenicList>
</div>
</template>
<script>
import workDialog from "@/views/picture/resource-monitoring/dialog-module/work-dialog";
import guideDialog from "@/views/picture/resource-monitoring/dialog-module/guide-dialog";

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://39.105.17.128:8080/`,//用户名:admin 密码Cjy@123abc
target: `http://39.105.17.128:8096/`,//用户名:cjyadmin 密码CJYjqgk@2023!
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
@ -80,8 +80,8 @@ module.exports = {
.options({
// 要公用的scss的路径
resources: [
'src/assets/styles/variables.scss',
'src/assets/styles/element-variables.scss',
//'src/assets/styles/variables.scss',
//'src/assets/styles/element-variables.scss',
'src/assets/styles/picture-variables.scss',
]
})

Loading…
Cancel
Save