Skip to content

Z
zh-baseversion-project
Commit cb2ae5df authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

Merge branch 'jzl'

parents 42222754 41094c1a
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 43 deletions
zh-baseversion-web/public/index.html
View file @ cb2ae5df
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <title><%= webpackConfig.name %></title> -->
<title>...</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<script>
window._AMapSecurityConfig = {
securityJsCode:'d4bb6c4d7a074701457bc9721eb7754a',
}
</script>
<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=72306333e96c7806b856a9bc69afc402&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script> -->
<script src="https://webapi.amap.com/maps?v=2.0&key=49fcb156d466062435d7d33437099582&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
<script src="https://webapi.amap.com/loca?v=2.0.0&key=49fcb156d466062435d7d33437099582"></script>
<script src="h5player/h5player.min.js"></script>
<style>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <title><%= webpackConfig.name %></title> -->
<title>...</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<script>
window._AMapSecurityConfig = {
securityJsCode: 'd4bb6c4d7a074701457bc9721eb7754a',
}
document.title = window.localStorage.getItem('title')
</script>
<!-- <script src="https://webapi.amap.com/maps?v=2.0&key=72306333e96c7806b856a9bc69afc402&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script> -->
<script
src="https://webapi.amap.com/maps?v=2.0&key=49fcb156d466062435d7d33437099582&plugin=Map3D,AMap.DistrictSearch,AMap.Scale,AMap.OverView,AMap.ToolBar,AMap.MouseTool,AMap.ControlBar,AMap.CircleEditor,AMap.PolyEditor"></script>
<script src="https://webapi.amap.com/loca?v=2.0.0&key=49fcb156d466062435d7d33437099582"></script>
<script src="h5player/h5player.min.js"></script>
<style>
html,
body,
#app {
......@@ -26,6 +30,7 @@
margin: 0px;
padding: 0px;
}
.chromeframe {
margin: 0.2em 0;
background: #ccc;
......@@ -102,6 +107,7 @@
-ms-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg);
......@@ -115,6 +121,7 @@
-ms-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
-ms-transform: rotate(360deg);
......@@ -204,15 +211,17 @@
opacity: 0.5;
}
</style>
</head>
<body>
<div id="app">
<div id="loader-wrapper">
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div>
</div>
</div>
</body>
</html>
</head>
<body>
<div id="app">
<div id="loader-wrapper">
<div id="loader"></div>
<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>
<div class="load_title">正在加载系统资源，请耐心等待</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
zh-baseversion-web/src/components/bigWindow/PipeColor.vue
View file @ cb2ae5df
<!--
* @Author: your name
* @Date: 2022-01-26 10:52:10
* @LastEditTime: 2024-08-01 10:20:35
* @LastEditTime: 2024-08-02 16:23:49
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/PipeColor.vue
......@@ -9,8 +9,8 @@
<template>
<div>
<div v-if="b" class="pipePressure">
<div class="dx" :class="{ active: active }" @click.stop="showAnimate">
管道动效
<div class="dx" >
<el-checkbox @change="showAnimate" v-model="show">流动方向</el-checkbox>
</div>
<div class="">
<div class="hasColorBox" :style="{ color: pipeColor[`1`] }">
......@@ -58,13 +58,14 @@ export default {
return {
pipeColor,
mapStyle: true,
active: true,
show: true,
};
},
methods: {
showAnimate() {
this.active = !this.active;
this.$emit("showAnimate", this.active);
showAnimate(e) {
console.log(e)
// this.show = e;
this.$emit("showAnimate", e);
},
// 更改卫星图
mapChange(num) {
......@@ -78,6 +79,18 @@ export default {
},
};
</script>
<style lang="scss">
.pipePressure {
.el-checkbox__label {
color: #1890ff;
}
.el-checkbox__inner{
border-color:#1890ff;
background: rgba(24, 144, 255,0.2);
}
}
</style>
<style lang="scss" scoped>
.pipePressure {
......@@ -100,18 +113,17 @@ export default {
height: 32px;
top: -27px;
left: -4px;
// margin-bottom:10px;
color: #fff;
line-height: 32px;
text-align: center;
/* background: linear-gradient(86deg, #112238 0%, #086187 62%, #112238 100%);
box-shadow: inset 0px 1px 2px 1px #125c9b; */
font-size: 14px;
padding: 0px 10px;
cursor: pointer;
background: rgba(31, 106, 215, 0.32);
// background: rgba(31, 106, 215, 0.32);
box-sizing: border-box;
border: 1px solid #2d64b4;
// border: 1px solid #2d64b4;
border-radius: 2px;
&:hover {
// opacity: 0.7;
......
zh-baseversion-web/src/views/login.vue
View file @ cb2ae5df
......@@ -132,6 +132,7 @@ export default {
this.loginForm.uuid = res.uuid;
this.cityName = res.cityName;
document.title = this.cityName;
window.localStorage.setItem('title',this.cityName)
});
......
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