Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
lnn19986213 2024-06-14 09:41:24 +08:00
commit 0a9076bdaf
13 changed files with 416 additions and 507 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -27,22 +27,22 @@ axios.interceptors.response.use(
}, },
(error) => { (error) => {
if (error.response) { if (error.response) {
// if (error.response.status == 401) { if (error.response.status == 401) {
// ElMessage.error("请重新登录!"); ElMessage.error("请重新登录!");
// // window.location.href = '/#/login?returnURL=' + window.location.href // window.location.href = '/#/login?returnURL=' + window.location.href
// window.location.href = window.location.href =
// 'http://220.191.238.50:996/api/login?returnURL=' + 'http://220.191.238.50:996/api/login?returnURL=' +
// window.location.href window.location.href
// } else if (error.response.status == 404) { } else if (error.response.status == 404) {
// ElMessage.error("Status:404正在请求不存在的服务器记录"); ElMessage.error("Status:404正在请求不存在的服务器记录");
// } else if (error.response.status == 500) { } else if (error.response.status == 500) {
// ElMessage.error({ ElMessage.error({
// title: '请求错误', title: '请求错误',
// message: "Status:500服务器发生错误" message: "Status:500服务器发生错误"
// }); });
// } else { } else {
// ElMessage.error(`Status:${error.response.status},未知错误!`); ElMessage.error(`Status:${error.response.status},未知错误!`);
// } }
} else { } else {
ElMessage.error("请求服务器无响应!"); ElMessage.error("请求服务器无响应!");
} }

View File

@ -1,462 +1,330 @@
<template> <template>
<div class="module"> <div class="module">
<div class="module_left"> <div class="displayFlex left_bg">
<div class="displayFlex">
<div class="flex1"> <div class="flex1">
<div class="yd_title"> <div class="yd_title left_1">
<span class="text">助乡兴趣点</span> <div class="animate-border">
<i></i>
<i></i>
</div> </div>
<ePie></ePie> </div>
</div>
</div>
<div class="displayFlex center_bg">
<div class="flex1">
<div class="yd_title center_0">
<div class="animate-border">
<i></i>
<i></i>
</div>
</div>
</div> </div>
<div class="flex1"> <div class="flex1">
<div class="yd_title"> <div class="yd_title center_1">
<span class="text">基本信息</span> <div class="animate-border">
</div> <i></i>
<div class="basicInformation"> <i></i>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>学历</span>
</div>
<p>浙江大学研究生</p>
</div>
</div>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>性格</span>
</div>
<p>沉稳</p>
</div>
</div>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>分类</span>
</div>
<p>乡贤代表</p>
</div>
</div>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>所属行业</span>
</div>
<p>计算机<br />应用专家</p>
</div>
</div>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>家属情况</span>
</div>
<p>父母去世姨妈 在象</p>
</div>
</div>
<div class="basicInformation_item">
<img class="icon" src="../assets/img_01.png" alt="" />
<div class="right">
<div class="label">
<span>对乡情感</span>
</div>
<p>积极参与</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="displayFlex right_bg">
<div class="displayFlex">
<div class="flex1"> <div class="flex1">
<div class="yd_title"> <div class="yd_title right_1">
<span class="text">活动数据分析</span> <div class="animate-border">
</div> <i></i>
<eGraph></eGraph> <i></i>
</div>
<div class="flex1">
<div class="yd_title">
<span class="text">走访日志</span>
</div>
<div class="visitLog">
<div class="visitLog_item">
<img
src="../assets/img_02.png"
width="48px"
height="51px"
alt=""
/>
<div class="visitLog_item_box">
<h4>故居走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
<div class="visitLog_item">
<img
src="../assets/img_02.png"
width="48px"
height="51px"
alt=""
/>
<div class="visitLog_item_box">
<h4>节日走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
<div class="visitLog_item">
<img
src="../assets/img_02.png"
width="48px"
height="51px"
alt=""
/>
<div class="visitLog_item_box">
<h4>新年走访</h4>
<p>走访人员陈思思</p>
<p>走访时间2023-03-19 09:00:03</p>
</div>
<span class="check">点击查看</span>
</div>
</div>
</div>
</div>
<div class="displayFlex">
<div class="flex1">
<div class="yd_title">
<span class="text">个人经历</span>
</div>
<div class="history">
<p>2002年至2009年担任浙江大学计算机学院和软件学院院长</p>
<p>1984年获得浙江大学计算机应用专业硕士学位之后留校任教</p>
<p>1990年获得浙江大学计算机应用专业博士学位</p>
<p>1994年至1996年担任浙江大学计算机系副系主任</p>
<p>1997年至2002年担任浙江大学计算机系系主任</p>
<p>2002年至2009年担任浙江大学计算机学院和软件学院院长</p>
</div>
</div>
<div class="flex1">
<div class="yd_title">
<span class="text">职位</span>
</div>
<eBubble></eBubble>
</div>
</div>
<div></div>
</div>
<!-- <div class="module_right">
<div class="flex1">
<div class="yd_title">
<span class="text">关注标签</span>
</div>
<div class="concernLabel">
<span>计算机</span>
<span>大数据</span>
<span>互联网</span>
</div>
</div>
<div class="flex1">
<div class="yd_title">
<span class="text">助乡属性</span>
</div>
<div class="property">
<div class="property_box">
<h5>助乡方式</h5>
<p>科技助乡</p>
</div>
<div class="property_box">
<h5>助乡意向</h5>
<p>积极</p>
</div>
</div>
<div class="activity">
<h5>助乡活动</h5>
<div class="activity_content">
<div class="activity_box">
<p>
2021.2象山县委统战部和象山电视台工作人员前往杭州浙江大学拍摄天南地北象山人
</p>
</div>
<div class="activity_box">
<p>
2020.8.29陈纯院士参加在象山举办的浙江省海外高层次人才联谊会并作院士报告
</p>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="flex1"> <div class="flex1">
<div class="yd_title"> <div class="yd_title right_2">
<span class="text">信息监测</span> <div class="animate-border">
</div> <i></i>
<div class="monitor"> <i></i>
<div class="monitor_box">
<img src="../assets/img_10.png" alt="" />
<div class="monitor_box_text">
<h4>智汇青春 有梦当燃这场全国大赛决赛在西子湖畔收官</h4>
<p>2023-03-18</p>
</div> </div>
</div> </div>
<div class="monitor_box"> </div>
<img src="../assets/img_09.png" alt="" /> <div class="flex1">
<div class="monitor_box_text"> <div class="yd_title right_3">
<h4>智汇青春 有梦当燃这场全国大赛决赛在西子湖畔收官</h4> <div class="animate-border">
<p>2023-03-18</p> <i></i>
<i></i>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> -->
</div> </div>
</template> </template>
<script setup> <script setup>
// import eBubble from "./echarts/bubble.vue"; import { ref, reactive, onMounted, onBeforeMount, computed } from "vue";
// import ePie from "./echarts/pie.vue"; import http from "@/utils/request.js";
// import ePie2 from "./echarts/pie2.vue";
// import eGraph from "./echarts/graph.vue"; onMounted(() => {
});
onBeforeMount(() => {
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.displayFlex { .displayFlex {
box-sizing: border-box;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; // flex: 1;
} width: 30%;
.flex1 {
flex: 1;
padding: 0 38px;
box-sizing: border-box;
}
.module {
display: flex;
.module_left {
display: flex;
}
// .module_right {
// flex: 0 0 25%;
// }
} }
.yd_title { .flex1 {
background-image: url(@/assets/img_04.png); flex: 1;
// padding: 0 28px;
box-sizing: border-box;
}
.module {
display: flex;
width: 100%;
}
.left_bg {
width: 642px;
// height: 100%;
box-sizing: border-box;
padding-left: 50px;
padding-right: 20px;
margin-right: 28px;
background-image: url(@/assets/images/left_bg.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
}
.center_bg {
width: 582px;
box-sizing: border-box; box-sizing: border-box;
width: 100%; padding-left: 10px;
height: 36px; padding-right: 10px;
background-image: url(@/assets/images/center_bg.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.right_bg {
width: 642px;
box-sizing: border-box;
padding-right: 50px;
padding-left: 20px;
margin-left: 28px;
background-image: url(@/assets/images/right_bg.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.left_1 {
background-image: url(@/assets/images/sjfx/lnrsjfx.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.center_0 {
background-image: url(@/assets/images/sjfx/bft.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.center_1 {
background-image: url(@/assets/images/sjfx/ymt.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.right_1 {
background-image: url(@/assets/images/sjfx/wjybry.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.right_2 {
background-image: url(@/assets/images/sjfx/xxts.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.right_3 {
background-image: url(@/assets/images/sjfx/jtzk.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.yd_title {
box-sizing: border-box;
width: 98%;
height: 42px;
position: relative; position: relative;
overflow: hidden;
.text { .text {
display: flex;
position: absolute;
font-size: 16px; font-size: 16px;
font-family: SourceHanSansCN; font-family: SourceHanSansCN;
font-weight: bold; font-weight: bold;
color: #ffffff; color: #ffffff;
position: absolute; position: absolute;
left: 33px; right: 5px;
top: 3px; top: 3px;
} } /* 利用伪元素和两个i元素产生4条线 */
} .animate-border {
position: absolute;
.basicInformation { top: 0px;
display: flex; width: 100%;
flex-direction: row;
flex-wrap: wrap;
padding-top: 22px;
.basicInformation_item {
flex: 0 0 50%;
padding: 0 2px;
margin-bottom: 10px;
margin-top: 10px;
box-sizing: border-box;
display: flex;
align-items: center;
.icon {
width: 79px;
height: 47px;
}
.right {
margin-left: 4px;
.label {
background-image: url(@/assets/img_11.png);
background-size: 100%;
background-repeat: no-repeat;
background-position: bottom;
margin-bottom: 4px;
span {
font-size: 12px;
font-weight: 400;
color: #eff0f1;
line-height: 19px;
margin-left: 2px;
}
}
p {
font-size: 16px;
font-weight: bold;
color: #6acbff;
line-height: 24px;
}
}
}
}
.visitLog {
.visitLog_item {
display: flex;
align-items: center;
background-image: url(@/assets/img_12.png);
background-size: 100% 100%;
margin-top: 16px;
padding: 15px 8px;
box-sizing: border-box;
img {
display: inline-block;
margin-right: 10px;
}
.visitLog_item_box {
flex: auto;
h4 {
font-size: 18px;
font-family: MicrosoftYaHei;
font-weight: bold;
color: #0096ff;
margin-bottom: 2px;
}
p {
font-size: 12px;
font-family: SourceHanSansCN;
font-weight: 400;
color: #ffffff;
margin-top: 6px;
}
}
.check {
font-size: 12px;
font-family: SourceHanSansCN;
font-weight: 400;
color: #0096ff;
line-height: 20px;
}
}
}
.history {
padding-top: 12px;
p {
margin-top: 12px;
font-size: 12px;
font-weight: 400;
color: #ffffff;
line-height: 28px;
border-bottom: 13px solid rgba(57, 59, 109, 1);
}
}
.concernLabel {
display: flex;
align-items: center;
justify-content: center;
margin: 12px 0 20px;
span {
text-align: center;
background: rgba(0, 89, 130, 0.73);
border-radius: 10px;
width: 118px;
height: 49px;
line-height: 49px;
font-size: 18px;
font-weight: 400;
color: #ffffff;
margin: 0 10px;
}
}
.property {
display: flex;
padding: 14px 0 10px;
.property_box {
background-image: url(@/assets/img_05.png);
background-size: 100% 100%;
background-repeat: no-repeat;
width: 179px;
height: 91px;
margin: 0 12px;
text-align: center;
h5 {
font-size: 14px;
font-weight: 400;
color: #ffffff;
margin: 9px 0 16px;
}
p {
font-size: 21px;
font-weight: bold;
color: #48ece7;
}
}
}
.activity {
h5 {
font-size: 14px;
font-weight: bold;
color: rgba(0, 164, 250, 0.8);
line-height: 47px;
border-bottom: 2px solid rgba(0, 164, 250, 1);
margin-bottom: 17px;
}
.activity_content {
margin: 0 -6px 12px;
display: flex;
.activity_box {
width: 50%;
display: inline-block;
margin: 0 6px;
box-sizing: border-box;
background-color: rgba(15, 28, 54, 1);
padding: 12px 12px 19px;
p {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 27px;
height: 100%; height: 100%;
&::before,
&::after {
content: "";
position: absolute;
width: 100%;
height: 2px;
} }
i {
position: absolute;
display: inline-block;
height: 100%;
width: 2px;
}
&::before {
top: 0;
left: -100%;
background-image: linear-gradient(
90deg,
transparent,
#03e9f4,
transparent
);
animation: one 4s linear infinite;
}
i:nth-child(1) {
top: -100%;
right: 0;
background-image: linear-gradient(
180deg,
transparent,
#03e9f4,
transparent
);
/* 动画名称 动画持续时间 动画渲染函数 动画延迟时间 动画执行次数 */
animation: two 4s linear 1s infinite;
}
&::after {
bottom: 0;
right: -100%;
background-image: linear-gradient(
-90deg,
transparent,
#03e9f4,
transparent
);
animation: three 4s linear 2s infinite;
}
i:nth-child(2) {
bottom: -100%;
left: 0;
background-image: linear-gradient(
360deg,
transparent,
#03e9f4,
transparent
);
animation: four 4s linear 3s infinite;
} }
} }
} }
.monitor { @keyframes one {
.monitor_box { 0% {
display: flex; left: -100%;
padding: 8px 0;
border-bottom: 2px solid rgba(255, 255, 255, 0.67);
img {
width: 115px;
height: 84px;
margin-right: 21px;
} }
.monitor_box_text { 50%,
display: flex; 100% {
flex-direction: column; left: 100%;
justify-content: space-between;
h4 {
font-size: 14px;
font-weight: 400;
color: #ffffff;
line-height: 20px;
} }
p { }
font-size: 14px;
font-weight: 400; @keyframes two {
color: #818181; 0% {
line-height: 23px; top: -100%;
} }
50%,
100% {
top: 100%;
} }
}
@keyframes three {
0% {
right: -100%;
} }
50%,
100% {
right: 100%;
}
}
@keyframes four {
0% {
bottom: -100%;
}
50%,
100% {
bottom: 100%;
}
}
.mechanism {
background-image: url(@/assets/YLTitle/titleImg10.png);
background-repeat: no-repeat;
background-size: 100% 100%;
}
.flex11 {
padding: 12px 0;
}
/* 滚动条整体部分 */
.rolling::-webkit-scrollbar {
width: 5px;
// height: 10px;
}
/* 滚动槽 */
.rolling::-webkit-scrollbar-track {
border-radius: 1px;
background: rgba(0, 128, 231, 0.56);
-webkit-box-shadow: inset 0 0 6px rgba(139, 139, 139, 0.3);
}
/* 滚动条滑块样式 */
.rolling::-webkit-scrollbar-thumb {
background-clip: content-box;
border-radius: 6px;
background: rgba(0, 162, 231, 1);
-webkit-box-shadow: inset 0 0 6px rgba(20, 20, 20, 0.3);
} }
</style> </style>

View File

@ -72,12 +72,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-else
:key="item.label" :key="item.label"
:property="item.property" :property="item.property"
:label="item.label" :label="item.label"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
align="center" align="center"
v-else
/> />
</template> </template>
</el-table> </el-table>

View File

@ -252,21 +252,52 @@
政务服务 政务服务
</div> </div>
</div> </div>
<div class="dailyActivity" v-if="choose == '1'">
<div class="dailyActivityBox">
<div class="dailyActivitybootm">
<img src="../assets/images/sy/dropDown.png" />
<span>浙里办平均日活</span>
</div>
<span style="margin-right: 20px;">8135</span>
</div>
<div class="dailyActivityBox">
<div class="dailyActivitybootm">
<img src="../assets/images/sy/dropDown.png" />
<span>龙游通平均日活</span>
</div>
<span style="margin-right: 20px;" >2714</span>
</div>
</div>
<el-table <el-table
:data="tableData" :data="data.tableData"
style="width: 100%; height: 272px" style="width: 100%; height: 248px"
class="table_border" class="table_border"
:row-style="rowState" :row-style="rowState"
:header-cell-style="tableHeaderColor" :header-cell-style="tableHeaderColor"
v-if="choose == '1'" v-if="choose == '1'"
> >
<el-table-column prop="company" label="企业名称" width="200" />
<el-table-column <el-table-column
prop="address" prop="highFrequencyApp"
label="项目事项牵头单位" label="高频应用"
width="200" width="132"
/> />
<el-table-column prop="finish" label="完成情况">
<el-table-column
prop="monthlyVisits"
label="月访问量"
width="131"
/>
<el-table-column
prop="highFrequencyApp1"
label="高频应用"
width="132"
/>
<el-table-column
prop="monthlyVisits1"
label="月访问量"
width="132"
/>
<!-- <el-table-column prop="finish" label="完成情况">
<template #default="scope"> <template #default="scope">
<div <div
style="letter-spacing: 3px" style="letter-spacing: 3px"
@ -275,7 +306,7 @@
{{ scope.row.finish ? "已完成" : "未完成" }} {{ scope.row.finish ? "已完成" : "未完成" }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<div class="qyfw" v-if="choose == '2'"> <div class="qyfw" v-if="choose == '2'">
<div <div
@ -842,44 +873,16 @@ const data = reactive({
}, // }, //
tableData: [ tableData: [
{ {
company: "龙游县文旅集团", highFrequencyApp: "智享工会",
address: "龙游县五一单位", monthlyVisits: "183111",
finish: true, highFrequencyApp1: "公交查询",
monthlyVisits1: "26067",
}, },
{ {
company: "龙游县文旅集团", highFrequencyApp: "老兵码",
address: "龙游县五一单位", monthlyVisits: "23697",
finish: true, highFrequencyApp1: "公共自行车",
}, monthlyVisits1: "20702",
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: true,
},
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: false,
},
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: false,
},
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: false,
},
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: false,
},
{
company: "龙游县文旅集团",
address: "龙游县五一单位",
finish: false,
}, },
], ],
jysyList: [ jysyList: [
@ -1023,48 +1026,48 @@ const data = reactive({
], ],
}); });
const tableData = ref([ // const tableData = ref([
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: true, // finish: true,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: true, // finish: true,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: true, // finish: true,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: false, // finish: false,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: false, // finish: false,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: false, // finish: false,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: false, // finish: false,
}, // },
{ // {
company: "龙游县文旅集团", // company: "",
address: "龙游县五一单位", // address: "",
finish: false, // finish: false,
}, // },
]); // ]);
const jysyList = ref([ const jysyList = ref([
{ {
title: "县镇", title: "县镇",
@ -1098,7 +1101,7 @@ const tableHeaderColor = (arg) => {
paddingLeft: "10px", paddingLeft: "10px",
letterSpacing: "1px", letterSpacing: "1px",
fontSize: "15px", fontSize: "15px",
height: "50px", height: "32px",
backgroundColor: "#455F8A", backgroundColor: "#455F8A",
color: "#fff", color: "#fff",
}; };
@ -2368,6 +2371,44 @@ const showTab = (val) => {
} }
} }
} }
.dailyActivity {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 40px;
background: rgba(60, 144, 255, 0.08);
border: 1px solid #7aceff;
border-radius: 2px 2px 0px 0px;
box-sizing: border-box;
padding: 6px;
.dailyActivityBox {
display: flex;
align-items: center;
justify-content: space-between;
width: 50%;
.dailyActivitybootm{
display: flex;
align-items: center;
}
img {
width: 20px;
height: 20px;
}
span {
font-family: PangMenZhengDao;
font-size: 16px;
color: #62f3ff;
letter-spacing: 1px;
text-align: center;
font-style: normal;
display: inline-block;
}
}
}
// //
.qyfw { .qyfw {
height: 272px; height: 272px;