Commit dccfdf24 authored by 朱建丰's avatar 朱建丰

=0726

parent 47be740e
# Default ignored files
/workspace.xml
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/zhengfu.iml" filepath="$PROJECT_DIR$/.idea/zhengfu.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
......@@ -79,7 +79,7 @@ export default {
>>> .el-breadcrumb__inner {
color: #333;
font-weight: bold;
font-size: 18px;
font-size: 18px !important;
a {
font-weight: 400;
font-size: 16px;
......
......@@ -28,3 +28,44 @@ npm test
```
For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
<!-- window.addEventListener('message', async function (e, d) {
if (e.data && e.data.accessToken) {
var token = e.data.accessToken;
var url =
'https://portal.lishui.gov.cn:18080/api_2021/public/index.php/index/MicroPortalLogin/getUserInfoByAccessToken?token=' +token;
var user = await fetch(url);
var contentType = user.headers.get('Content-Type');
console.log(contentType);
console.log("return user");
console.log(user.json());
console.log("finishing");
} else {
window.location.replace("./#err");
} -->
// var data = JSON.parse(e.data);
// alert(data);
// var accessToken = data.accessToken;
// alert(accessToken);
//alert(e.data)
// let data = JSON.parse(e.data);
// let accessToken = data.accessToken;
})
......@@ -88,44 +88,6 @@
viewPort(navigator.userAgent);
}, 500);
}
window.addEventListener('message', async function (e, d) {
if (e.data && e.data.accessToken) {
var token = e.data.accessToken;
var url =
'https://portal.lishui.gov.cn:18080/api_2021/public/index.php/index/MicroPortalLogin/getUserInfoByAccessToken?token=' +token;
var user = await fetch(url);
var contentType = user.headers.get('Content-Type');
console.log(contentType);
console.log("return user");
console.log(user.json());
console.log("finishing");
} else {
window.location.replace("./#err");
}
// var data = JSON.parse(e.data);
// alert(data);
// var accessToken = data.accessToken;
// alert(accessToken);
//alert(e.data)
// let data = JSON.parse(e.data);
// let accessToken = data.accessToken;
})
</script>
......
......@@ -12,7 +12,7 @@
>首页</a
></el-breadcrumb-item
>
<el-breadcrumb-item>{{ breadData.page_name }}</el-breadcrumb-item>
<el-breadcrumb-item >{{ breadData.page_name }}</el-breadcrumb-item>
</el-breadcrumb>
<div>
<i class="iconfont icon-chengshi"></i>
......@@ -24,7 +24,7 @@
<div class="breadcrumb-text" v-if="show">
<div class="breadcrumb-title">
<img src="../assets/images/target.png" alt="" />
<span>年度目标</span>
<span style="font-size:16px !important">年度目标</span>
<div class="s-line"></div>
{{ breadData.annual_target }}
</div>
......@@ -89,6 +89,8 @@ export default {
align-items: center;
}
}
.breadcrumb-text {
padding: 16px 20px 0;
}
......@@ -99,7 +101,8 @@ export default {
span {
color: #1492ff;
margin-right: 8px;
font-size: 18px;
font-weight: bold;
font-size: 18px !important;
}
.s-line {
width: 1px;
......
......@@ -18,8 +18,7 @@ import Szsy from '../views/Szsy.vue'
import Err from '../views/err.vue'
Vue.use(Router)
var router = new Router({
routes: [
{
routes: [{
path: '/',
name: 'Index',
component: MyIndex
......@@ -27,86 +26,122 @@ var router = new Router({
{
path: '/xxczh',
name: 'NewUrbanization',
meta: { title: '新型城镇化' },
meta: {
title: '新型城镇化'
},
component: Xxczh
},
{
path: '/msbz',
name: 'live',
meta: { title: '民生保障' },
meta: {
title: '民生保障'
},
component: Msbz
},
{
path: '/qyxtfz',
name: 'region',
meta: { title: '区域协调发展' },
meta: {
title: '区域协调发展'
},
component: Qyxtfz
},
{
path: '/cyfz',
name: 'Cyfz',
meta: { title: '产业发展' },
meta: {
title: '产业发展'
},
component: Cyfz
},
{
path: '/xczx',
name: 'Xczx',
meta: { title: '乡村振兴' },
meta: {
title: '乡村振兴'
},
component: Xczx
},
{
path: '/aqsc',
name: 'Aqsc',
meta: { title: '安全生产' },
meta: {
title: '安全生产'
},
component: Aqsc
},
{
path: '/sxh',
name: 'Sxh',
meta: { title: '双循环' },
meta: {
title: '双循环'
},
component: Sxh
},
{
path: '/kjcx',
name: 'Kjcx',
meta: { title: '科技创新' },
meta: {
title: '科技创新'
},
component: Kjcx
},
{
path: '/yshj',
name: 'Yshj',
meta: { title: '营商环境' },
meta: {
title: '营商环境'
},
component: Yshj
},
{
path: '/ctfy',
name: 'Ctfy',
meta: { title: '常态防疫' },
meta: {
title: '常态防疫'
},
component: Ctfy
},
{
path: '/cthfy',
name: 'Cthfy',
meta: {
title: '常态防疫'
},
component: Ctfy
},
{
path: '/stwm',
name: 'Stwm',
meta: { title: '生态文明' },
meta: {
title: '生态文明'
},
component: Stwm
},
{
path: '/xxgl',
name: 'Xxgl',
meta: { title: '信息管理' },
meta: {
title: '信息管理'
},
component: Xxgl
},
{
path: '/szsy',
name: 'Szsy',
meta: { title: '双招双引' },
meta: {
title: '双招双引'
},
component: Szsy
},
{
path: '/err',
name: 'Err',
meta: { title: '无权限' },
meta: {
title: '无权限'
},
component: Err
}
]
......@@ -122,20 +157,7 @@ router.beforeEach((to, from, next) => {
// if (to.path == "/login"||to.path=="/nopower") {
next()
// if (to.path == '/') {
// next()
// } else if (to.fullPath.indexOf('?') != -1) {
// let tag = to.fullPath.split('?')[1]
// let obj = {}
// obj[tag.split('=')[0]] = tag.split('=')[1]
// if (obj.debug == "true") {
// next();
// } else {
// next({name: 'Err'})
// }
// } else {
// next({name: 'Err'})
// }
// } else {
......@@ -149,16 +171,31 @@ router.beforeEach((to, from, next) => {
/*---------埋点代码开始 (路由切换执行)----------*/
// 单页应用 或 “单个页面”需异步补充PV日志参数还需进行如下埋点:
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['aplus-waiting', 'MAN'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['aplus-waiting', 'MAN']
});
// PV日志接收日志域名,必须按实际情况填写
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['aplus-rhost-v', 'alog.zjzwfw.gov.cn'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['aplus-rhost-v', 'alog.zjzwfw.gov.cn']
});
// 一般日志(如点击和曝光)接收日志域名
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['aplus-rhost-g', 'alog.zjzwfw.gov.cn'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['aplus-rhost-g', 'alog.zjzwfw.gov.cn']
});
// 判单设备设置appId
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['appId', isAndroid ? '28302650' : isIOS ? '28328447' : '47130293'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['appId', isAndroid ? '28302650' : isIOS ? '28328447' : '47130293']
});
// 如采集用户信息是异步行为需要先执行这个BLOCK埋点
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['_hold', 'BLOCK'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['_hold', 'BLOCK']
});
aplus_queue.push({
'action': 'aplus.sendPV',
......@@ -194,7 +231,10 @@ router.beforeEach((to, from, next) => {
});
// 如采集用户信息是异步行为,需要先设置完用户信息后再执行这个START埋点
// 此时被block住的日志会携带上用户信息逐条发出
aplus_queue.push({ action: 'aplus.setMetaInfo', arguments: ['_hold', 'START'] });
aplus_queue.push({
action: 'aplus.setMetaInfo',
arguments: ['_hold', 'START']
});
/*---------埋点代码结束----------*/
......
function parseUser(json) {
if (json.code != "200") {
return null;
}
var data = json.data;
if (data == null || data == undefined) {
return null;
}
var username = data.username;
if (username == null || username == undefined || username == "") {
return null;
}
return username;
}
export async function messageFun(e) {
if (e.data && e.data.accessToken) {
var token = e.data.accessToken;
if (token == null || token == undefined) {
return false;
}
try {
console.log(token);
var url =
'https://portal.lishui.gov.cn:18080/api_2021/public/index.php/index/MicroPortalLogin/getUserInfoByAccessToken?accessToken=' + token;
var user = await fetch(url);
console.log(url);
var contentType = user.headers.get('Content-Type');
console.log(contentType);
console.log("return user");
var json = await user.json();
var username = parseUser(json);
console.log(json);
console.log("welcome:" + username);
if (username == null) {
return false;
}
console.log("finishing");
} catch (e) {
return false;
}
} else {
return false;
}
return true;
}
This diff is collapsed.
This diff is collapsed.
<template>
<div class="epidemic">
<div class="shadow">
<div class="epidemic main">
<div class="minHeader shadow">
<Breadcrumb :breadData="breadData"></Breadcrumb>
</div>
<div class="epidemic-tabs mt20">
......@@ -193,13 +193,13 @@
<el-col :sm="8" :xs="24">
<div class="vt-ipt">
<p>证件号码</p>
<input type="text" v-model="vt.vt_code1" />
<input type="text" v-model="vt.vt_code1"/>
</div>
</el-col>
<el-col :sm="8" :xs="16">
<div class="vt-ipt">
<p>电子监管码</p>
<input type="text" v-model="vt.vt_code2" />
<input type="text" v-model="vt.vt_code2"/>
</div>
</el-col>
<el-col :sm="4" :xs="8">
......@@ -483,7 +483,7 @@
</div>
<div class="re-search">
<p>冷链码</p>
<input type="text" />
<input type="text"/>
<button>
<i class="el-icon-search"></i>
检索
......@@ -520,10 +520,12 @@
</template>
<script>
import Breadcrumb from "../components/Breadcrumb.vue";
export default {
import Breadcrumb from "../components/Breadcrumb.vue";
import {messageFun} from '../util/jianquan'
export default {
name: "epidemic",
components: { Breadcrumb },
components: {Breadcrumb},
data() {
return {
breadData: {
......@@ -689,6 +691,7 @@ export default {
};
},
mounted() {
this.listenMessage();
this.init_circle_1();
this.init_circle_2();
this.init_line_1();
......@@ -705,6 +708,19 @@ export default {
});
},
methods: {
listenMessage() {
window.addEventListener('message', this.bindThis.bind(this));
},
async bindThis(e) {
const query = this.$route.query;
if (query.debug == "true") {
return;
}
const ret = await messageFun(e);
if (ret == false) {
this.$router.push("err");
}
},
tabIdx(i) {
this.epidemic_tabs_idx = i;
},
......@@ -1051,24 +1067,26 @@ export default {
});
},
},
};
};
</script>
<style lang='scss' scoped>
.epidemic {
.epidemic {
// background: #666;
// width: 1300px;
width: calc(100% - 40px);
margin: 0px auto;
padding: 20px
}
.module-tit{
}
.module-tit {
font-size: 20px;
padding: 16px 0 12px 12px;
font-weight: 600;
position: relative;
}
.module-tit::before{
}
.module-tit::before {
content: "";
position: absolute;
left: 0px;
......@@ -1076,22 +1094,25 @@ export default {
width: 4px;
height: 28px;
background-color: #1492ff;
}
.unify-item{
}
.unify-item {
box-sizing: border-box;
padding: 0 20px 12px;
background-color: #fff;
border-radius: 4px;
margin-bottom: 20px;
}
.shadow {
}
.shadow {
box-shadow: 0 2px 12px 0 #ccc;
}
}
h3 {
h3 {
border-bottom: 1px solid #ddd;
}
button {
}
button {
padding: 0 12px;
height: 30px;
line-height: 30px;
......@@ -1100,8 +1121,9 @@ button {
border: 0;
color: #fff;
font-size: 16px;
}
input {
}
input {
height: 28px;
outline: none;
border: 0;
......@@ -1110,15 +1132,18 @@ input {
margin-left: 5px;
font-size: 16px;
padding: 0 8px;
}
.ep-name {
}
.ep-name {
font-size: 18px;
color: #1492ff;
margin: 8px 0;
text-align: center;
}
.e-pro {
}
.e-pro {
position: relative;
.e-pro-text {
position: absolute;
top: 50%;
......@@ -1127,14 +1152,17 @@ input {
text-align: center;
white-space: nowrap;
}
}
.epidemic-tabs {
}
.epidemic-tabs {
margin-bottom: 20px;
.et-con {
width: 66.667%;
margin: 0 auto;
display: flex;
justify-content: space-between;
li {
width: 20%;
color: #1492ff;
......@@ -1149,26 +1177,31 @@ input {
border-radius: 2px;
cursor: pointer;
}
.et-disabled {
color: #999;
}
.active {
color: #fff;
background-color: #02a7f0;
}
}
}
.general-situation {
}
.general-situation {
.gs-top {
display: flex;
align-items: center;
justify-content: center;
color: #1492ff;
margin: 8px 0;
p {
margin: 0 8px;
font-size: 18px;
}
.hr1 {
width: 59px;
height: 2px;
......@@ -1181,6 +1214,7 @@ input {
);
background: linear-gradient(270deg, #4192f6, #fff);
}
.hr2 {
width: 59px;
height: 2px;
......@@ -1194,11 +1228,13 @@ input {
background: linear-gradient(90deg, #4192f6, #fff);
}
}
.gs-con {
display: flex;
align-items: center;
margin: 20px 0;
flex-wrap: wrap;
.gs-con-item {
text-align: center;
background-color: #f6f7f8;
......@@ -1209,110 +1245,133 @@ input {
font-size: 18px;
box-sizing: border-box;
padding: 0 4px;
div {
margin: 8px 0;
}
span {
color: #1492ff;
}
}
}
}
.vaccination-progress {
}
.vaccination-progress {
.vp-con {
display: flex;
justify-content: space-between;
align-items: center;
.vp-text {
width: 50%;
}
}
}
.daily-news {
}
.daily-news {
.dn-con {
display: flex;
justify-content: space-between;
align-items: center;
.dn-text {
width: 30%;
font-size: 18px;
}
}
}
.key-groups {
}
.key-groups {
.kg-con {
margin: 40px 0;
color: #333;
> div {
text-align: center;
p {
margin: 30px 0;
height: 56px;
}
}
>>> .el-progress-circle {
> > > .el-progress-circle {
width: 100px !important;
height: 100px !important;
}
}
}
.vaccine-traceability {
}
.vaccine-traceability {
h4 {
font-weight: normal;
font-size: 18px;
}
.vt-con {
.vt-top {
margin: 12px 0 0;
}
.vt-ipt {
display: flex;
align-items: center;
margin-bottom: 12px;
input {
width: 50%;
}
}
.vt-info-table {
>>> .el-table {
> > > .el-table {
min-height: 300px;
border: 1px solid #ddd;
}
>>> .is-leaf {
> > > .is-leaf {
background-color: #1492ff;
color: #fff;
border-right: 1px solid #fff;
}
}
.vaccinator-info {
margin: 12px 0;
border-bottom: 1px solid #ddd;
.vaccinator-info-con {
padding: 12px;
color: #333;
overflow: hidden;
p {
margin: 5px 0;
}
}
}
}
}
.cold-chain-tracing {
}
.cold-chain-tracing {
h4 {
font-weight: normal;
font-size: 18px;
padding: 12px 0;
}
>>> .el-table__header tr,
>>> .el-table__header th {
> > > .el-table__header tr,
> > > .el-table__header th {
padding: 0;
height: 40px;
}
>>> .is-leaf {
> > > .is-leaf {
background-color: #1492ff;
color: #fff;
}
.monitoring {
.monitoring-first {
.mf-text {
......@@ -1323,24 +1382,29 @@ input {
}
}
}
}
.result {
}
.result {
.re-search {
display: flex;
align-items: center;
margin: 12px 0 20px;
input {
margin: 0 8px;
}
}
.re-step {
.step-title {
color: #1492ff;
padding: 8px 0;
border-bottom: 1px dashed #1492ff;
i {
font-size: 18px;
}
span {
padding: 0 5px;
border: 1px solid #1492ff;
......@@ -1348,14 +1412,16 @@ input {
border-radius: 10px;
}
}
.step-desc {
margin: 20px 0;
color: #333;
padding: 0 12px;
p {
margin: 8px 0;
}
}
}
}
}
</style>
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