Skip to content

S
smart_gov_platform
Commit 091deac2 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/reg' into reg

parents 852bd999 318dfd1b
Show whitespace changes
Inline Side-by-side
Showing with 906 additions and 732 deletions
base-manager-ui/admin/.env
View file @ 091deac2
...@@ -9,7 +9,7 @@ VUE_APP_TBAS_KEY=admin.tabs ...@@ -9,7 +9,7 @@ VUE_APP_TBAS_KEY=admin.tabs
VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
#VUE_APP_API_BASE_URL=http://api.iczer.com #VUE_APP_API_BASE_URL=http://api.iczer.com
#门户 #门户
VUE_APP_API_portal_URL=http://192.168.0.98:11072 VUE_APP_API_portal_URL=http://192.168.0.124:11072
# VUE_APP_API_portal_URL=http://10.12.185.213:11072 # VUE_APP_API_portal_URL=http://10.12.185.213:11072
# 系统名称 # 系统名称
VUE_APP_sysName = "基础设置" VUE_APP_sysName = "基础设置"
\ No newline at end of file
base-manager-ui/admin/.env.development
View file @ 091deac2
#开发环境 #开发环境
NODE_ENV = "development" NODE_ENV = "development"
VUE_APP_API_BASE_URL=http://192.168.0.98:11078 VUE_APP_API_BASE_URL=http://192.168.0.124:11078
VUE_APP_API_IMG_URL=http://192.168.0.98:11078/ VUE_APP_API_IMG_URL=http://192.168.0.124:11078/
#VUE_APP_API_BASE_URL=http://10.12.185.213:11071 #VUE_APP_API_BASE_URL=http://10.12.185.213:11071
\ No newline at end of file
base-manager-ui/admin/src/components/sitetree/index.vue
View file @ 091deac2
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
created() { created() {
this.authAreaTree(); this.authAreaTree();
this.getTopArea(); // this.getTopArea();
}, },
methods: { methods: {
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
let { data } = res.data.data; let { data } = res.data.data;
if (data.length) { if (data.length) {
let firstData = data[0]; let firstData = data[0];
if (firstData.areaLevel > 2 || data.length > 1) { if (firstData.areaLevel > 3 || data.length > 1) {
let TopParent = await this.getTopArea(); let TopParent = await this.getTopArea();
TopParent.selectable = false; TopParent.selectable = false;
TopParent.children = this.editLeaf(data); TopParent.children = this.editLeaf(data);
......
base-manager-ui/admin/src/pages/basicset/surface/appraiseskin/AppraiseSkin.vue
View file @ 091deac2
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
background: filterItem('10', 0), background: filterItem('10', 0),
}" }"
> >
<div class="left-info flex aic"> <div class="left-info flex flexc aic jcc">
<img src="../../../../assets/img/peopo.jpeg" /> <img src="../../../../assets/img/peopo.jpeg" />
<div> <div>
<p>姓名：XXX</p> <p>姓名：XXX</p>
...@@ -43,16 +43,14 @@ ...@@ -43,16 +43,14 @@
<p>电话：13666666666</p> <p>电话：13666666666</p>
</div> </div>
</div> </div>
<div class="slogan">个人SLOGAN</div> <div class="slogan flex1 flex aic jcc">SLOGAN</div>
</div> </div>
<div class="right flex1"> <div class="center flex1">
<img src="../../../../assets/img/video_img.png" /> <img src="../../../../assets/img/pjq.png" />
</div> </div>
</div> <div class="right flex flexc jcb aic">
<!-- 尾部 -->
<div class="footer flex jcb aic">
<div <div
class="footer-btn flex flexc jcc" class="right-btn flex flexc jcc"
v-for="(v, i) in filterNav('4')" v-for="(v, i) in filterNav('4')"
:key="v.id" :key="v.id"
:class="{ border: !filterItem('4', i) }" :class="{ border: !filterItem('4', i) }"
...@@ -60,41 +58,7 @@ ...@@ -60,41 +58,7 @@
background: filterItem('4', i), background: filterItem('4', i),
}" }"
></div> ></div>
<!-- <div </div>
class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 1) }"
:style="{
background: filterItem('4', 1),
}"
></div>
<div
class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 2) }"
:style="{
background: filterItem('4', 2),
}"
></div>
<div
class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 3) }"
:style="{
background: filterItem('4', 3),
}"
></div>
<div
class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 4) }"
:style="{
background: filterItem('4', 4),
}"
></div>
<div
class="footer-btn flex flexc jcc"
:class="{ border: !filterItem('4', 5) }"
:style="{
background: filterItem('4', 5),
}"
></div> -->
</div> </div>
</div> </div>
<!-- 空数据显示 --> <!-- 空数据显示 -->
...@@ -231,38 +195,42 @@ export default { ...@@ -231,38 +195,42 @@ export default {
} }
} }
.main { .main {
height: 320px; height: 420px;
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
.left { .left {
height: 100%; height: 100%;
width: 30%; width: 25%;
padding: 10px; padding: 10px;
margin-right: 20px; margin-right: 10px;
background: rgba(255, 255, 255, 0.8);
background: linear-gradient(
180deg,
rgba(255, 255, 255, 0.7),
rgba(255, 255, 255, 0)
);
border-radius: 4px; border-radius: 4px;
font-weight: 600; font-weight: 600;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.left-info { .left-info {
width: 100%; width: 100%;
padding: 10px;
} }
img { img {
width: 120px; width: 100px;
height: 160px;
margin-right: 10px; margin-right: 10px;
} }
.slogan { .slogan {
width: 100%; width: 100%;
height: 50px;
text-align: center;
line-height: 50px;
border-radius: 4px; border-radius: 4px;
border: 1px dashed #ccc; border: 1px dashed #ccc;
color: #fff;
} }
} }
.right { .center {
height: 100%; height: 100%;
margin-right: 10px;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -270,20 +238,18 @@ export default { ...@@ -270,20 +238,18 @@ export default {
} }
} }
} }
.footer { .right {
margin-top: 20px; width: 120px;
width: 100%; height: 100%;
.footer-btn { gap: 10px;
.right-btn {
flex: 1; flex: 1;
margin-right: 10px; width: 100%;
height: 120px;
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
& .footer-btn:last-child {
margin-right: 0px;
}
.border { .border {
border: 1px dashed #ececec; border: 1px dashed #ececec;
} }
......
base-manager-ui/admin/src/pages/basicset/surface/calloutskin/CallOutSkin.vue
View file @ 091deac2
...@@ -21,45 +21,39 @@ ...@@ -21,45 +21,39 @@
> >
<div class="flex flexc aic jcc"> <div class="flex flexc aic jcc">
<a-icon type="setting" /> <a-icon type="setting" />
<span>设置</span>
</div> </div>
<div class="flex flexc aic jcc"> <div class="flex flexc aic jcc">
<a-icon type="edit" /> <a-icon type="edit" />
<span>修改密码</span>
</div> </div>
<div class="flex flexc aic jcc"> <div class="flex flexc aic jcc">
<a-icon type="logout" /> <a-icon type="logout" />
<span>退出登录</span>
</div> </div>
</div> </div>
</div> </div>
<!-- 主体 --> <!-- 主体 -->
<div class="main flex"> <div class="main ">
<div <div
class="left flex flexc aic jcc" class="info flex aic jcc"
:style="{ :style="{
background: filterItem('10', 0), background: filterItem('10', 0)
? filterItem('10', 0)
: `url(${require('@/assets/img/info_bg.png')})`,
}" }"
> >
<img src="../../../../assets/img/peopo.jpeg" /> <img src="../../../../assets/img/peopo.jpeg" />
<p>姓名：XXX</p> <div class="flex1">
<p>部门：审批部</p> <p>
<p>编号：001</p> <span class="mr25">XXX</span>
<div <span>001</span>
class="left-btn" </p>
:style="{ <p>审批部</p>
backgroundImage: `linear-gradient(${filterItem( <div class="left-btn flex aic jcc">
'8',
0
)}, ${filterItem('7', 0)})`,
}"
>
回归 回归
</div> </div>
</div> </div>
<div class="right flex1 flex flexwrap jcb acb"> </div>
<div <div
class="right-item" class="item"
v-for="(v, i) in filterNav('4')" v-for="(v, i) in filterNav('4')"
:key="v.id" :key="v.id"
:class="{ border: !filterItem('4', i) }" :class="{ border: !filterItem('4', i) }"
...@@ -68,7 +62,6 @@ ...@@ -68,7 +62,6 @@
}" }"
></div> ></div>
</div> </div>
</div>
<!-- 尾部 --> <!-- 尾部 -->
<div class="footer flex jcc aic"> <div class="footer flex jcc aic">
<div class="footer-item"> <div class="footer-item">
...@@ -162,35 +155,6 @@ export default { ...@@ -162,35 +155,6 @@ export default {
}; };
}, },
methods: { methods: {
// 过滤图片
// filterImg(val) {
// let url = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "2";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// url = v.fieldValue;
// }
// });
// return url;
// },
// // 过滤颜色
// filterColor(val) {
// let str = "";
// this.skinFieldList
// .filter((v) => {
// return v.fieldType === "1";
// })
// .forEach((v) => {
// if (v.fieldName !== "" && v.fieldName === val) {
// str = v.fieldValue;
// }
// });
// return str;
// },
// 过滤属性类型 // 过滤属性类型
filterItem(type, index) { filterItem(type, index) {
let arr = this.skinFieldList.filter((v) => { let arr = this.skinFieldList.filter((v) => {
...@@ -241,7 +205,7 @@ export default { ...@@ -241,7 +205,7 @@ export default {
.header-title { .header-title {
h1 { h1 {
font-size: 30px; font-size: 30px;
color: #0866e8; color: #fff;
margin: 0px; margin: 0px;
margin-left: 10px; margin-left: 10px;
font-weight: 600; font-weight: 600;
...@@ -249,44 +213,52 @@ export default { ...@@ -249,44 +213,52 @@ export default {
} }
.header-right { .header-right {
width: 180px; width: 180px;
font-size: 18px;
} }
} }
.main { .main {
height: 350px; height: 350px;
margin-top: 20px; margin-top: 20px;
.left { padding: 0px 30px;
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-template-rows: repeat(2, 1fr);
gap: 10px;
.border {
border: 1px dashed #ececec;
}
.info {
grid-column: 1 / span 2;
width: 100%;
height: 100%; height: 100%;
width: 280px; padding: 10px;
margin-right: 20px; padding-right: 120px;
background: rgba(255, 255, 255, 0.8); background-repeat: no-repeat !important;
border-radius: 10px; background-position: center !important;
font-weight: 600; background-size: 100% 100% !important;
border-radius: 4px;
img { img {
width: 100px; width: 100px;
margin-right: 20px;
} }
.left-btn { .left-btn {
width: 150px; width: 100%;
height: 40px; height: 50px;
text-align: center; background: linear-gradient(0deg, #2a7cf6, #32baf0);
line-height: 40px;
color: #fff;
background-image: linear-gradient(#bbe0ee, #adc0f1);
border-radius: 6px; border-radius: 6px;
font-size: 22px;
font-weight: 500;
color: #ffffff;
} }
} }
.right { .item {
width: 100%;
height: 100%; height: 100%;
.right-item { border-radius: 4px;
width: 49%;
height: 100px;
border-radius: 6px;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: center !important; background-position: center !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} color: #ffffff;
.border {
border: 1px dashed #ececec;
}
} }
} }
.footer { .footer {
......
base-manager-ui/admin/src/pages/basicset/surface/centralizeskin/CentralizeSkin.vue
View file @ 091deac2
...@@ -25,105 +25,28 @@ ...@@ -25,105 +25,28 @@
<img src="../../../../assets/img/Banner.png" /> <img src="../../../../assets/img/Banner.png" />
</div> </div>
<div class="call-out flex1 flex flexc jcb"> <div class="call-out flex1 flex flexc jcb">
<div class="call-out-item"> <div class="call-out-item" v-for="(v, i) in itemList" :key="i">
<div class="call-out-item-title">正在呼叫</div> <div
<div class="call-out-item-text call-out-item-text-1"> class="call-out-item-title"
请 :style="{
<span background: filterItem('8', 0),
class="call-out-item-code" color: filterItem('7', 0),
:style="{ color: filterItem('7', 0) }" }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>03号窗口</span
>
</div>
</div>
<div class="call-out-item">
<div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>03号窗口</span
>
</div>
</div>
<div class="call-out-item">
<div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>03号窗口</span
>
</div>
</div>
<div class="call-out-item">
<div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>--</span
>
</div>
</div>
<div class="call-out-item">
<div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>--</span
> >
{{ v.type }}
</div> </div>
</div> <div class="call-out-item-text ">
<div class="call-out-item">
<div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterItem('7', 0) }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >{{ v.num }}</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterItem('7', 0) }" :style="{ color: filterItem('7', 0) }"
>--</span >{{ v.window }}</span
> >
</div> </div>
</div> </div>
...@@ -173,77 +96,38 @@ ...@@ -173,77 +96,38 @@
<!-- 主体 --> <!-- 主体 -->
<div class="main flex flexc aic jcb"> <div class="main flex flexc aic jcb">
<div class="call-out flex flexc jcb"> <div class="call-out flex flexc jcb">
<div class="call-out-item"> <div class="call-out-item" v-for="(v, i) in itemList" :key="i">
<div class="call-out-item-title">正在呼叫</div> <div
<div class="call-out-item-text call-out-item-text-1"> class="call-out-item-title"
请 :style="{
<span background: filterItem('8', 0),
class="call-out-item-code" color: filterItem('7', 0),
:style="{ color: filterItem('7', 0) }" }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>03号窗口</span
>
</div>
</div>
<div class="call-out-item">
<div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>03号窗口</span
> >
{{ v.type }}
</div> </div>
</div> <div class="call-out-item-text ">
<div class="call-out-item">
<div class="call-out-item-title">正在办理</div>
<div class="call-out-item-text call-out-item-text-2">
请 请
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterItem('7', 0) }" :style="{ color: filterItem('7', 0) }"
>A0004号</span >{{ v.num }}</span
> >
到 到
<span <span
class="call-out-item-code" class="call-out-item-code"
:style="{ color: filterItem('7', 0) }" :style="{ color: filterItem('7', 0) }"
>03号窗口</span >{{ v.window }}</span
> >
</div> </div>
</div> </div>
<div class="call-out-item" v-for="v in 4" :key="v">
<div class="call-out-item-title">等待中</div>
<div class="call-out-item-text call-out-item-text-3">
请
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>A0004号</span
>
到
<span
class="call-out-item-code"
:style="{ color: filterItem('7', 0) }"
>--</span
>
</div>
</div> </div>
<!-- 等待叫号 -->
<div class="wait flex aic jcc">
等待叫号区域
</div> </div>
<!-- banner --> <!-- banner -->
<div class="banner border flex aic jcc">banner</div> <div class="banner flex aic jcc"></div>
</div> </div>
<!-- 尾部 --> <!-- 尾部 -->
<div class="footer flex aic jca"> <div class="footer flex aic jca">
...@@ -272,6 +156,27 @@ ...@@ -272,6 +156,27 @@
</p> </p>
</div> </div>
</div> </div>
<!-- 通知公告 -->
<div class="notice flex aic ">
<div
class="title_logo flex aic jcc"
:style="{
background: filterItem('17', 0),
color: filterItem('15', 0),
}"
>
公告logo
</div>
<div
class="text"
:style="{
background: filterItem('18', 0),
color: filterItem('16', 0),
}"
>
公告类容公告类容公告类容公告类容
</div>
</div>
</div> </div>
<!-- 空数据显示 --> <!-- 空数据显示 -->
<div class="empty flex aic jcc" v-else> <div class="empty flex aic jcc" v-else>
...@@ -309,6 +214,38 @@ export default { ...@@ -309,6 +214,38 @@ export default {
data() { data() {
return { return {
api: process.env.VUE_APP_API_IMG_URL, api: process.env.VUE_APP_API_IMG_URL,
itemList: [
{
type: "正在呼叫",
num: "A0004号",
window: "03号窗口",
},
{
type: "正在办理",
num: "A0004号",
window: "03号窗口",
},
{
type: "正在办理",
num: "A0004号",
window: "03号窗口",
},
{
type: "正在办理",
num: "A0004号",
window: "03号窗口",
},
{
type: "正在办理",
num: "A0004号",
window: "03号窗口",
},
{
type: "正在办理",
num: "A0004号",
window: "03号窗口",
},
],
}; };
}, },
methods: { methods: {
...@@ -400,6 +337,7 @@ export default { ...@@ -400,6 +337,7 @@ export default {
padding: 10px; padding: 10px;
margin-top: 20px; margin-top: 20px;
border-radius: 10px; border-radius: 10px;
.banner { .banner {
width: 40%; width: 40%;
height: 100%; height: 100%;
...@@ -410,22 +348,28 @@ export default { ...@@ -410,22 +348,28 @@ export default {
} }
} }
.call-out { .call-out {
height: 100%; width: 100%;
padding: 0px 10px;
.call-out-item { .call-out-item {
width: 100%; width: 100%;
height: 50px; height: 50px;
margin-bottom: 10px;
padding: 0px 10px;
border-radius: 8px; border-radius: 8px;
position: relative; position: relative;
background-color: #ccc; background-color: #f3f3f3;
display: flex;
align-items: center;
justify-content: space-between;
.call-out-item-title { .call-out-item-title {
height: 100%; height: 60%;
width: 20%; width: 20%;
text-align: center; display: flex;
line-height: 50px; align-items: center;
color: #fff; justify-content: center;
background-color: #cbdbf4;
font-weight: 600;
font-size: 16px; font-size: 16px;
border-radius: inherit; border-radius: 20px;
} }
.call-out-item-text { .call-out-item-text {
height: 100%; height: 100%;
...@@ -434,9 +378,7 @@ export default { ...@@ -434,9 +378,7 @@ export default {
font-size: 20px; font-size: 20px;
padding: 0px 20px; padding: 0px 20px;
border-radius: 12px 8px 8px 0px; border-radius: 12px 8px 8px 0px;
position: absolute;
top: 0px;
right: 0px;
color: #000; color: #000;
font-weight: 600; font-weight: 600;
text-align: left; text-align: left;
...@@ -444,15 +386,6 @@ export default { ...@@ -444,15 +386,6 @@ export default {
margin: 0px 10px; margin: 0px 10px;
} }
} }
.call-out-item-text-1 {
background-color: #fdf7f2;
}
.call-out-item-text-2 {
background-color: #f1f8fe;
}
.call-out-item-text-3 {
background-color: #f4f5f6;
}
} }
} }
} }
...@@ -489,11 +422,18 @@ export default { ...@@ -489,11 +422,18 @@ export default {
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
.wait {
width: 100%;
height: 60px;
margin-bottom: 10px;
border: 1px dashed #ececec;
border-radius: 4px;
}
.banner { .banner {
width: 100%; width: 100%;
height: 360px; height: 300px;
border-radius: 4px; border-radius: 4px;
color: #1890ff; background: url("~@/assets/img/jzp_banner.png") no-repeat center/100% 100%;
} }
.call-out { .call-out {
width: 100%; width: 100%;
...@@ -501,17 +441,23 @@ export default { ...@@ -501,17 +441,23 @@ export default {
width: 100%; width: 100%;
height: 50px; height: 50px;
margin-bottom: 10px; margin-bottom: 10px;
padding: 0px 10px;
border-radius: 8px; border-radius: 8px;
position: relative; position: relative;
background-color: #ccc; background-color: #f3f3f3;
display: flex;
align-items: center;
justify-content: space-between;
.call-out-item-title { .call-out-item-title {
height: 100%; height: 60%;
width: 20%; width: 20%;
text-align: center; display: flex;
line-height: 50px; align-items: center;
color: #fff; justify-content: center;
background-color: #cbdbf4;
font-weight: 600;
font-size: 16px; font-size: 16px;
border-radius: inherit; border-radius: 20px;
} }
.call-out-item-text { .call-out-item-text {
height: 100%; height: 100%;
...@@ -520,9 +466,7 @@ export default { ...@@ -520,9 +466,7 @@ export default {
font-size: 20px; font-size: 20px;
padding: 0px 20px; padding: 0px 20px;
border-radius: 12px 8px 8px 0px; border-radius: 12px 8px 8px 0px;
position: absolute;
top: 0px;
right: 0px;
color: #000; color: #000;
font-weight: 600; font-weight: 600;
text-align: left; text-align: left;
...@@ -530,15 +474,6 @@ export default { ...@@ -530,15 +474,6 @@ export default {
margin: 0px 10px; margin: 0px 10px;
} }
} }
.call-out-item-text-1 {
background-color: #fdf7f2;
}
.call-out-item-text-2 {
background-color: #f1f8fe;
}
.call-out-item-text-3 {
background-color: #f4f5f6;
}
} }
} }
} }
...@@ -551,5 +486,19 @@ export default { ...@@ -551,5 +486,19 @@ export default {
font-weight: 600; font-weight: 600;
} }
} }
.notice {
height: 60px;
color: #fff;
.title_logo {
height: inherit;
width: 100px;
margin-right: 10px;
border: 1px dashed #ececec;
}
.text {
font-size: 18px;
font-weight: 600;
}
}
} }
</style> </style>
base-manager-ui/admin/src/pages/basicset/surface/informationskin/InformationSkin.vue
View file @ 091deac2
...@@ -9,42 +9,51 @@ ...@@ -9,42 +9,51 @@
<div <div
class="header" class="header"
:style="{ :style="{
background: filterItem('11', 0),
color: filterItem('2', 0), color: filterItem('2', 0),
}" }"
> >
政务服务中心 政务服务中心
</div> </div>
<div class="main flex aic jcb"> <div class="main flex aic jcb">
<div class="left"> <div class="left flex aic jcc">
<img src="../../../../assets/img/banner2.png" /> video
</div> </div>
<div class="right"> <div class="right flex aic jcc">
<img src="../../../../assets/img/banner3.png" /> banner
</div> </div>
</div> </div>
<div <div
class="footer flex" class="footer flex1 flex aic"
:style="{ :style="{
background: filterItem('12', 0), background: filterItem('12', 0),
}" }"
> >
<div class="title flex aic jcc">
logo
</div>
<div class="text flex1 flex flexc">
<div <div
class="title flex aic jcc" class="flex1 flex aic pdl10"
:style="{ :style="{
background: filterItem('10', 0),
color: filterItem('5', 0), color: filterItem('5', 0),
}" }"
> >
滚动新闻 新闻标题
</div> </div>
<div class="text flex aic"> <div
class="bottom flex1 flex aic pdl10"
:style="{
background: filterItem('14', 0),
color: filterItem('6', 0),
}"
>
这里是信息发布滚动信息这里是信息发布滚动信息这里是信息发布滚动信息 这里是信息发布滚动信息这里是信息发布滚动信息这里是信息发布滚动信息
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- 信息发布 竖版皮肤 --> <!-- 信息发布 竖版皮肤 -->
<div <!-- <div
:id="componentsId" :id="componentsId"
class="vertical-skin flex flexc" class="vertical-skin flex flexc"
v-else-if="imageResolution === '2'" v-else-if="imageResolution === '2'"
...@@ -85,7 +94,7 @@ ...@@ -85,7 +94,7 @@
这里是信息发布滚动信息这里是信息发布滚动信息 这里是信息发布滚动信息这里是信息发布滚动信息
</div> </div>
</div> </div>
</div> </div> -->
<!-- 空数据显示 --> <!-- 空数据显示 -->
<div class="empty flex aic jcc" v-else> <div class="empty flex aic jcc" v-else>
<a-empty <a-empty
...@@ -170,41 +179,55 @@ export default { ...@@ -170,41 +179,55 @@ export default {
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: center !important; background-position: center !important;
background-size: cover !important; background-size: cover !important;
position: relative;
.header { .header {
height: 80px; height: 80px;
font-size: 30px; font-size: 30px;
font-weight: 600; font-weight: 600;
padding-left: 20px;
color: #fff; color: #fff;
text-align: center;
line-height: 80px; line-height: 80px;
background: url("../../../../assets/img/bg_header.png") no-repeat;
background-size: 100% 100% !important; background-size: 100% 100% !important;
position: absolute;
left: 0px;
top: 0px;
} }
.main { .main {
height: 432px; height: 470px;
.left, .left,
.right { .right {
width: 50%; width: 50%;
height: 100%; height: 100%;
img { color: #fff;
width: 100%; border-bottom: 1px dashed #ececec;
height: 100%;
} }
.left {
border-right: 1px dashed #ececec;
} }
} }
.footer { .footer {
height: 50px; height: 50px;
background-repeat: no-repeat !important;
background-position: center !important;
background-size: 100% 100% !important;
.title { .title {
width: 100px; width: 130px;
height: 100%; height: 100%;
font-size: 18px; font-size: 18px;
color: #effe00; color: #fff;
border-right: 1px dashed #ececec;
} }
.text { .text {
height: 100%; height: 100%;
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
} }
.bottom {
border-top: 1px dashed #ececec;
background-repeat: no-repeat !important;
background-position: center !important;
background-size: 100% 100% !important;
}
} }
} }
.vertical-skin { .vertical-skin {
......
base-manager-ui/admin/src/pages/basicset/surface/modal/AddField.vue
View file @ 091deac2
...@@ -72,6 +72,12 @@ const attrType = [ ...@@ -72,6 +72,12 @@ const attrType = [
{ key: "10", label: "信息面板" }, { key: "10", label: "信息面板" },
{ key: "11", label: "头部背景" }, { key: "11", label: "头部背景" },
{ key: "12", label: "底部背景" }, { key: "12", label: "底部背景" },
{ key: "13", label: "数据标题背景" },
{ key: "14", label: "数据背景" },
{ key: "15", label: "公告标题" },
{ key: "16", label: "公告内容" },
{ key: "17", label: "公告标题背景" },
{ key: "18", label: "公告内容背景" },
]; ];
export default { export default {
props: { props: {
......
base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue
View file @ 091deac2
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="surface-preview-main"> <div class="surface-preview-main">
<div class="skin-header"> <div class="skin-header">
<h1 class="skin-header-title" :style="{ color: filterItem('2', 0) }"> <h1 class="skin-header-title" :style="{ color: filterItem('2', 0) }">
政务服务中心 自助排队取号系统
</h1> </h1>
<div class="skin-header-time" :style="{ color: filterItem('3', 0) }"> <div class="skin-header-time" :style="{ color: filterItem('3', 0) }">
<p class="show-time">16:14:00</p> <p class="show-time">16:14:00</p>
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
</div> </div>
</div> </div>
<div class="skin-content"> <div class="skin-content">
<div class="skin-content-left">
<img src="../../../../assets/img/Banner.png" alt="" />
</div>
<div class="skin-content-right"> <div class="skin-content-right">
<div <div
v-for="(v, i) in filterNav('4')" v-for="(v, i) in filterNav('4')"
...@@ -59,13 +56,13 @@ ...@@ -59,13 +56,13 @@
</div> </div>
<div class="skin-footer-records"> <div class="skin-footer-records">
<p :style="{ color: filterItem('9', 0) }"> <p :style="{ color: filterItem('9', 0) }">
主办单位：四川省青霆科技有限公司 主办单位：XXXXXX有限公司
</p> </p>
<p :style="{ color: filterItem('9', 0) }"> <p :style="{ color: filterItem('9', 0) }">
承办单位：四川省青霆科技有限公司 承办单位：XXXXXX有限公司
</p> </p>
<p :style="{ color: filterItem('9', 0) }"> <p :style="{ color: filterItem('9', 0) }">
技术：四川省青霆科技有限公司 技术：XXXXXX有限公司
</p> </p>
<p :style="{ color: filterItem('9', 0) }">版权所有</p> <p :style="{ color: filterItem('9', 0) }">版权所有</p>
</div> </div>
...@@ -249,6 +246,7 @@ export default { ...@@ -249,6 +246,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 100px; height: 100px;
margin-bottom: 40px;
align-items: center; align-items: center;
.skin-header-title { .skin-header-title {
font-size: 22px; font-size: 22px;
...@@ -268,46 +266,36 @@ export default { ...@@ -268,46 +266,36 @@ export default {
.skin-content { .skin-content {
flex: 1; flex: 1;
display: flex; display: flex;
justify-content: space-between; justify-content: flex-end;
flex-wrap: wrap; width: 96%;
width: 80%; margin-left: 2%;
margin-left: 10%;
.skin-content-left {
width: 48%;
height: 100%;
img {
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 10px;
}
}
.skin-content-right { .skin-content-right {
width: 48%; width: 620px;
height: 100%; height: 100%;
display: flex; display: grid;
flex-wrap: wrap; grid-template-columns: repeat(4, 150px);
justify-content: space-between; gap: 10px;
align-content: space-between;
div { div {
width: 176px; width: 150px;
height: 108px; height: 150px;
border-radius: 10px; border-radius: 10px;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;
background-position: center !important; background-position: center !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
text-align: center; text-align: center;
line-height: 108px; line-height: 108px;
&:nth-child(3) {
grid-column: 3 / span 2;
}
&:nth-child(4) {
grid-column: 2 / span 1;
}
} }
.border { .border {
border: 1px dashed #ececec; border: 1px dashed #ececec;
} }
img {
width: 176px;
height: 108px;
border-radius: 10px;
}
} }
} }
.skin-footer { .skin-footer {
......
base-manager-ui/admin/src/pages/basicset/surface/writeFormSkin/WriteFormSkin.vue
View file @ 091deac2
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<!-- 头部 --> <!-- 头部 -->
<div class="header flex aic jcb"> <div class="header flex aic jcb">
<div class="left flex aic"> <div class="left flex aic">
<!-- <img class="mr20" src="../../../../assets/img/logo.png" /> -->
<div <div
class="title" class="title"
:style="{ :style="{
...@@ -43,8 +42,6 @@ ...@@ -43,8 +42,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 标题 -->
<img class="title-img" src="../../../../assets/img/tiandan.png" alt="" />
<!-- 搜索框 --> <!-- 搜索框 -->
<div class="search-box"> <div class="search-box">
<div <div
...@@ -66,39 +63,37 @@ ...@@ -66,39 +63,37 @@
</div> </div>
<!-- 主体内容 --> <!-- 主体内容 -->
<div class="main flex aic jcb"> <div class="main flex aic jcb">
<div class="left">热门排行区域</div> <div class="left flex flexc">
<div class="right flex flexc jcb"> <div class="app-list flex aic jcc">
<div class="top flex aic jcb"> 应用列表
</div>
<div class="flex1 flex aic jcc">
热门表单
</div>
</div>
<div class="right flex flexc">
<div <div
class="btn1 flex jcc aic" class="btn flex aic jcc"
:style="{ :style="{
background: filterItem('4', 0), background: filterItem('4', 0),
}" }"
:class="{ border: !filterItem('4', 0) }" :class="{ border: !filterItem('4', 0) }"
> >
btn1 btn
</div> </div>
<div <div class="bottom flex1 flex aic jcc">
class="btn2 flex jcc aic" 热门事项
:style="{
background: filterItem('4', 1),
}"
:class="{ border: !filterItem('4', 1) }"
>
btn2
</div> </div>
</div> </div>
<div class="bottom flex aic jcc">应用区域</div>
</div>
</div> </div>
<!-- 底部 --> <!-- 底部 -->
<div class="footer flex aic jca mt20"> <div class="footer flex aic jca ">
<div class="flex flexc aic"> <div class="">
<span <span
:style="{ :style="{
color: filterItem('5', 0), color: filterItem('5', 0),
}" }"
>入驻表单量</span >入驻表单量：</span
> >
<span <span
:style="{ :style="{
...@@ -107,12 +102,12 @@ ...@@ -107,12 +102,12 @@
>20份</span >20份</span
> >
</div> </div>
<div class="flex flexc aic"> <div class="">
<span <span
:style="{ :style="{
color: filterItem('5', 0), color: filterItem('5', 0),
}" }"
>入驻事项量</span >入驻事项量：</span
> >
<span <span
:style="{ :style="{
...@@ -121,34 +116,6 @@ ...@@ -121,34 +116,6 @@
>20件</span >20件</span
> >
</div> </div>
<div class="flex flexc aic">
<span
:style="{
color: filterItem('5', 0),
}"
>本地打印量</span
>
<span
:style="{
color: filterItem('7', 0),
}"
>20次</span
>
</div>
<div class="flex flexc aic">
<span
:style="{
color: filterItem('5', 0),
}"
>在线提交量</span
>
<span
:style="{
color: filterItem('7', 0),
}"
>20次</span
>
</div>
</div> </div>
</div> </div>
<!-- 空数据显示 --> <!-- 空数据显示 -->
...@@ -248,14 +215,11 @@ export default { ...@@ -248,14 +215,11 @@ export default {
} }
} }
} }
.title-img {
width: 600px;
margin-top: 20px;
}
.search-box { .search-box {
width: 600px; width: 600px;
height: 38px; height: 38px;
margin-top: 20px; margin-top: 40px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 7px 13px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 7px 13px 0px rgba(0, 0, 0, 0.1);
border-radius: 8px; border-radius: 8px;
...@@ -282,49 +246,46 @@ export default { ...@@ -282,49 +246,46 @@ export default {
} }
.main { .main {
width: 800px; width: 800px;
height: 250px; height: 300px;
margin-top: 10px; margin-top: 10px;
color: #fff; color: #fff;
.left { .left {
width: 49%; width: 50%;
height: 100%; height: 100%;
border: 1px dashed #ececec; border: 1px dashed #ececec;
border-radius: 4px; border-radius: 4px;
text-align: center; .app-list {
line-height: 200px; height: 80px;
border-bottom: 1px dashed #ececec;
border-radius: 4px;
}
} }
.right { .right {
width: 49%; width: 50%;
height: 100%; height: 90%;
border-radius: 4px; border-radius: 0px 4px 4px 0px;
.top { border: 1px dashed #ececec;
height: 49%; border-left: none;
padding: 10px;
.btn {
margin: 0px !important;
width: 100%; width: 100%;
.btn1 { height: 80px;
height: 100%;
width: 54%;
border-radius: 4px; border-radius: 4px;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.btn2 { .bottom {
height: 100%; margin-top: 10px;
width: 44%;
border-radius: 4px; border-radius: 4px;
background-size: 100% 100% !important;
}
}
.border {
border: 1px dashed #ececec; border: 1px dashed #ececec;
} }
.bottom { .border {
height: 49%;
width: 100%;
border: 1px dashed #ececec; border: 1px dashed #ececec;
border-radius: 4px;
} }
} }
} }
.footer { .footer {
margin-top: 30px;
width: 800px; width: 800px;
color: #fff; color: #fff;
} }
......
portal-manager-ui/admin/.env.development
View file @ 091deac2
# 开发环境配置 # 开发环境配置
NODE_ENV = development NODE_ENV = development
# VUE_APP_API_BASE_URL=http://8.136.255.30:11078 # VUE_APP_API_BASE_URL=http://8.136.255.30:11078
VUE_APP_API_BASE_URL=http://192.168.0.98:11078 VUE_APP_API_BASE_URL=http://192.168.0.124:11078
#图片显示拼接 #图片显示拼接
# VUE_APP_API_IMG_URL=http://8.136.255.30:11078/ # VUE_APP_API_IMG_URL=http://8.136.255.30:11078/
VUE_APP_API_IMG_URL=http://192.168.0.98:11078/ VUE_APP_API_IMG_URL=http://192.168.0.124:11078/
#余林 #余林
# VUE_APP_API_PHP_URL=http://8.136.255.30:8090 # VUE_APP_API_PHP_URL=http://8.136.255.30:8090
VUE_APP_API_PHP_URL=http://192.168.0.98:8090 VUE_APP_API_PHP_URL=http://192.168.0.124:8090
#宜宾 #宜宾
#VUE_APP_API_BASE_URL=http://10.12.185.213:11072 #VUE_APP_API_BASE_URL=http://10.12.185.213:11072
portal-manager-ui/admin/src/assets/css/common.less
View file @ 091deac2
...@@ -778,6 +778,7 @@ img { ...@@ -778,6 +778,7 @@ img {
// } // }
// } // }
// 统一设置表格为空时的展示 // 统一设置表格为空时的展示
.ant-table-tbody { .ant-table-tbody {
td:empty::after { td:empty::after {
......
portal-manager-ui/admin/src/assets/images/login_bg.png deleted 100644 → 0
View file @ 852bd999
This image diff could not be displayed because it is too large. You can view the blob instead.
portal-manager-ui/admin/src/components/PrevieModal.vue
View file @ 091deac2
<template> <template>
<div class="previe-modal" v-if="Visible" @click="Visible = false"> <div class="previe-modal" v-if="Visible">
<img @click.stop v-if="previeData.type === 'img'" :src="previeData.url" /> <div class="main">
<img v-if="previeData.type === 'img'" :src="previeData.url" />
<video <video
@click.stop v-else-if="previeData.type === 'video'"
v-else
:src="previeData.url" :src="previeData.url"
autoplay autoplay
muted muted
controls controls
></video> ></video>
<a-icon type="close-circle" /> <audio
v-else-if="previeData.type === 'audio'"
controls
src="@/assets/images/out.mp3"
></audio>
</div>
<a-icon @click="Visible = false" type="close-circle" />
</div> </div>
</template> </template>
...@@ -55,10 +61,17 @@ export default { ...@@ -55,10 +61,17 @@ export default {
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img, .main {
video {
height: 400px; height: 400px;
max-width: 800px; max-width: 800px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
img,
video {
height: 100%;
object-fit: contain; object-fit: contain;
} }
.anticon-close-circle { .anticon-close-circle {
......
portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalBase/index.vue
View file @ 091deac2
...@@ -432,7 +432,7 @@ export default { ...@@ -432,7 +432,7 @@ export default {
this.twoPieData = { this.twoPieData = {
title: "本地人与外地人注册分布", title: "本地人与外地人注册分布",
pieName: "分布详情", pieName: "分布详情",
firstName: "宜宾市本地人注册占比", firstName: "若尔盖县本地人注册占比",
firstVal: res.data.bd_lv, firstVal: res.data.bd_lv,
firstTotal: 1, firstTotal: 1,
secondName: "外地人注册占比", secondName: "外地人注册占比",
...@@ -569,7 +569,7 @@ export default { ...@@ -569,7 +569,7 @@ export default {
this.twoPieData2 = { this.twoPieData2 = {
title: "本地人与外地人办件分布", title: "本地人与外地人办件分布",
pieName: "分布详情", pieName: "分布详情",
firstName: "宜宾市本地人办件占比", firstName: "若尔盖县本地人办件占比",
firstVal: res.data.bd_lv, firstVal: res.data.bd_lv,
firstTotal: 1, firstTotal: 1,
secondName: "外地人办件占比", secondName: "外地人办件占比",
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
View file @ 091deac2
...@@ -120,24 +120,58 @@ ...@@ -120,24 +120,58 @@
> >
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<span> <span class="flex">
<span class="lable">评价人照片：</span> <span class="lable">评价人照片：</span>
<span v-if="detailsInfo.picture || detailsInfo.process">
<a-tooltip v-if="detailsInfo.picture" title="照片">
<a-avatar <a-avatar
v-if="!detailsInfo.picture" class="cursor-pointer"
shape="square"
:size="40"
icon="user"
/>
<img
v-else
:src="baseurl + '/' + detailsInfo.picture"
@click=" @click="
$viewerApi({ $viewerApi({
images: [baseurl + '/' + detailsInfo.picture], images: [baseurl + '/' + detailsInfo.picture],
}) })
" "
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="picture"
/>
</a-tooltip>
<a-tooltip
v-else-if="
detailsInfo.process &&
estimateVideo(detailsInfo.process)
"
title="视频"
>
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(detailsInfo.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="video-camera"
/>
</a-tooltip>
<a-tooltip v-else title="音频">
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(detailsInfo.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="sound"
/>
</a-tooltip>
</span>
<a-tooltip v-else title="无资源">
<a-avatar
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="ellipsis"
/> />
</a-tooltip>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -357,24 +391,58 @@ ...@@ -357,24 +391,58 @@
> >
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<span> <span class="flex">
<span class="lable">评价人照片：</span> <span class="lable">评价人照片：</span>
<span v-if="detailsInfo.picture || detailsInfo.process">
<a-tooltip v-if="detailsInfo.picture" title="照片">
<a-avatar <a-avatar
v-if="!detailsInfo.picture" class="cursor-pointer"
shape="square"
:size="40"
icon="user"
/>
<img
v-else
:src="baseurl + '/' + detailsInfo.picture"
@click=" @click="
$viewerApi({ $viewerApi({
images: [baseurl + '/' + detailsInfo.picture], images: [baseurl + '/' + detailsInfo.picture],
}) })
" "
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]" shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="picture"
/>
</a-tooltip>
<a-tooltip
v-else-if="
detailsInfo.process &&
estimateVideo(detailsInfo.process)
"
title="视频"
>
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(detailsInfo.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="video-camera"
/>
</a-tooltip>
<a-tooltip v-else title="音频">
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(detailsInfo.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="sound"
/> />
</a-tooltip>
</span>
<a-tooltip v-else title="无资源">
<a-avatar
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="ellipsis"
/>
</a-tooltip>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -382,11 +450,17 @@ ...@@ -382,11 +450,17 @@
</a-step> </a-step>
</a-steps> </a-steps>
</div> </div>
<!-- 音视频查看 -->
<PrevieModal
:previeData="previeData"
:previeVisible.sync="previeVisible"
></PrevieModal>
</a-drawer> </a-drawer>
</div> </div>
</template> </template>
<script> <script>
import PrevieModal from "@/components/PrevieModal.vue";
export default { export default {
props: { props: {
type: { type: {
...@@ -412,9 +486,14 @@ export default { ...@@ -412,9 +486,14 @@ export default {
}, },
}, },
}, },
components: {
PrevieModal,
},
data() { data() {
return { return {
baseurl: process.env.VUE_APP_API_PHP_URL, baseurl: process.env.VUE_APP_API_PHP_URL,
previeData: {},
previeVisible: false,
}; };
}, },
computed: { computed: {
...@@ -462,6 +541,31 @@ export default { ...@@ -462,6 +541,31 @@ export default {
} }
} }
}, },
// 判断是否是视频文件
estimateVideo(url) {
let index = url.lastIndexOf(".");
let type = url.slice(index + 1);
return type === "mp4";
},
// 查看音视频
checkMultimedia(url) {
console.log(url);
let isVideo = this.estimateVideo(url);
let curUrl = this.baseurl + "/" + url;
if (isVideo) {
this.previeData = {
type: "video",
url: curUrl,
};
} else {
this.previeData = {
type: "audio",
url: curUrl,
};
}
this.previeVisible = true;
},
}, },
}; };
</script> </script>
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/StepoutDetails.vue
View file @ 091deac2
...@@ -13,16 +13,14 @@ ...@@ -13,16 +13,14 @@
<p class="elapsed-time-title"> <p class="elapsed-time-title">
<span>累计次数</span> <span>累计次数</span>
</p> </p>
<p class="time"> <p class="time">{{ detailsInfo.total }}次</p>
{{detailsInfo.total}}次
</p>
</div> </div>
<div class="elapsed-time"> <div class="elapsed-time">
<p class="elapsed-time-title"> <p class="elapsed-time-title">
<span>累计时长</span> <span>累计时长</span>
</p> </p>
<p class="time"> <p class="time">
<span>{{allTime}}</span> <span>{{ allTime }}</span>
</p> </p>
</div> </div>
<div class="elapsed-time"> <div class="elapsed-time">
...@@ -30,13 +28,17 @@ ...@@ -30,13 +28,17 @@
<span>最近暂离时间</span> <span>最近暂离时间</span>
</p> </p>
<p class="time"> <p class="time">
{{createTime}} {{ createTime }}
</p> </p>
</div> </div>
</div> </div>
<!-- 步骤条 --> <!-- 步骤条 -->
<a-steps direction="vertical"> <a-steps direction="vertical">
<a-step :title="(index+1)" v-for="(item,index) in detailsInfo.data" :key="item.stopid"> <a-step
:title="index + 1"
v-for="(item, index) in detailsInfo.data"
:key="item.stopid"
>
<a-icon type="environment" slot="icon" /> <a-icon type="environment" slot="icon" />
<div slot="description" class="transact-step"> <div slot="description" class="transact-step">
<a-row :gutter="[0, 8]"> <a-row :gutter="[0, 8]">
...@@ -49,18 +51,16 @@ ...@@ -49,18 +51,16 @@
</a-row> </a-row>
<a-row :gutter="[0, 8]"> <a-row :gutter="[0, 8]">
<a-col :span="12"> <a-col :span="12">
<span>暂离时间：</span <span>暂离时间：</span>{{ item.create_time || "--" }}
>{{ item.workman_name || "--" }}
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<span>回归时间：</span <span>回归时间：</span>{{ item.end_time || "--" }}
>{{ item.end_time || "--" }}
</a-col> </a-col>
</a-row> </a-row>
<a-row :gutter="[0, 8]"> <a-row :gutter="[0, 8]">
<a-col :span="12"> <a-col :span="12">
<span>暂离时长：</span> <span>暂离时长：</span>
{{item.zl_time || "--"}} {{ item.zl_time + " 分钟" || "--" }}
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<span>暂离原因：</span> <span>暂离原因：</span>
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
</div> </div>
</a-step> </a-step>
</a-steps> </a-steps>
</a-drawer> </a-drawer>
</div> </div>
</template> </template>
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue
View file @ 091deac2
...@@ -24,14 +24,50 @@ ...@@ -24,14 +24,50 @@
@change="changeTable" @change="changeTable"
> >
<!-- 评价人照片 --> <!-- 评价人照片 -->
<template slot="picture" slot-scope="text"> <template slot="picture" slot-scope="text, record">
<a-avatar v-if="!text" shape="square" :size="40" icon="user" /> <div v-if="text || record.process">
<img <a-tooltip v-if="text" title="照片">
v-else <a-avatar
:src="baseurl + '/' + text" class="cursor-pointer"
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
@click="$viewerApi({ images: [baseurl + '/' + text] })" @click="$viewerApi({ images: [baseurl + '/' + text] })"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="picture"
/>
</a-tooltip>
<a-tooltip
v-else-if="record.process && estimateVideo(record.process)"
title="视频"
>
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="video-camera"
/>
</a-tooltip>
<a-tooltip v-else title="音频">
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="sound"
/>
</a-tooltip>
</div>
<a-tooltip v-else title="无资源">
<a-avatar
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="ellipsis"
/> />
</a-tooltip>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
...@@ -61,13 +97,19 @@ ...@@ -61,13 +97,19 @@
:title="title" :title="title"
:type="detailsType" :type="detailsType"
></HandlingDetails> ></HandlingDetails>
<!-- 音视频查看 -->
<PrevieModal
:previeData="previeData"
:previeVisible.sync="previeVisible"
></PrevieModal>
</div> </div>
</template> </template>
<script> <script>
import { mapState } from "vuex"; import { mapState } from "vuex";
import storage from "@/utils/js/Storage"; import storage from "@/utils/js/Storage";
import HandlingDetails from "./components/HandlingDetails.vue"; import HandlingDetails from "./components/HandlingDetails.vue";
import PrevieModal from "@/components/PrevieModal.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { getEvaList, getEvaData, getEvaDetil } from "@/api/dataAdmin"; import { getEvaList, getEvaData, getEvaDetil } from "@/api/dataAdmin";
const tHeader = [ const tHeader = [
...@@ -93,6 +135,7 @@ const filterVal = [ ...@@ -93,6 +135,7 @@ const filterVal = [
export default { export default {
components: { components: {
HandlingDetails, HandlingDetails,
PrevieModal,
}, },
data() { data() {
const columns = [ const columns = [
...@@ -205,6 +248,8 @@ export default { ...@@ -205,6 +248,8 @@ export default {
return { return {
baseurl: process.env.VUE_APP_API_PHP_URL, baseurl: process.env.VUE_APP_API_PHP_URL,
siteId: storage.get(2, "siteId"), siteId: storage.get(2, "siteId"),
previeData: {},
previeVisible: false,
columns, columns,
tHeader, tHeader,
filterVal, filterVal,
...@@ -417,9 +462,33 @@ export default { ...@@ -417,9 +462,33 @@ export default {
onCancel() {}, onCancel() {},
}); });
}, },
// 判断是否是视频文件
estimateVideo(url) {
let index = url.lastIndexOf(".");
let type = url.slice(index + 1);
return type === "mp4";
},
// 查看音视频
checkMultimedia(url) {
let isVideo = this.estimateVideo(url);
let curUrl = this.baseurl + "/" + url;
if (isVideo) {
this.previeData = {
type: "video",
url: curUrl,
};
} else {
this.previeData = {
type: "audio",
url: curUrl,
};
}
this.previeVisible = true;
},
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue
View file @ 091deac2
...@@ -23,14 +23,50 @@ ...@@ -23,14 +23,50 @@
@change="changeTable" @change="changeTable"
> >
<!-- 评价人照片 --> <!-- 评价人照片 -->
<template slot="picture" slot-scope="text"> <template slot="picture" slot-scope="text, record">
<a-avatar v-if="!text" shape="square" :size="40" icon="user" /> <div v-if="text || record.process">
<img <a-tooltip v-if="text" title="照片">
v-else <a-avatar
:src="baseurl + '/' + text" class="cursor-pointer"
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
@click="$viewerApi({ images: [baseurl + '/' + text] })" @click="$viewerApi({ images: [baseurl + '/' + text] })"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="picture"
/>
</a-tooltip>
<a-tooltip
v-else-if="record.process && estimateVideo(record.process)"
title="视频"
>
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="video-camera"
/>
</a-tooltip>
<a-tooltip v-else title="音频">
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="sound"
/>
</a-tooltip>
</div>
<a-tooltip v-else title="无资源">
<a-avatar
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="ellipsis"
/> />
</a-tooltip>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
...@@ -60,6 +96,11 @@ ...@@ -60,6 +96,11 @@
:title="title" :title="title"
:type="detailsType" :type="detailsType"
></HandlingDetails> ></HandlingDetails>
<!-- 音视频查看 -->
<PrevieModal
:previeData="previeData"
:previeVisible.sync="previeVisible"
></PrevieModal>
</div> </div>
</template> </template>
...@@ -67,6 +108,7 @@ ...@@ -67,6 +108,7 @@
import { mapState } from "vuex"; import { mapState } from "vuex";
import storage from "@/utils/js/Storage"; import storage from "@/utils/js/Storage";
import HandlingDetails from "./components/HandlingDetails.vue"; import HandlingDetails from "./components/HandlingDetails.vue";
import PrevieModal from "@/components/PrevieModal.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { getEvaList, getEvaDetil, getQueEvaData } from "@/api/dataAdmin"; import { getEvaList, getEvaDetil, getQueEvaData } from "@/api/dataAdmin";
const tHeader = [ const tHeader = [
...@@ -92,6 +134,7 @@ const filterVal = [ ...@@ -92,6 +134,7 @@ const filterVal = [
export default { export default {
components: { components: {
HandlingDetails, HandlingDetails,
PrevieModal,
}, },
data() { data() {
const columns = [ const columns = [
...@@ -202,6 +245,8 @@ export default { ...@@ -202,6 +245,8 @@ export default {
return { return {
baseurl: process.env.VUE_APP_API_PHP_URL, baseurl: process.env.VUE_APP_API_PHP_URL,
siteId: storage.get(2, "siteId"), siteId: storage.get(2, "siteId"),
previeData: {},
previeVisible: false,
columns, columns,
tHeader, tHeader,
filterVal, filterVal,
...@@ -413,9 +458,32 @@ export default { ...@@ -413,9 +458,32 @@ export default {
onCancel() {}, onCancel() {},
}); });
}, },
// 判断是否是视频文件
estimateVideo(url) {
let index = url.lastIndexOf(".");
let type = url.slice(index + 1);
return type === "mp4";
},
// 查看音视频
checkMultimedia(url) {
let isVideo = this.estimateVideo(url);
let curUrl = this.baseurl + "/" + url;
if (isVideo) {
this.previeData = {
type: "video",
url: curUrl,
};
} else {
this.previeData = {
type: "audio",
url: curUrl,
};
}
this.previeVisible = true;
},
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/module.vue
View file @ 091deac2
<template> <template>
<div class="h-full w-full flex flex-col"> <div class="h-full w-full flex flex-col">
<div class="total-info"> <div class="total-info">
<span class="mr-[30px]">111评价次数：{{ total ?? 0 }}次</span> <span class="mr-[30px]">评价次数：{{ total ?? 0 }}次</span>
<span>统计时间段：{{ time[0] }} - {{ time[1] }}</span> <span>统计时间段：{{ time[0] }} - {{ time[1] }}</span>
</div> </div>
<div class="reportforms-out-box"> <div class="reportforms-out-box">
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/staffLeft.vue
View file @ 091deac2
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
<a-tag <a-tag
class="cursor-pointer" class="cursor-pointer"
color="blue" color="blue"
@click="checkInfo(record.workmanid,record.all_time,record.create_time)" @click="
checkInfo(record.workmanid, record.all_time, record.create_time)
"
> >
详情 详情
</a-tag> </a-tag>
...@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage"; ...@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage";
import StepoutDetails from "./components/StepoutDetails.vue"; import StepoutDetails from "./components/StepoutDetails.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { stopToWorkman, stopInfo } from "@/api/dataAdmin"; import { stopToWorkman, stopInfo } from "@/api/dataAdmin";
const tHeader = [ const tHeader = ["工作人员", "暂离次数", "累计计时(分钟)", "最近暂离时间"]; // 导出的表头名信息
"工作人员", const filterVal = ["workman_name", "count", "all_time", "create_time"]; // 导出的表头字段名，需要导出表格字段名
"暂离次数",
"累计计时",
"最近暂离时间",
]; // 导出的表头名信息
const filterVal = [
"workman_name",
"count",
"all_time",
"create_time",
]; // 导出的表头字段名，需要导出表格字段名
export default { export default {
components: { components: {
StepoutDetails, StepoutDetails,
...@@ -107,7 +99,7 @@ export default { ...@@ -107,7 +99,7 @@ export default {
}, },
}, },
{ {
title: "累计计时", title: "累计计时(分钟)",
width: 100, width: 100,
dataIndex: "all_time", dataIndex: "all_time",
customRender: (text) => { customRender: (text) => {
...@@ -157,8 +149,8 @@ export default { ...@@ -157,8 +149,8 @@ export default {
selectedRowKeys: [], // 表格选中的key selectedRowKeys: [], // 表格选中的key
excelData: [], // 导出数据 excelData: [], // 导出数据
detailsInfo: {}, // 详情信息 detailsInfo: {}, // 详情信息
allTime:"", allTime: "",
createTime:"", createTime: "",
detailsVisible: false, detailsVisible: false,
title: "办理明细", title: "办理明细",
}; };
...@@ -312,24 +304,23 @@ export default { ...@@ -312,24 +304,23 @@ export default {
execute(); execute();
}, },
// 详情 // 详情
async checkInfo(id,alltime,createtime) { async checkInfo(id, alltime, createtime) {
let res = await stopInfo({ let res = await stopInfo({
page:1, page: 1,
size:-1, size: -1,
time:this.searchForm.time, time: this.searchForm.time,
workmanid:id workmanid: id,
}); });
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
this.allTime = alltime this.allTime = alltime;
this.createTime = createtime this.createTime = createtime;
} }
}, },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue
View file @ 091deac2
...@@ -24,16 +24,51 @@ ...@@ -24,16 +24,51 @@
@change="changeTable" @change="changeTable"
> >
<!-- 评价人照片 --> <!-- 评价人照片 -->
<template slot="picture" slot-scope="text"> <template slot="picture" slot-scope="text, record">
<a-avatar v-if="!text" shape="square" :size="40" icon="user" /> <div v-if="text || record.process">
<img <a-tooltip v-if="text" title="照片">
v-else <a-avatar
:src="baseurl + '/' + text" class="cursor-pointer"
class="cursor-pointer w-[50px] max-h-[50px] rounded-[4px]"
@click="$viewerApi({ images: [baseurl + '/' + text] })" @click="$viewerApi({ images: [baseurl + '/' + text] })"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="picture"
/> />
</a-tooltip>
<a-tooltip
v-else-if="record.process && estimateVideo(record.process)"
title="视频"
>
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="video-camera"
/>
</a-tooltip>
<a-tooltip v-else title="音频">
<a-avatar
class="cursor-pointer"
@click="checkMultimedia(record.process)"
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="sound"
/>
</a-tooltip>
</div>
<a-tooltip v-else title="无资源">
<a-avatar
shape="square"
style="background-color: #e6f7ff; color: #1890ff"
:size="40"
icon="ellipsis"
/>
</a-tooltip>
</template> </template>
<!-- 操作 --> <!-- 操作 -->
<template slot="action" slot-scope="text, record"> <template slot="action" slot-scope="text, record">
<a-space> <a-space>
...@@ -61,6 +96,11 @@ ...@@ -61,6 +96,11 @@
:title="title" :title="title"
:type="detailsType" :type="detailsType"
></HandlingDetails> ></HandlingDetails>
<!-- 音视频查看 -->
<PrevieModal
:previeData="previeData"
:previeVisible.sync="previeVisible"
></PrevieModal>
</div> </div>
</template> </template>
...@@ -68,6 +108,7 @@ ...@@ -68,6 +108,7 @@
import { mapState } from "vuex"; import { mapState } from "vuex";
import storage from "@/utils/js/Storage"; import storage from "@/utils/js/Storage";
import HandlingDetails from "./components/HandlingDetails.vue"; import HandlingDetails from "./components/HandlingDetails.vue";
import PrevieModal from "@/components/PrevieModal.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { getEvaList, getEvaData, getEvaDetil } from "@/api/dataAdmin"; import { getEvaList, getEvaData, getEvaDetil } from "@/api/dataAdmin";
const tHeader = [ const tHeader = [
...@@ -93,6 +134,7 @@ const filterVal = [ ...@@ -93,6 +134,7 @@ const filterVal = [
export default { export default {
components: { components: {
HandlingDetails, HandlingDetails,
PrevieModal,
}, },
data() { data() {
const columns = [ const columns = [
...@@ -206,6 +248,8 @@ export default { ...@@ -206,6 +248,8 @@ export default {
columns, columns,
tHeader, tHeader,
filterVal, filterVal,
previeData: {},
previeVisible: false,
tableData: [], tableData: [],
current: 1, current: 1,
size: 10, size: 10,
...@@ -415,9 +459,33 @@ export default { ...@@ -415,9 +459,33 @@ export default {
onCancel() {}, onCancel() {},
}); });
}, },
// 判断是否是视频文件
estimateVideo(url) {
let index = url.lastIndexOf(".");
let type = url.slice(index + 1);
return type === "mp4";
},
// 查看音视频
checkMultimedia(url) {
let isVideo = this.estimateVideo(url);
let curUrl = this.baseurl + "/" + url;
if (isVideo) {
this.previeData = {
type: "video",
url: curUrl,
};
} else {
this.previeData = {
type: "audio",
url: curUrl,
};
}
this.previeVisible = true;
},
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowLeft.vue
View file @ 091deac2
...@@ -40,7 +40,9 @@ ...@@ -40,7 +40,9 @@
<a-tag <a-tag
class="cursor-pointer" class="cursor-pointer"
color="blue" color="blue"
@click="checkInfo(record.windowid,record.all_time,record.create_time)" @click="
checkInfo(record.windowid, record.all_time, record.create_time)
"
> >
详情 详情
</a-tag> </a-tag>
...@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage"; ...@@ -64,18 +66,8 @@ import storage from "@/utils/js/Storage";
import StepoutDetails from "./components/StepoutDetails.vue"; import StepoutDetails from "./components/StepoutDetails.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { stopToWindow, stopInfo } from "@/api/dataAdmin"; import { stopToWindow, stopInfo } from "@/api/dataAdmin";
const tHeader = [ const tHeader = ["窗口编号", "暂离次数", "累计计时(分钟)", "最近暂离时间"]; // 导出的表头名信息
"窗口编号", const filterVal = ["window_num", "count", "all_time", "create_time"]; // 导出的表头字段名，需要导出表格字段名
"暂离次数",
"累计计时",
"最近暂离时间",
]; // 导出的表头名信息
const filterVal = [
"window_num",
"count",
"all_time",
"create_time",
]; // 导出的表头字段名，需要导出表格字段名
export default { export default {
components: { components: {
StepoutDetails, StepoutDetails,
...@@ -107,7 +99,7 @@ export default { ...@@ -107,7 +99,7 @@ export default {
}, },
}, },
{ {
title: "累计计时", title: "累计计时(分钟)",
width: 100, width: 100,
dataIndex: "all_time", dataIndex: "all_time",
customRender: (text) => { customRender: (text) => {
...@@ -157,8 +149,8 @@ export default { ...@@ -157,8 +149,8 @@ export default {
selectedRowKeys: [], // 表格选中的key selectedRowKeys: [], // 表格选中的key
excelData: [], // 导出数据 excelData: [], // 导出数据
detailsInfo: {}, // 详情信息 detailsInfo: {}, // 详情信息
allTime:"", allTime: "",
createTime:"", createTime: "",
detailsVisible: false, detailsVisible: false,
title: "详情", title: "详情",
}; };
...@@ -312,24 +304,23 @@ export default { ...@@ -312,24 +304,23 @@ export default {
execute(); execute();
}, },
// 详情 // 详情
async checkInfo(id,alltime,createtime) { async checkInfo(id, alltime, createtime) {
let res = await stopInfo({ let res = await stopInfo({
page:1, page: 1,
size:-1, size: -1,
time:this.searchForm.time, time: this.searchForm.time,
windowid:id windowid: id,
}); });
if (res.code == 1) { if (res.code == 1) {
let { data } = res; let { data } = res;
this.detailsInfo = data; this.detailsInfo = data;
this.detailsVisible = true; this.detailsVisible = true;
this.allTime = alltime this.allTime = alltime;
this.createTime = createtime this.createTime = createtime;
} }
}, },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
\ No newline at end of file
portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/crowdPortrait.vue
View file @ 091deac2
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
this.chart = echarts.init(this.$refs.chart); this.chart = echarts.init(this.$refs.chart);
} }
echarts.registerMap("china", data); echarts.registerMap("china", data);
var geoGpsMap = [104.64, 28.75]; var geoGpsMap = [102.95, 33.57];
var geoCoordMap = { var geoCoordMap = {
江苏: [118.8062, 31.9208], 江苏: [118.8062, 31.9208],
黑龙江: [127.9688, 45.368], 黑龙江: [127.9688, 45.368],
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
position: "top", position: "top",
// offset: [5, 0], //偏移设置 // offset: [5, 0], //偏移设置
color: "#ff0000", color: "#ff0000",
formatter: "宜宾市", formatter: "若尔盖县",
textStyle: { textStyle: {
color: "#fff", color: "#fff",
fontSize: "16px", fontSize: "16px",
...@@ -312,8 +312,8 @@ export default { ...@@ -312,8 +312,8 @@ export default {
}, },
data: [ data: [
{ {
name: "宜宾市", name: "若尔盖县",
value: [104.64, 28.75], value: [102.95, 33.57],
}, },
], ],
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue
View file @ 091deac2
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.data-manage { .data-manage {
padding: 72px 60px 0px 60px; padding: 72px 60px 0px 60px;
background: url("@/assets/images/dataManage/bg_2.png") no-repeat; background: url("@/assets/images/siteArrange/bg_3.jpg") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.main { .main {
height: 714px; height: 714px;
......
portal-manager-ui/admin/src/views/signIn/signIn.vue
View file @ 091deac2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="main h-full w-full flex items-center justify-between"> <div class="main h-full w-full flex items-center justify-between">
<div class="slogan"> <div class="slogan">
<p class="slogan-text slogan-text-1 mb-12">若诗·若画·若尔盖</p> <p class="slogan-text slogan-text-1 mb-12">若诗·若画·若尔盖</p>
<p class="slogan-text slogan-text-2">似烟·似梦·似天堂</p> <!-- <p class="slogan-text slogan-text-2">似烟·似梦·似天堂</p> -->
</div> </div>
<div class="w-[490px] h-[660px]"> <div class="w-[490px] h-[660px]">
<div class="swiper mySwiper"> <div class="swiper mySwiper">
...@@ -448,7 +448,7 @@ export default { ...@@ -448,7 +448,7 @@ export default {
} }
100% { 100% {
width: 640px; width: 800px;
} }
} }
// @keyframes hiddrenText { // @keyframes hiddrenText {
...@@ -458,34 +458,31 @@ export default { ...@@ -458,34 +458,31 @@ export default {
// } // }
// } // }
@media(max-width: 1900px){ @media (max-width: 1900px) {
.slogan{ .slogan {
// font-size: 60px !important; // font-size: 60px !important;
margin-left: 200px !important; margin-left: 200px !important;
} }
} }
@media (max-width: 1700px){ @media (max-width: 1700px) {
.slogan{ .slogan {
// font-size: 60px !important; // font-size: 60px !important;
margin-left: 100px !important; margin-left: 100px !important;
} }
} }
@media (max-width: 1500px){ @media (max-width: 1500px) {
.slogan{ .slogan {
margin-left: 0px !important; margin-left: 0px !important;
margin-right: 0px !important; margin-right: 0px !important;
} }
} }
.login { .login {
--pd: 9%; --pd: 9%;
--input-height: 50px; --input-height: 50px;
--input-border-color: rgba(238, 238, 238, 1); --input-border-color: rgba(238, 238, 238, 1);
--time: 1s; --time: 1.5s;
background: url("@/assets/images/login_bg.png"); background: url("@/assets/images/login_bg.jpg");
background-size: 100% auto; background-size: 100% auto;
animation: bg-roll 150s cubic-bezier(0.21, 0.07, 0.88, 1.02) infinite; animation: bg-roll 150s cubic-bezier(0.21, 0.07, 0.88, 1.02) infinite;
.main { .main {
...@@ -493,12 +490,12 @@ export default { ...@@ -493,12 +490,12 @@ export default {
background-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.7);
} }
.slogan { .slogan {
margin-left: 200px; margin-left: 120px;
// margin-right: 20px; // margin-right: 20px;
} }
.slogan-text { .slogan-text {
width: 640px; width: 640px;
font-size: 68px; font-size: 78px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 500; font-weight: 500;
color: #fff; color: #fff;
...@@ -507,11 +504,11 @@ export default { ...@@ -507,11 +504,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
.slogan-text-1 { .slogan-text-1 {
animation: printText var(--time) steps(5) both; animation: printText var(--time) both;
} }
.slogan-text-2 { .slogan-text-2 {
margin-left: 1em; margin-left: 1em;
animation: var(--time) printText var(--time) steps(5) both; animation: var(--time) printText var(--time) both;
} }
.swiper { .swiper {
width: 100%; width: 100%;
......
portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue
View file @ 091deac2
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
</draggable> </draggable>
</div> </div>
<div class="title flex flex-col items-center mt-[150px] mb-[25px]"> <div class="title flex flex-col items-center mt-[150px] mb-[25px]">
<img <!-- <img
class="img-title mb-[42px]" class="img-title mb-[42px]"
src="@/assets/images/siteArrange/title.png" src="@/assets/images/siteArrange/title.png"
/> /> -->
<h1 class="slogan_title">若诗 · 若画 · 若尔盖</h1>
<div class="slogan">建设高效便民、智慧泛在的智慧政务大厅</div> <div class="slogan">建设高效便民、智慧泛在的智慧政务大厅</div>
</div> </div>
<!-- 站点 --> <!-- 站点 -->
...@@ -236,7 +237,7 @@ export default { ...@@ -236,7 +237,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.station { .station {
background: url("@/assets/images/siteArrange/bg_2.png") no-repeat; background: url("@/assets/images/siteArrange/bg_3.jpg") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
overflow: hidden; overflow: hidden;
.del-box { .del-box {
...@@ -257,6 +258,13 @@ export default { ...@@ -257,6 +258,13 @@ export default {
top: 0px; top: 0px;
} }
.title { .title {
.slogan_title {
font-size: 65px;
font-family: Source Han Sans CN;
font-weight: 600;
color: #ffffff;
margin-bottom: 30px;
}
.slogan { .slogan {
font-size: 39px; font-size: 39px;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
......
portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes.vue
View file @ 091deac2
...@@ -3265,7 +3265,7 @@ export default { ...@@ -3265,7 +3265,7 @@ export default {
.modal { .modal {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url("@/assets/images/platformSet/bg-pintai.jpg") no-repeat center; background: url("@/assets/images/platformSet/bg_3.jpg") no-repeat center;
background-size: cover; background-size: cover;
padding-top: @headerH; padding-top: @headerH;
......
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