suojin
/
smartpark-front
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页改版接口现场联调

Browse Source
dev
张群 3 years ago
parent b76e9f0576
commit f151f1b080
6 changed files with 1922 additions and 1879 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2747
      src/api/source/total.js
  2. 2
      src/router/axios.js
  3. 2
      src/router/views/index.js
  4. 12
      src/util/bfHelper.js
  5. 118
      src/views/garden/generalizePatternNew.vue
  6. 4
      vue.config.js

2747
src/api/source/total.js
View File

File diff suppressed because it is too large Load Diff

2
src/router/axios.js
Unescape View File

@ -17,7 +17,7 @@ import NProgress from 'nprogress';
import 'nprogress/nprogress.css'; import 'nprogress/nprogress.css';
//默认超时时间 //默认超时时间
axios.defaults.timeout = 10000; axios.defaults.timeout = 60*1000;
//返回其他状态码 //返回其他状态码
axios.defaults.validateStatus = function (status) { axios.defaults.validateStatus = function (status) {
return status >= 200 && status <= 500; return status >= 200 && status <= 500;

2
src/router/views/index.js
Unescape View File

@ -3,7 +3,7 @@ import Layout from '@/page/index/'
export default [{ export default [{
path: '/garden', path: '/garden',
component: Layout, component: Layout,
redirect: '/garden/home', redirect: '/garden/index',
children: [{ children: [{
path: 'index', path: 'index',
name: '园区监控', name: '园区监控',

12
src/util/bfHelper.js
Unescape View File

@ -2862,12 +2862,12 @@ const loadModel = (i) => {
// BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080"; // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local; BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk"; BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' : // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
'http://47.103.199.45:8000/face/tt/viewToken.json'; // 'http://47.103.199.45:8000/face/tt/viewToken.json';
// BimfaceLoaderConfig.path = BimfaceLoaderConfig.path =
// i == 1 i == 1
// ? "http://10.90.100.203:8080/ywq/viewToken.json" ? "http://10.90.100.203:8080/ywq/viewToken.json"
// : "http://10.90.100.203:8080/tt/viewToken.json"; : "http://10.90.100.203:8080/tt/viewToken.json";
BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded); BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded);
}; };

118
src/views/garden/generalizePatternNew.vue
Unescape View File

@ -259,25 +259,55 @@
<div class="left_box" style="margin:0;height:1.68rem;"> <div class="left_box" style="margin:0;height:1.68rem;">
<div id="radar1" style="width:100%;height: 100%;"></div> <div id="radar1" style="width:100%;height: 100%;"></div>
</div> </div>
<!-- 当日报修情况 --> <!-- 车辆资源 -->
<div class="right"> <div class="right">
<div class="right_title flex-center" style="margin-top:0.13rem;"><i></i>车辆资源</div> <div class="right_title flex-center" style="margin-top:0.13rem;"><i></i>车辆资源</div>
<div class="car_box"> <div class="car_box">
<div class="flex-center-around"> <div class="flex-center-around">
<div>胶<br />州</div> <div>胶<br />州</div>
<div :key="('carinfo' + i)" v-for="(value, key, i) in cardInfo['胶州']"> <!-- <div :key="('carinfo' + i)" v-for="(value, key, i) in carInfo['胶州']">
<div :class="(i == 0 ? 'blue' : i == 1 ? 'green' : 'yellow')"><span class="big_txt">{{ value }}</span>辆 <div :class="(i == 0 ? 'blue' : i == 1 ? 'green' : 'yellow')"><span class="big_txt">{{ value }}</span>辆
</div> </div>
<div>{{ key }}</div> <div>{{ key }}</div>
</div> -->
<div>
<div class="blue"><span class="big_txt">{{ carInfo.JZ ? carInfo.JZ.seven : 0 }}</span>辆
</div>
<div>7座及以下</div>
</div>
<div>
<div class="green"><span class="big_txt">{{ carInfo.JZ ? carInfo.JZ.seventeen : 0 }}</span>辆
</div>
<div>17-20座</div>
</div>
<div >
<div class="yellow"><span class="big_txt">{{ carInfo.JZ ? carInfo.JZ.fiftyTwo : 0 }}</span>辆
</div>
<div>52座</div>
</div> </div>
</div> </div>
<div style="height:1px;background: #2A3C5F;margin:0.08rem;"></div> <div style="height:1px;background: #2A3C5F;margin:0.08rem;"></div>
<div class="flex-center-around"> <div class="flex-center-around">
<div>流<br />亭</div> <div>流<br />亭</div>
<div :key="('carinfo_lt' + i)" v-for="(value, key, i) in cardInfo['流亭']"> <!-- <div :key="('carinfo_lt' + i)" v-for="(value, key, i) in carInfo['流亭']">
<div :class="(i == 0 ? 'blue' : i == 1 ? 'green' : 'yellow')"><span class="big_txt">{{ value }}</span>辆 <div :class="(i == 0 ? 'blue' : i == 1 ? 'green' : 'yellow')"><span class="big_txt">{{ value }}</span>辆
</div> </div>
<div>{{ key }}</div> <div>{{ key }}</div>
</div> -->
<div>
<div class="blue"><span class="big_txt">{{ carInfo.LT ? carInfo.LT.seven : 0 }}</span>辆
</div>
<div>7座及以下</div>
</div>
<div>
<div class="green"><span class="big_txt">0</span>辆
</div>
<div>17-20座</div>
</div>
<div >
<div class="yellow"><span class="big_txt">0</span>辆
</div>
<div>52座</div>
</div> </div>
</div> </div>
</div> </div>
@ -367,7 +397,7 @@ export default {
prePlaneInfo: {},//前一天 prePlaneInfo: {},//前一天
planeInfo: {},//航班 planeInfo: {},//航班
gardenAndApprove: {},//访客 gardenAndApprove: {},//访客
cardInfo: {},//车辆资源 carInfo: {},//车辆资源
ywDevice: { ywDevice: {
电: { 电: {
code: "0100", code: "0100",
@ -410,15 +440,15 @@ export default {
icon: require("../../../public/img/monitoring/nav_11-1.png"), icon: require("../../../public/img/monitoring/nav_11-1.png"),
}, },
}, //业务模型设备类型 }, //业务模型设备类型
isLeaveInfo: {},//在青、外地 isLeaveInfo: 0,//在青、外地
allJzAdminInfo: {},//业务区及塔台总人数 - 业务区（封闭运行） allJzAdminInfo: 0,//业务区及塔台总人数 - 业务区（封闭运行）
allJzInfo: {},//获取胶州机关行政人员总人数 allJzInfo: 0,//获取胶州机关行政人员总人数
allBqInfo: {},//备勤、居家总人数 allBqInfo: {},//备勤、居家总人数
allLtInfo: {},//流亭总人数 allLtInfo: 0,//流亭总人数
allLtTzInfo: {},//流亭台站总人数 allLtTzInfo: {},//流亭台站总人数
codeInfo: {},//集中隔离 codeInfo: {},//集中隔离
leaveInfo: {},//休假、外出 leaveInfo: {},//休假、外出
allJJInfo: {},//居家总人数 allJJInfo: 0,//居家总人数
setInterval: null, setInterval: null,
}; };
}, },
@ -441,71 +471,67 @@ export default {
}); });
//在青、外地总人数 //在青、外地总人数
getIsLeaveByDate(this.currentDate).then((res) => { getIsLeaveByDate(this.currentDate).then((res) => {
this.isLeaveInfo = res.result; this.isLeaveInfo = res.data.result;
}) })
//居家总人数 //居家总人数
getAllJJByDate(this.currentDate).then((res) => { getAllJJByDate(this.currentDate).then((res) => {
this.allJJInfo = res.result; this.allJJInfo = res.data.result;
}) })
//休假外出 //休假外出
getLeaveByDate(this.currentDate).then((res) => { getLeaveByDate(this.currentDate).then((res) => {
this.leaveInfo = res.result; this.leaveInfo = res.data.result;
}) })
//业务区及塔台总人数业务区（封闭运行） //业务区及塔台总人数业务区（封闭运行）
getJZAdminByDate(this.currentDate).then((res) => { getJZAdminByDate(this.currentDate).then((res) => {
this.allJzAdminInfo = res.result; this.allJzAdminInfo = res.data.result;
}) })
//获取胶州机关行政人员总人数 //获取胶州机关行政人员总人数
getAllJZByDate(this.currentDate).then((res) => { getAllJZByDate(this.currentDate).then((res) => {
this.allJzInfo = res.result; this.allJzInfo = res.data.result;
}) })
//备勤、居家总人数 //备勤、居家总人数
getAllBQByDate(this.currentDate).then((res) => { getAllBQByDate(this.currentDate).then((res) => {
this.allBqInfo = res.result; this.allBqInfo = res.data.result;
}) })
//流亭总人数 //流亭总人数
getAllLTByDate(this.currentDate).then((res) => { getAllLTByDate(this.currentDate).then((res) => {
this.allLtInfo = res.result; this.allLtInfo = res.data.result;
}) })
//流亭台站总人数 //流亭台站总人数
getAllLTTZByDate(this.currentDate).then((res) => { getAllLTTZByDate(this.currentDate).then((res) => {
this.allLtTzInfo = res.result; this.allLtTzInfo = res.data.result;
}) })
//集中隔离 //集中隔离
getCodeByDate(this.currentDate).then((res) => { getCodeByDate(this.currentDate).then((res) => {
this.codeInfo = res.result; this.codeInfo = res.data.result;
}) })
//航班 - 前一天和今天 //航班 - 前一天和今天
let dd = new Date(this.currentDate); let dd = new Date(this.currentDate);
dd.setDate(dd.getDate() - 1); dd.setDate(dd.getDate() - 1);
getPlaneInfo(dateFormat(new Date(dd), 'yyyy-MM-dd')).then((res) => { getPlaneInfo(dateFormat(new Date(dd), 'yyyy-MM-dd')).then((res) => {
res.result.placeNum = 170; res.data.result.placeNum = 170;
res.result.areaNum = 600; res.data.result.areaNum = 600;
this.prePlaneInfo = res.result; this.prePlaneInfo = res.data.result;
}) })
getPlaneInfo(this.currentDate).then((res) => { getPlaneInfo(this.currentDate).then((res) => {
this.planeInfo = res.result; this.planeInfo = res.data.result;
}) })
//访客 //访客
getGardenAndApprove(this.currentDate).then((res) => { getGardenAndApprove(this.currentDate).then((res) => {
this.gardenAndApprove = res.result; this.gardenAndApprove = res.data.result;
}) })
this.getGxzy();//共享资源 this.getGxzy();//共享资源
//车辆资源 //车辆资源
getCarInfo(this.currentDate).then((res) => { getCarInfo(this.currentDate).then((res) => {
this.cardInfo = res.result; this.carInfo = res.data.result;
})
//今日就餐
getGardenEat(this.currentDate).then((res) => {
}) })
//防疫要求 //防疫要求
getReportByDate(this.currentDate).then((res) => { getReportByDate(this.currentDate).then((res) => {
this.reportFangyi = res.result; this.reportFangyi = res.data.result;
}) })
//节假日判断 //节假日判断
isHolidays(this.currentDate).then((res) => { isHolidays(this.currentDate).then((res) => {
this.isHolidays = res.result; this.isHolidays = res.data.result;
}) })
//设别运行统计 //设别运行统计
this.getDeviceRunningAnalyze(); this.getDeviceRunningAnalyze();
@ -526,7 +552,7 @@ export default {
getGxzy() { getGxzy() {
//共享资源 //共享资源
getShare(this.currentDate).then((res) => { getShare(this.currentDate).then((res) => {
let objData = res.result; let objData = res.data.result;
var myChart = this.$echarts.init(document.getElementById("radar1")); var myChart = this.$echarts.init(document.getElementById("radar1"));
myChart.setOption({ myChart.setOption({
color: ['#2BF7AC', '#07A6FF'], color: ['#2BF7AC', '#07A6FF'],
@ -677,7 +703,7 @@ export default {
//园区就餐 //园区就餐
getJiuCan() { getJiuCan() {
getGardenEat(this.currentDate).then((res) => { getGardenEat(this.currentDate).then((res) => {
let objData = res.result; let objData = res.data.result;
var myChart = this.$echarts.init(document.getElementById("rightBar3")); var myChart = this.$echarts.init(document.getElementById("rightBar3"));
myChart.setOption({ myChart.setOption({
tooltip: { tooltip: {
@ -817,7 +843,7 @@ export default {
//报修 //报修
getBx() { getBx() {
getRepair(this.currentDate).then((res) => { getRepair(this.currentDate).then((res) => {
let objData = res.result; let objData = res.data.result;
var myChart = this.$echarts.init(document.getElementById("rightBar1")); var myChart = this.$echarts.init(document.getElementById("rightBar1"));
myChart.setOption({ myChart.setOption({
color: ['#EB6877', '#4A92FF', '#48CB96'], color: ['#EB6877', '#4A92FF', '#48CB96'],
@ -911,17 +937,17 @@ export default {
}, },
data: [ data: [
{ {
name: '上报', value: '61', itemStyle: { name: '上报', value: objData.escalation, itemStyle: {
color: '#4A92FF' color: '#4A92FF'
} }
}, },
{ {
name: '完成', value: '53', itemStyle: { name: '完成', value: objData.complete, itemStyle: {
color: '#48CB96' color: '#48CB96'
} }
}, },
{ {
name: '遗留', value: '15', itemStyle: { name: '遗留', value: objData.legacy, itemStyle: {
color: '#EB6877' color: '#EB6877'
} }
}, },
@ -937,8 +963,8 @@ export default {
var res2 = await getTowerPerson(this.currentDate); var res2 = await getTowerPerson(this.currentDate);
var res3 = await getRunAdminPersonByJ(this.currentDate); var res3 = await getRunAdminPersonByJ(this.currentDate);
var res4 = await getSafePersonByJ(this.currentDate); var res4 = await getSafePersonByJ(this.currentDate);
let dataList = res1.result.concat(res2.result).concat(res3.result).concat(res4.result); let dataList = res1.data.result.concat(res2.data.result).concat(res3.data.result).concat(res4.data.result);
let size = res1.result.concat(res2.result).concat(res3.result).length; let size = res1.data.result.concat(res2.data.result).concat(res3.data.result).length;
let runData = []; let runData = [];
let safeData = []; let safeData = [];
let xCategory = []; let xCategory = [];
@ -953,7 +979,7 @@ export default {
safeData.push({ name: item.deptName, value: item.parkUserNum }); safeData.push({ name: item.deptName, value: item.parkUserNum });
} }
}) })
console.log(runData, safeData) // console.log(runData, safeData)
var myChart = this.$echarts.init(document.getElementById("bar1")); var myChart = this.$echarts.init(document.getElementById("bar1"));
myChart.setOption({ myChart.setOption({
color: ['#07A6FF', '#2BF7AC'], color: ['#07A6FF', '#2BF7AC'],
@ -1059,15 +1085,15 @@ export default {
var res2 = await getDormitoryPersonByL(this.currentDate); var res2 = await getDormitoryPersonByL(this.currentDate);
var res3 = await getTowerPerson(this.currentDate); var res3 = await getTowerPerson(this.currentDate);
let dataList = res1.result.concat(res2.result).concat(res3.result); let dataList = res1.data.result.concat(res2.data.result).concat(res3.data.result);
let size = res1.result.concat(res2.result).length; let size = res1.data.result.concat(res2.data.result).length;
let ltData = []; let ltData = [];
let bqData = []; let bqData = [];
let tzData = []; let tzData = [];
let xCategory = []; let xCategory = [];
dataList.map((item, index) => { dataList.map((item, index) => {
xCategory.push(item.deptName); xCategory.push(item.deptName);
if (index < res1.result.length) { if (index < res1.data.result.length) {
ltData.push({ name: item.deptName, value: item.allUserNum }); ltData.push({ name: item.deptName, value: item.allUserNum });
bqData.push({ name: item.deptName, value: 0 }); bqData.push({ name: item.deptName, value: 0 });
tzData.push({ name: item.deptName, value: 0 }); tzData.push({ name: item.deptName, value: 0 });
@ -1198,7 +1224,7 @@ export default {
let totalData = []; let totalData = [];
let sjData = []; let sjData = [];
let xCategory = []; let xCategory = [];
res1.result.map((item, index) => { res1.data.result.map((item, index) => {
xCategory.push(item.postName); xCategory.push(item.postName);
totalData.push({ name: item.postName, value: item.totalUserNum }); totalData.push({ name: item.postName, value: item.totalUserNum });
sjData.push({ name: item.postName, value: item.allUserNum }); sjData.push({ name: item.postName, value: item.allUserNum });
@ -1543,12 +1569,12 @@ export default {
getDorInfo() { getDorInfo() {
getDorInfo(this.currentDate).then((res) => { getDorInfo(this.currentDate).then((res) => {
var myChart = this.$echarts.init(document.getElementById("dorInfoPie")); var myChart = this.$echarts.init(document.getElementById("dorInfoPie"));
let keys = Object.keys(res.result); let keys = Object.keys(res.data.result);
let series = []; let series = [];
keys.map((item, index) => { keys.map((item, index) => {
let dataList = []; let dataList = [];
Object.keys(res.result[item]).map((key, val) => { Object.keys(res.data.result[item]).map((key, val) => {
dataList.push({ name: key, value: res.result[item][key] }); dataList.push({ name: key, value: res.data.result[item][key] });
}) })
series.push( series.push(
{ {

4
vue.config.js
Unescape View File

@ -38,8 +38,8 @@ module.exports = {
// target: 'http://180.76.231.175:8000', // target: 'http://180.76.231.175:8000',
// target: 'http://192.168.0.105:80', // target: 'http://192.168.0.105:80',
// target: "http://192.168.43.35", // target: "http://192.168.43.35",
target: 'http://192.168.1.106', // target: 'http://192.168.1.106',
// target: "http://10.90.100.204", target: "http://10.90.100.204",
// target: "http://rsvz4t.natappfree.cc", // target: "http://rsvz4t.natappfree.cc",
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目
//target: 'https://saber.bladex.vip/api', //target: 'https://saber.bladex.vip/api',

Write Preview
Loading…
Cancel
Save