e27e11dd by xiaomiao

样式调整

1 parent eb96e55d
......@@ -3,10 +3,10 @@
</template>
<script>
import Chart from "./Chart";
import work from "@/api/work";
export default {
data() {
import Chart from "./Chart";
import work from "@/api/work";
export default {
data () {
return {
cdata: {
category: [],
......@@ -18,14 +18,14 @@ export default {
components: {
Chart,
},
mounted() {
mounted () {
window.addEventListener("resize", () => {
this.submitViews();
});
this.submitViews();
},
methods: {
async submitViews() {
async submitViews () {
try {
let { result: res } = await work.submitViews("A20");
this.cdata.category = [];
......@@ -43,7 +43,7 @@ export default {
}
},
},
};
};
</script>
<style lang="scss" scoped></style>
......
......@@ -7,15 +7,14 @@
ref="centreLeft2ChartRef"
width="100%"
height="100%"
:options="options"
></Echart>
:options="options"></Echart>
</template>
<script>
import Echart from "@/common/echart";
import { mapGetters } from "vuex";
export default {
data() {
import Echart from "@/common/echart";
import { mapGetters } from "vuex";
export default {
data () {
return {
options: {},
max: "100", //最大value值
......@@ -27,14 +26,14 @@ export default {
components: {
Echart,
},
created() {},
created () { },
props: {
cdata: {
type: Array,
default: () => [],
},
},
mounted() {
mounted () {
window.addEventListener("resize", () => {
this.key++;
......@@ -43,7 +42,7 @@ export default {
},
watch: {
cdata: {
handler(newData) {
handler (newData) {
let _this = this;
// 设置点的位置(经纬度)
const geoCoordMap = {
......@@ -73,8 +72,7 @@ export default {
},
// 如果需要自定义 tooltip样式,需要使用formatter
formatter: (params) => {
return `<div style="">${params.name}:${
params.value + "个"
return `<div style="">${params.name}:${params.value + "个"
}</div>`;
},
},
......@@ -164,24 +162,26 @@ export default {
},
computed: {
...mapGetters(["sidebar", "dicData"]),
logoName() {
logoName () {
return (
this.dicData["sysCode"] &&
this.dicData["sysCode"].filter((item) => item.DCODE == "areaMap")
this.dicData["sysCode"] && this.dicData["sysCode"].filter((item) => { return item.DCODE == "areaMap" })
);
},
},
methods: {
// 根据行政区代码匹配行政区
getDistrictcode() {
console.log("this.logoName.DNAME", this.logoName.DNAME);
if ((this.logoName.DNAME = "map610700")) {
getDistrictcode () {
this.mapjson = ""
if ((this.logoName[0].DNAME == "hanzhong")) {
this.mapjson = "hanzhong";
require(`@/common/map/${this.mapjson}.js`);
} else {
this.mapjson = "yushu";
require(`@/common/map/${this.mapjson}.js`);
}
},
// 开启定时器
startInterval() {
startInterval () {
const _self = this;
// 应通过接口获取配置时间,暂时写死5s
const time = 2000;
......@@ -193,7 +193,7 @@ export default {
}, time);
},
// 重新随机选中地图区域
reSelectMapRandomArea() {
reSelectMapRandomArea () {
const length = 9;
this.$nextTick(() => {
try {
......@@ -223,7 +223,7 @@ export default {
}
});
},
handleMapRandomSelect() {
handleMapRandomSelect () {
this.$nextTick(() => {
try {
const map = this.$refs.centreLeft2ChartRef.chart;
......@@ -258,6 +258,6 @@ export default {
});
},
},
};
};
</script>
<style></style>
......
......@@ -506,3 +506,16 @@ tr:hover {
.el-select-dropdown__item:hover {
background-color: transparent !important;
}
// 提示框
.el-message-box {
background-color: #031a46;
border: 1px solid #5f82c7;
.el-message-box__title{
color: white;
}
.el-message-box__content{
color: white;
}
}
......
......@@ -199,3 +199,4 @@
box-sizing: border-box;
text-align: right;
}
......
......@@ -19,10 +19,10 @@
</template>
<script>
import columnarsmat from "@/components/Echart/Columnarsmat";
import Rose from "@/components/Echart/Rose";
import work from "@/api/work";
export default {
import columnarsmat from "@/components/Echart/Columnarsmat";
import Rose from "@/components/Echart/Rose";
import work from "@/api/work";
export default {
data () {
return {
config: {
......@@ -54,28 +54,28 @@ export default {
}
}
}
}
}
</script>
<style lang="scss" scoped>
/deep/.row-item:not(:last-child) {
margin-bottom: .026rem;
}
/deep/.row-item:not(:last-child) {
margin-bottom: 0.026rem;
}
.rightcard {
.rightcard {
width: 32%;
display: flex;
height: calc(100vh - 114px);
flex-direction: column;
.cardhead {
font-size: .1042rem;
font-size: 0.1042rem;
font-weight: bold;
color: #02D9FD;
color: #02d9fd;
text-align: center;
position: absolute;
left: 0;
right: 0;
top: .0625rem;
top: 0.0625rem;
text-align: center;
}
......@@ -86,8 +86,8 @@ export default {
overflow: hidden;
.nodata {
font-size: .1042rem;
color: #02D9FD;
font-size: 0.1042rem;
color: #02d9fd;
font-weight: bold;
margin: auto;
margin-top: 120px;
......@@ -95,7 +95,7 @@ export default {
}
.cardCon {
padding: .0521rem .026rem;
padding: 0.0521rem 0.026rem;
position: relative;
text-align: center;
width: 100%;
......@@ -105,19 +105,24 @@ export default {
height: 33%;
background: url("~@/image/xjgyfwxx.png") no-repeat;
background-size: 100% 100%;
/deep/.dv-scroll-board {
.header {
height: 0.1875rem;
align-items: center;
}
}
.board {
width: 90%;
margin: 0 auto;
height: 1.1031rem;
margin-top: .0521rem;
/deep/.header{
font-size: .0738rem;
margin-top: 0.0521rem;
/deep/.header {
font-size: 0.0738rem;
}
/deep/.rows{
.ceil{
font-size: .0738rem;
color: #6BC1FC
/deep/.rows {
.ceil {
font-size: 0.0738rem;
color: #6bc1fc;
}
}
}
......@@ -127,7 +132,7 @@ export default {
height: 33%;
background: url("~@/image/djywl.png") no-repeat;
background-size: 100% 100%;
padding: .3825rem 0 0 0;
padding: 0.3825rem 0 0 0;
}
.card3 {
......@@ -138,12 +143,12 @@ export default {
padding-bottom: 0;
.cardhead {
top: .0417rem;
top: 0.0417rem;
}
}
.cardhead {
position: absolute;
}
}
}
</style>
......
......@@ -15,8 +15,8 @@
</div>
<div class="from-clues-content">
<div class="contentbox">
<base-set v-show="isshow" :userInfo="userData" />
<password-edit v-show="!isshow" :userInfo="userData" />
<base-set v-if="isshow" :userInfo="userData" />
<password-edit v-if="!isshow" :userInfo="userData" />
</div>
</div>
</div>
......
......@@ -176,4 +176,11 @@
top: 15px;
right: 30px;
}
/deep/.el-dialog__header {
text-align: center;
margin-bottom: 10px;
.el-dialog__title {
color: white;
}
}
</style>
......
......@@ -114,7 +114,7 @@
{ required: true, message: "请输入用户名", trigger: "blur" },
],
},
title: "",
title: "修改",
visible: false,
showLoginName: false,
sexList: [{ lable: "0", value: "0", name: "男" }, { lable: "1", value: "1", name: "女" }],
......@@ -230,4 +230,14 @@
/deep/.el-form-item__label {
color: #fff;
}
/deep/.el-dialog__body {
padding-top: 20px;
}
/deep/.el-dialog__header {
text-align: center;
margin-bottom: 10px;
.el-dialog__title {
color: white;
}
}
</style>
......
......@@ -316,4 +316,5 @@
.btnColRight {
margin-top: 20px;
}
</style>
......