Skip to content

T
traffic-front
Commit 8f6e1f5e authored by eddie.woo's avatar eddie.woo
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents d1139637 5d513a45
Expand all Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 26 deletions
atms-orangeheap/src/assets/menu.svg 0 → 100644
View file @ 8f6e1f5e
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="&#x56FE;&#x5C42;_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 28 28" style="enable-background:new 0 0 28 28;" xml:space="preserve">
<path d="M27,4H1C0.448,4,0,3.552,0,3v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,3.552,27.552,4,27,4z"/>
<path d="M27,15H1c-0.552,0-1-0.448-1-1v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,14.552,27.552,15,27,15z"/>
<path d="M27,26H1c-0.552,0-1-0.448-1-1v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,25.552,27.552,26,27,26z"/>
</svg>
atms-orangeheap/src/components/Panel.vue
View file @ 8f6e1f5e
<template> <template>
<v-container > <v-container>
<v-navigation-drawer <v-navigation-drawer
v-model="drawerRight" v-model="drawerRight"
fixed fixed
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
fixed fixed
app app
clipped-right clipped-right
height="90" height="45"
color="#ffffff" color="#ffffff"
style="border-bottom: 1px solid #dddddd" style="border-bottom: 1px solid #dddddd"
> >
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
<span class="body-2" <span class="body-2"
@click.stop="drawerRight = !drawerRight" style="vertical-align: middle; margin-right: 5px; width:100%" @click.stop="drawerRight = !drawerRight" style="vertical-align: middle; margin-right: 5px; width:100%"
> >
<svg class="icon" aria-hidden="true" ><use <svg class="icon" aria-hidden="true" style="height:14px"><use
:xlink:href="selectedItem.iconName"></use></svg> :xlink:href="selectedItem.iconName"></use></svg>
<span style="vertical-align: middle; margin-left: 10px;font-weight:normal; font-size:26px" v-text="selectedItem.title"></span> <span style="vertical-align: middle; margin-left: 10px;font-weight:normal; font-size:12px/16px" v-text="selectedItem.title"></span>
<v-icon style="vertical-align: middle;margin-top:5px;float:right;height:28px;width:28px;color:#333333;">menu</v-icon> <img src="../assets/menu.svg" style="vertical-align: middle;margin-top:5px;float:right;height:14px;width:14px;color:#333333;"></img>
</span> </span>
<!-- <v-btn large--> <!-- <v-btn large-->
...@@ -73,10 +73,9 @@ ...@@ -73,10 +73,9 @@
<!-- </v-btn>--> <!-- </v-btn>-->
<!-- <v-toolbar-side-icon @click.stop="drawerRight = !drawerRight"></v-toolbar-side-icon>--> <!-- <v-toolbar-side-icon @click.stop="drawerRight = !drawerRight"></v-toolbar-side-icon>-->
</v-toolbar> </v-toolbar>
<v-container ma-0 pa-0> <v-container ma-0 pa-0 >
<Tableau :url="chartUrl" <Tableau :url="chartUrl"
width="100%" width="100%"
ref="tableau" ref="tableau"
:apiUrl="tableauApiUrl" :apiUrl="tableauApiUrl"
> >
...@@ -246,8 +245,5 @@ ...@@ -246,8 +245,5 @@
<style scoped> <style scoped>
.head {
height: 90px;
background-color: red;
}
</style> </style>
\ No newline at end of file
atms-orangeheap/src/views/ChartApp.vue
View file @ 8f6e1f5e
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
:active.sync="bottomNav" :active.sync="bottomNav"
:value="true" :value="true"
color="#ffffff" color="#ffffff"
height="48px"
absolute absolute
style=" overflow: hidden; style=" overflow: hidden;
position: fixed; position: fixed;
...@@ -16,26 +17,24 @@ ...@@ -16,26 +17,24 @@
border-top:1px solid #dddddd;" border-top:1px solid #dddddd;"
> >
<v-btn <v-btn @click="clickOne()"
color="#333333"
flat flat
value="panel" value="panel"
depressed depressed
:to="{name: 'panel'}" :to="{name: 'panel'}"
> >
<span style="font-size:20px ; ">仪表盘</span> <span :color="color_font1" style="font-size:10px ; ">仪表盘</span>
<v-icon >table_chart</v-icon> <v-icon :color="color_icon1" >table_chart</v-icon>
</v-btn> </v-btn>
<v-btn <v-btn @click="clickTwo()"
color="#333333"
flat flat
value="mine" value="mine"
depressed depressed
:to="{name: 'mine'}" :to="{name: 'mine'}"
> >
<span style="font-size:20px ; " > 我的</span> <span :color="color_font2" style="font-size:10px ; " > 我的</span>
<v-icon >account_box</v-icon> <v-icon :color="color_icon2" >account_box</v-icon>
</v-btn> </v-btn>
</v-bottom-nav> </v-bottom-nav>
...@@ -47,9 +46,31 @@ ...@@ -47,9 +46,31 @@
export default { export default {
data() { data() {
return { return {
color_icon2:'#dddddd',
color_icon1:'#333333',
color_font2:'#999999',
color_font1:'#333333',
bottomNav: 'panel' bottomNav: 'panel'
} }
}, },
methods: {
clickOne() {
this.color_icon1='#333333'
this.color_icon2='#dddddd'
this.color_font1='#333333'
this.color_font2='#999999'
},
clickTwo() {
this.color_icon2='#333333'
this.color_icon1='#dddddd'
this.color_font2='#333333'
this.color_font1='#999999'
}
},
components: { components: {
...@@ -83,7 +104,5 @@ ...@@ -83,7 +104,5 @@
</script> </script>
<style scoped> <style scoped>
.color_active{
color:red!important;
}
</style> </style>
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/css/app.73dfc5ab.css deleted 100644 → 0
View file @ d1139637
.color_active[data-v-60ac6546]{color:red!important}.head[data-v-18a52f4a]{height:90px;background-color:red}.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/css/app.cf16809e.css 0 → 100644
View file @ 8f6e1f5e
.icon{width:1em;height:1em;vertical-align:-.15em;fill:currentColor;overflow:hidden}
\ No newline at end of file
atms-web/src/main/webapp/orangeweb/img/menu.9d6ebf86.svg 0 → 100644
View file @ 8f6e1f5e
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="&#x56FE;&#x5C42;_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 28 28" style="enable-background:new 0 0 28 28;" xml:space="preserve">
<path d="M27,4H1C0.448,4,0,3.552,0,3v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,3.552,27.552,4,27,4z"/>
<path d="M27,15H1c-0.552,0-1-0.448-1-1v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,14.552,27.552,15,27,15z"/>
<path d="M27,26H1c-0.552,0-1-0.448-1-1v0c0-0.552,0.448-1,1-1h26c0.552,0,1,0.448,1,1v0C28,25.552,27.552,26,27,26z"/>
</svg>
atms-web/src/main/webapp/orangeweb/index.html
View file @ 8f6e1f5e
...@@ -49,4 +49,4 @@ ...@@ -49,4 +49,4 @@
//send 发送 //send 发送
xmlhttp.send(); xmlhttp.send();
}*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.73dfc5ab.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.07374ae8.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.73dfc5ab.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.07374ae8.js></script></body></html> }*/</script><link rel=icon href=favicon.ico><title>didi2</title><link rel=stylesheet href=font_roboto.css><link rel=stylesheet href=font_material.css><link href=js/about.17654e8a.js rel=prefetch><link href=css/app.cf16809e.css rel=preload as=style><link href=css/chunk-vendors.ce5e3dd4.css rel=preload as=style><link href=js/app.49c9c2b6.js rel=preload as=script><link href=js/chunk-vendors.670ff040.js rel=preload as=script><link href=css/chunk-vendors.ce5e3dd4.css rel=stylesheet><link href=css/app.cf16809e.css rel=stylesheet></head><body><noscript><strong>We're sorry but didi2 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.670ff040.js></script><script src=js/app.49c9c2b6.js></script></body></html>
\ No newline at end of file \ No newline at end of file
atms-web/src/main/webapp/orangeweb/js/app.49c9c2b6.js.map 0 → 100644
View file @ 8f6e1f5e
This diff is collapsed.
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