Skip to content

S
shareConfig
Commit 0d96df45 by caoyanzhi
Options

Merge branch 'feature/3月迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/app.4d8922d0063ecca8c142f2a1cd2cf4d5.css
#	dist/static/css/app.af2af7e03646b42c307c0a1491bccc44.css
#	dist/static/css/app.f5b7d1a93afb487ac8504ce01816f264.css
#	dist/static/js/2.147931d47ab81fe64ff0.js
#	dist/static/js/2.723c8aba5a6f697ca278.js
#	dist/static/js/2.dd6fe943ed95337a5547.js
#	dist/static/js/manifest.a7fcbb98ec78f0be1739.js
parents c7bd27e6 5d326ff4
Showing with 21 additions and 16 deletions
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title></title><link href=./static/css/app.af2af7e03646b42c307c0a1491bccc44.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() { <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title></title><link href=./static/css/app.af2af7e03646b42c307c0a1491bccc44.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title></title><link href=./static/css/app.f5b7d1a93afb487ac8504ce01816f264.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
>>>>>>> feature/3月迭代
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime(); var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host; var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host; host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>'); document.write('<script src="//' + host + src + '"><\/script>');
<<<<<<< HEAD
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.57d6ca9c2421666b7c74.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.bbfbc6705314535a50ea.js></script></body></html> })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.57d6ca9c2421666b7c74.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.bbfbc6705314535a50ea.js></script></body></html>
=======
})();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.a7fcbb98ec78f0be1739.js></script><script type=text/javascript src=./static/js/vendor.9544ccf6dd154a9fd130.js></script><script type=text/javascript src=./static/js/app.7c385e40c6a1f53565e9.js></script></body></html>
>>>>>>> feature/3月迭代
dist/static/css/app.af2af7e03646b42c307c0a1491bccc44.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.f5b7d1a93afb487ac8504ce01816f264.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.723c8aba5a6f697ca278.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.dd6fe943ed95337a5547.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.a7fcbb98ec78f0be1739.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,b=0,d=[];b<r.length;b++)i=r[b],t[i]&&d.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(b=0;b<a.length;b++)u=o(o.s=a[b]);return u};var r={},t={16:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"972fd2513f77a5907c73",1:"3d4d814fa62b6dc93c2b",2:"723c8aba5a6f697ca278",3:"83c7b0c9ac23e5816596",4:"f03b954743e0ba49ef60",5:"33478b4d2e3e77d8002c",6:"78ea18443b9878f553ab",7:"cbfb1c1422fe6c812024",8:"891bbc4365b8362d5195",9:"7cc1b38988e254182ad8",10:"f82027d73a741225715e",11:"99b3a44189807b8a4b27",12:"2deb3f3fa46a025b2979",13:"c56e738cf2686e837bd8"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/active/finished-active.vue
...@@ -210,11 +210,10 @@ export default { ...@@ -210,11 +210,10 @@ export default {
} }
.finished-active { .finished-active {
width: 100%; width: 100%;
padding: 0 20px 48px 20px; padding: 20px;
background: #fff; background: #fff;
li { li {
// height: 90px; // height: 90px;
padding: 0 20px;
cursor: pointer; cursor: pointer;
&.li-border { &.li-border {
padding: 0 20px; padding: 0 20px;
......
src/components/active/funnel-chart.vue
...@@ -22,7 +22,7 @@ import funnelChart from '@/components/active/funnel-chart.vue'; ...@@ -22,7 +22,7 @@ import funnelChart from '@/components/active/funnel-chart.vue';
:key="index" :key="index"
class="flex-1 flex flex-column" class="flex-1 flex flex-column"
> >
<div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line r-60"></div> <div class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center space-line"></div>
<div <div
v-if="index != funnelData.router.length-1" v-if="index != funnelData.router.length-1"
class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa" class="flex-1 flex flex-pack-center font-12 color-606066 flex-align-center inner-bg bg-f5f7fa"
...@@ -38,7 +38,7 @@ import funnelChart from '@/components/active/funnel-chart.vue'; ...@@ -38,7 +38,7 @@ import funnelChart from '@/components/active/funnel-chart.vue';
:key="index" :key="index"
class="flex-1 flex flex-column" class="flex-1 flex flex-column"
> >
<div class="flex-1 flex flex-align-center space-line p-l-98 font-12 color-606066">{{item.transName}} {{ item.countNumber }} 人 <span v-if="item.transId == 32 ">, {{item.countAmount | formatThousand }} 元</span></div> <div class="flex-1 flex flex-align-center p-l-60 font-12 color-606066">{{item.transName}} {{ item.countNumber }} 人 <span v-if="item.transId == 32 ">, {{item.countAmount | formatThousand }} 元</span></div>
<div <div
v-if="index != funnelData.router.length-1" v-if="index != funnelData.router.length-1"
class="flex-1 flex flex-align-center bg-f5f7fa" class="flex-1 flex flex-align-center bg-f5f7fa"
...@@ -74,8 +74,9 @@ export default { ...@@ -74,8 +74,9 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.funnel-chart { .funnel-chart {
width: 595px; // width: 595px;
min-width: 595px; // min-width: 595px;
width: 100%;
height: 346px; height: 346px;
padding: 40px 0 0 52px; padding: 40px 0 0 52px;
margin-left: 38px; margin-left: 38px;
...@@ -295,7 +296,7 @@ export default { ...@@ -295,7 +296,7 @@ export default {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: -36%; right: -36%;
width: 81px; width: 55px;
height: 1px; height: 1px;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%);
...@@ -335,11 +336,11 @@ export default { ...@@ -335,11 +336,11 @@ export default {
} }
.chart-right { .chart-right {
position: relative; position: relative;
width: 327px; // width: 327px;
// float: left; // float: left;
.chart-text { .chart-text {
position: relative; position: relative;
width: 327px; // width: 327px;
height: 269px; height: 269px;
} }
} }
......
src/components/active/in-progress-active.vue
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
} }
.in-progress-active { .in-progress-active {
width: 100%; width: 100%;
padding: 0 20px 48px 20px; padding: 20px;
background: #fff; background: #fff;
.el-tag { .el-tag {
/* background-color: transparent; /* background-color: transparent;
...@@ -417,7 +417,6 @@ export default { ...@@ -417,7 +417,6 @@ export default {
} }
li { li {
// height: 90px; // height: 90px;
padding: 0 20px;
cursor: pointer; cursor: pointer;
&.li-border { &.li-border {
padding: 0 20px; padding: 0 20px;
...@@ -428,14 +427,10 @@ export default { ...@@ -428,14 +427,10 @@ export default {
} }
.in-progress-active-title { .in-progress-active-title {
width: 100%; width: 100%;
padding-bottom: 20px;
border-bottom: 1px solid #dcdfe6; border-bottom: 1px solid #dcdfe6;
.active-title-left { .active-title-left {
width: calc(100% - 380px); width: calc(100% - 380px);
padding: 20px 0;
}
.active-title-right {
padding: 20px 0;
} }
} }
.in-progress-active-body { .in-progress-active-body {
......
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