Browse Source

修改

dev_kxc
xzt 11 months ago
parent
commit
93f5f5e91c
  1. BIN
      jwtech-admin-page/src/assets/image/Frame1.png
  2. BIN
      jwtech-admin-page/src/assets/image/Frame2.png
  3. BIN
      jwtech-admin-page/src/assets/image/Frame3.png
  4. 62
      jwtech-admin-page/src/components/map/index.vue
  5. 27
      jwtech-admin-page/src/router/index.js
  6. 1
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/rightsProtectionNoticeBoard.vue
  7. 16
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue
  8. 6
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue
  9. 2
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/completionOfInvestment.vue
  10. 18
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue
  11. 16
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue
  12. 563
      jwtech-admin-page/src/views/gateway/earlyWarningDivisionSituation.vue
  13. 3
      jwtech-admin-page/src/views/gateway/fundControlSituation.vue
  14. 3
      jwtech-admin-page/src/views/gateway/index.vue
  15. 3
      jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue
  16. 2
      jwtech-admin-page/src/views/largeScreen/index copy.vue
  17. 4
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue
  18. 6
      jwtech-admin-page/src/views/project/proposal/index.vue

BIN
jwtech-admin-page/src/assets/image/Frame1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
jwtech-admin-page/src/assets/image/Frame2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
jwtech-admin-page/src/assets/image/Frame3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

62
jwtech-admin-page/src/components/map/index.vue

@ -2,6 +2,11 @@
<div id="content">
<div id="map" ref="map"></div>
<div class="btn-box" v-if="isDrawEdit">
<!-- <div class="search">
<input class="searchCon" type="text" />
<input class="searchCon" type="text" />
<span>搜索</span>
</div> -->
<div class="btn" id="drawPointBtn" @click="handlePointDraw">绘制点</div>
<div class="btn" id="drawLineBtn" @click="handleLineDraw">绘制线</div>
<!-- <div class="btn" id="drawBtn" @click="handleReturn">撤销</div> -->
@ -177,13 +182,13 @@ export default {
// url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
// type: "YZT-WMTS",
// },
// {
// index: 2,
// code: "YZT1610609681389",
// name: "广20207_17",
// url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
// type: "YZT-WMTS",
// },
{
index: 2,
code: "YZT1610609681389",
name: "广东2020年7_17级矢量注记",
url: "http://19.25.37.27:8081/gmap/proxyHandler?serviceCode={{serviceCode}}&url=https://ztn-data.gdgov.cn:8581/GatewayMsg/http/api/proxy/invoke",
type: "YZT-WMTS",
},
{
index: 3,
code: "0",
@ -1052,18 +1057,35 @@ export default {
right: 20px;
display: flex;
align-items: center;
}
.btn-box .btn {
padding: 5px 15px;
background: blue;
border-radius: 4px;
margin: 0 8px;
font-size: 12px;
color: #fff;
user-select: none;
cursor: pointer;
}
.btn-box .btn:hover {
opacity: 0.6;
.btn {
padding: 5px 15px;
background: blue;
border-radius: 4px;
margin: 0 8px;
font-size: 12px;
color: #fff;
user-select: none;
cursor: pointer;
}
.btn:hover {
opacity: 0.6;
}
.search {
& > .searchCon {
width: 100px;
}
& > span {
display: inline-block;
color: #fff;
background: blue;
padding: 5px 15px;
font-size: 12px;
cursor: pointer;
}
& > span:hover {
opacity: 0.6;
}
}
}
</style>

27
jwtech-admin-page/src/router/index.js

@ -56,7 +56,7 @@ export const constantRoutes = [
},
{
path: '/largeScreen',
component: (resolve) => require(['@/views/largeScreen/index'], resolve),
component: (resolve) => require(['@/views/largeScreen/index copy'], resolve),
hidden: true,
// children: [
// {
@ -76,6 +76,31 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/singleLogin'], resolve),
hidden: true
},
{
path: '/gateway',
hidden: true,
component: (resolve) => require(['@/views/gateway/index'], resolve),
redirect: "gateway/earlyWarningDivisionSituation",
children: [
{
path: 'earlyWarningDivisionSituation',
component: (resolve) => require(['@/views/gateway/earlyWarningDivisionSituation'], resolve)
},
{
path: 'projectDistributionADiagram',
component: (resolve) => require(['@/views/gateway/projectDistributionADiagram'], resolve)
},
{
path: 'fundControlSituation',
component: (resolve) => require(['@/views/gateway/fundControlSituation'], resolve)
}
]
},
// {
// path: '/earlyWarningDivisionSituation',
// component: (resolve) => require(['@/views/gateway/earlyWarningDivisionSituation'], resolve),
// hidden: true
// },
{
path: '/tttt',
component: (resolve) => require(['@/views/system/testD3/index'], resolve),

1
jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/rightsProtectionNoticeBoard.vue

@ -289,6 +289,7 @@ export default {
},
//
reset() {
this.fileList = [];
this.form = {
proCode: null,
proNo: null,

16
jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue

@ -1050,7 +1050,7 @@ export default {
{
required: true,
message: "请添加验收人员",
trigger: "blur",
trigger: "input",
},
],
acceptanceDecisionLetter: [
@ -1094,7 +1094,7 @@ export default {
{
required: true,
message: "请添加验收人员",
trigger: "blur",
trigger: "input",
},
],
},
@ -1265,6 +1265,18 @@ export default {
},
//
reset() {
this.dynamicTags1 = [];
this.dynamicTags2 = [];
this.fileList1 = [];
this.fileList2 = [];
this.fileList3 = [];
this.fileList4 = [];
this.fileList5 = [];
this.fileList6 = [];
this.fileList7 = [];
this.fileList8 = [];
this.fileList9 = [];
this.fileList10 = [];
this.form = {
id: null,
projectName: null,

6
jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue

@ -49,7 +49,7 @@
{{ item.name }}
<i
class="el-icon-download"
@click="downloadFile(scope, index)"
@click="$myDownLoadFile(item, index)"
style="cursor: pointer"
></i>
</div>
@ -142,7 +142,7 @@
{{ item.name }}
<i
class="el-icon-download"
@click="downloadFile(scope, index)"
@click="$myDownLoadFile(item, index)"
style="cursor: pointer"
></i>
</div>
@ -167,7 +167,7 @@
{{ item.name }}
<i
class="el-icon-download"
@click="downloadFile(scope, index)"
@click="$myDownLoadFile(item, index)"
style="cursor: pointer"
></i>
</div>

2
jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/completionOfInvestment.vue

@ -283,7 +283,7 @@
icon="el-icon-edit"
size="mini"
@click="progressDetail"
v-hasPermi="['progress:plan:detail']"
v-hasPermi="['progress:info:detail']"
>进度详情</el-button
>
</el-col>

18
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue

@ -11,7 +11,7 @@
<span class="valueTi">工期</span>
<el-progress
:stroke-width="14"
:percentage="70"
:percentage="gqPercentage"
:show-text="false"
color="#36B29E"
></el-progress>
@ -29,7 +29,7 @@
<span class="valueTi">投资</span>
<el-progress
:stroke-width="14"
:percentage="70"
:percentage="tzPercentage"
:show-text="false"
color="#36B29E"
></el-progress>
@ -144,6 +144,20 @@ export default {
}
return res;
},
gqPercentage() {
let res = 0;
if (this.gqMsg.finish && this.gqMsg.total) {
res = (this.gqMsg.finish / this.gqMsg.total) * 100;
}
return res;
},
tzPercentage() {
let res = 0;
if (this.tzMsg.finish && this.tzMsg.total) {
res = (this.tzMsg.finish / this.tzMsg.total) * 100;
}
return res;
},
},
created() {
this.getData();

16
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue

@ -36,11 +36,21 @@
min-width="120"
/>
<el-table-column
label="预警状态(字段还没有)"
label="预警状态"
align="center"
prop="111"
prop="alertType"
min-width="120"
/>
>
<template slot-scope="scope">
{{
scope.row.alertType == "0"
? "预警"
: scope.row.alertType == "1"
? "提醒"
: ""
}}
</template>
</el-table-column>
<!-- <el-table-column
label="流程节点"
align="center"

563
jwtech-admin-page/src/views/gateway/earlyWarningDivisionSituation.vue

@ -0,0 +1,563 @@
<template>
<div class="page">
<div class="page_left">
<div class="left_head">
<div class="head_title">
<div class="iconSpan">
<span class="first"></span>
<span class="second"></span>
</div>
<span class="text">预警分布情况</span>
</div>
<div
:class="{
head_btn: true,
head_btn_al: isActive == '1',
head_btn_ar: isActive == '2',
}"
>
<div
:class="{ btn_left: true, activeBtn: isActive == '1' }"
@click="chooseBtn(1)"
>
红灯/黄灯
</div>
<div
:class="{ btn_right: true, activeBtn: isActive == '2' }"
@click="chooseBtn(2)"
>
正常
</div>
</div>
</div>
<div class="left_content">
<div ref="myEcharts" class="myEharts"></div>
</div>
</div>
<div class="page_right">
<div class="right_head">
<div class="head_title">
<div class="iconSpan">
<span class="first"></span>
<span class="second"></span>
</div>
<span class="text">项目法人效率监督</span>
</div>
<div class="head_btn">
<div
:class="{ btnYear: true, activeBtn: activeTime == '1' }"
@click="chooseTime('1')"
>
本年
</div>
<div
:class="{ btnMonth: true, activeBtn: activeTime == '2' }"
@click="chooseTime('2')"
>
本月
</div>
<div
:class="{ btnWeek: true, activeBtn: activeTime == '3' }"
@click="chooseTime('3')"
>
本周
</div>
</div>
</div>
<div class="right_content">
<div class="wait">
<div class="wait_title">待办事项()</div>
<div class="wait_no">16</div>
<img src="@/assets/image/Frame1.png" alt="" />
</div>
<div class="finishAndDelay">
<div class="finish">
<div class="finish_title">待办事项()</div>
<div class="finish_no">16</div>
<img src="@/assets/image/Frame2.png" alt="" />
</div>
<div class="delay">
<div class="delay_title">待办事项()</div>
<div class="delay_no">16</div>
<img src="@/assets/image/Frame3.png" alt="" />
</div>
</div>
<div class="rate">
<div class="finishRate">
<div class="finishRateTitle">完成率</div>
<el-progress
type="circle"
:percentage="88"
:width="88"
:stroke-width="10"
stroke-linecap="square"
define-back-color="rgba(0, 0, 0, 0.05)"
text-color="#12C299"
></el-progress>
</div>
<div class="delayRate">
<div class="delayRateTitle">延办率</div>
<el-progress
type="circle"
:percentage="2"
:width="88"
:stroke-width="10"
stroke-linecap="square"
define-back-color="rgba(0, 0, 0, 0.05)"
text-color="#FF6400"
></el-progress>
</div>
</div>
</div>
</div>
<!-- svg -->
<svg width="0" height="0">
<defs>
<linearGradient id="green" x1="0%" y1="0%" x2="100%" y2="0%">
<stop offset="0%" style="stop-color: #12c299; stop-opacity: 1" />
<stop offset="100%" style="stop-color: #12c299; stop-opacity: 0.4" />
</linearGradient>
</defs>
</svg>
<svg width="0" height="0">
<defs>
<linearGradient id="orange" x1="0%" y1="0%" x2="100%" y2="0%">
<stop offset="0%" style="stop-color: #ff6400; stop-opacity: 1" />
<stop offset="100%" style="stop-color: #ff6400; stop-opacity: 0.4" />
</linearGradient>
</defs>
</svg>
</div>
</template>
<script>
import * as echarts from "echarts";
export default {
data() {
return {
isActive: "1",
activeTime: "1",
};
},
mounted() {
this.initEcharts();
},
methods: {
chooseBtn(key) {
this.isActive = key;
},
chooseTime(key) {
this.activeTime = key;
},
initEcharts() {
var chartDom = this.$refs.myEcharts;
console.log(111, chartDom);
var myChart = echarts.init(chartDom);
var option;
option = {
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
},
},
color: ["#36A3D9", "#F29130"],
legend: {
right: 10,
itemHeight: 10,
itemWidth: 10,
},
grid: {
left: "3%",
right: "4%",
bottom: "3%",
containLabel: true,
},
xAxis: [
{
type: "category",
axisLine: {
show: false,
},
axisTick: {
show: false,
},
data: [
"广州",
"深圳",
"佛山",
"中山",
"惠州",
"东莞",
"阳江",
"韶关",
"河源",
"肇庆",
"珠海",
"江门",
"汕头",
"潮州",
"揭阳",
"湛江",
"茂名",
"清远",
"梅州",
],
},
],
yAxis: [
{
type: "value",
axisLine: {
show: false,
},
axisTick: {
show: false,
},
splitLine: {
//线
show: false, //
// lineStyle: {
// //线
// // color: "#0735a2", //线
// // width: 1, //线
// type: "dashed", //线
// },
},
},
],
series: [
{
name: "红灯",
type: "bar",
//
stack: "Ad",
barMaxWidth: "25%",
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(54, 163, 217, 1)" },
{ offset: 1, color: "rgba(54, 163, 217, 0.2)" },
]),
},
emphasis: {
focus: "series",
},
data: [
120, 132, 101, 134, 90, 230, 210, 120, 132, 101, 134, 90, 230,
210, 120, 132, 101, 134, 90,
],
},
{
name: "黄灯",
type: "bar",
stack: "Ad",
barMaxWidth: "25%",
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "rgba(242, 145, 48, 1)" },
{ offset: 1, color: "rgba(242, 145, 48, 0.2)" },
]),
},
emphasis: {
focus: "series",
},
data: [
220, 182, 191, 234, 290, 330, 310, 220, 182, 191, 234, 290, 330,
310, 220, 182, 191, 234, 290,
],
},
],
};
option && myChart.setOption(option);
},
},
};
</script>
<style lang="scss" scoped>
.page {
width: 1200px;
height: 488px;
// background: skyblue;
display: flex;
justify-content: space-between;
.page_left {
width: 808px;
height: 100%;
// border: 1px solid red;
display: flex;
flex-direction: column;
.left_head {
width: 792px;
height: 76px;
background: #f3feff;
padding: 16px 24px 16px 24px;
display: flex;
justify-content: space-between;
align-items: center;
.head_title {
height: 26px;
display: flex;
.iconSpan {
display: flex;
flex-direction: column;
justify-content: space-evenly;
margin-right: 8px;
.first {
width: 6px;
height: 6px;
background: #f86220;
}
.second {
width: 6px;
height: 6px;
background: #36b29e;
}
}
.text {
font-size: 18px;
line-height: 26px;
}
}
.head_btn {
font-size: 14px;
display: flex;
border: 1px solid #36b29e;
.btn_left {
padding: 5px 16px;
// border: 1px solid #d9d9d9;
border-right: 1px solid #d9d9d9;
cursor: pointer;
}
.btn_right {
padding: 5px 16px;
// border: 1px solid #d9d9d9;
cursor: pointer;
}
.activeBtn {
color: #36b29e;
}
}
.head_btn_al {
border-radius: 4px 0px 0px 4px;
}
.head_btn_ar {
border-radius: 0px 4px 4px 0px;
}
}
.left_content {
flex: 1;
.myEharts {
width: 100%;
height: 100%;
}
}
}
.page_right {
width: 384px;
height: 100%;
// border: 1px solid red;
background: #fff;
display: flex;
flex-direction: column;
.right_head {
height: 58px;
padding: 16px 16px;
background: #f3feff;
display: flex;
justify-content: space-between;
align-items: center;
.head_title {
height: 26px;
display: flex;
.iconSpan {
display: flex;
flex-direction: column;
justify-content: space-evenly;
margin-right: 8px;
.first {
width: 6px;
height: 6px;
background: #f86220;
}
.second {
width: 6px;
height: 6px;
background: #36b29e;
}
}
.text {
font-size: 18px;
line-height: 26px;
}
}
.head_btn {
display: flex;
font-size: 14px;
.btnYear,
.btnMonth,
.btnWeek {
padding: 5px 16px 5px 16px;
border: 1px solid #d9d9d9;
cursor: pointer;
box-sizing: border-box;
}
.btnYear {
border-radius: 4px 0px 0px 4px;
}
.btnMonth {
border-left: 0;
border-right: 0;
}
.btnWeek {
border-radius: 0px 4px 4px 0px;
}
.activeBtn {
border: 1px solid #36b29e;
color: #36b29e;
}
}
}
.right_content {
flex: 1;
padding: 24px;
display: flex;
flex-direction: column;
justify-content: space-between;
.wait {
height: 102px;
padding: 16px 24px;
border-radius: 4px;
background: linear-gradient(
180deg,
#cff3f6 0%,
rgba(207, 243, 246, 0.3) 100%
);
position: relative;
.wait_title {
font-size: 14px;
color: #262626;
margin-bottom: 5px;
}
.wait_no {
font-size: 40px;
color: #36b29e;
}
& > img {
position: absolute;
bottom: 0;
right: 5px;
}
}
.finishAndDelay {
display: flex;
justify-content: space-between;
height: 98px;
.finish {
width: 160px;
padding: 16px 24px;
border-radius: 4px;
background: linear-gradient(
180deg,
#c7f3e3 0%,
rgba(199, 243, 227, 0.3) 100%
);
position: relative;
.finish_title {
font-size: 14px;
color: #262626;
margin-bottom: 5px;
}
.finish_no {
font-size: 40px;
color: #72bf4c;
}
& > img {
position: absolute;
bottom: 0;
right: 5px;
}
}
.delay {
width: 160px;
padding: 16px 24px;
border-radius: 4px;
background: linear-gradient(
180deg,
#ffe4d2 0%,
rgba(255, 228, 210, 0.3) 100%
);
position: relative;
.delay_title {
font-size: 14px;
color: #262626;
margin-bottom: 5px;
}
.delay_no {
font-size: 40px;
color: #ff6400;
}
& > img {
position: absolute;
bottom: 0;
right: 5px;
}
}
}
.rate {
height: 154px;
display: flex;
justify-content: space-between;
.finishRate {
width: 160px;
padding: 16px 24px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
background: linear-gradient(
180deg,
#c7f3e3 0%,
rgba(199, 243, 227, 0.3) 100%
);
.finishRateTitle {
align-self: flex-start;
}
/deep/ svg > path:nth-child(2) {
stroke: url(#green);
}
/deep/ .el-progress__text {
font-size: 24px !important;
}
}
.delayRate {
width: 160px;
padding: 16px 24px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
background: linear-gradient(
180deg,
#ffe4d2 0%,
rgba(255, 228, 210, 0.3) 100%
);
.delayRateTitle {
align-self: flex-start;
}
/deep/ svg > path:nth-child(2) {
stroke: url(#orange);
}
/deep/ .el-progress__text {
font-size: 24px !important;
}
}
}
}
}
}
</style>

3
jwtech-admin-page/src/views/gateway/fundControlSituation.vue

@ -0,0 +1,3 @@
<template>
<div>资金控制情况</div>
</template>

3
jwtech-admin-page/src/views/gateway/index.vue

@ -0,0 +1,3 @@
<template>
<router-view />
</template>

3
jwtech-admin-page/src/views/gateway/projectDistributionADiagram.vue

@ -0,0 +1,3 @@
<template>
<div>一张图</div>
</template>

2
jwtech-admin-page/src/views/largeScreen/index copy.vue

@ -35,7 +35,7 @@ export default {
// top: 20px;
// left: 20px;
top: 72px;
left: 20px;
right: 20px;
width: 200px;
background: #101f48;
color: #fff;

4
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue

@ -24,7 +24,7 @@
>
<el-tab-pane
v-if="checkPermi(['market:qyjcqk:index'])"
label="企业基信息"
label="企业基信息"
name="basePage"
:lazy="true"
>
@ -59,7 +59,7 @@
</el-tab-pane>
<el-tab-pane
v-if="checkPermi(['market:scxwyxy:index'])"
label="市场行为与信用"
label="获奖情况"
name="behaviorAndCredit"
:disabled="!routeList[1].isEdit"
:lazy="true"

6
jwtech-admin-page/src/views/project/proposal/index.vue

@ -293,7 +293,7 @@
type="text"
icon="el-icon-view"
@click="viewInfo(scope.row)"
v-hasPermi="['system:projectinfo:view']"
v-hasPermi="['earlyStage:approval:view']"
>查看</el-button
>
<el-button
@ -301,7 +301,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:projectinfo:edit']"
v-hasPermi="['earlyStage:approval:edit']"
>修改</el-button
>
<el-button
@ -309,7 +309,7 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:projectinfo:remove']"
v-hasPermi="['earlyStage:approval:remove']"
>删除</el-button
>
</template>

Loading…
Cancel
Save