Skip to content

C
cxsfjx_project_echarts
提交 828fc014 authored 作者: 苏帅's avatar 苏帅
浏览文件
操作

fix(创新示范分保大屏)请求接口逻辑修改

上级 77e5eaa7
显示空白字符变更
内嵌 并排
正在显示 包含 55 行增加 和 33 行删除
index.html
浏览文件 @ 828fc014
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>创新示范平台</title> <title>创新示范平台</title>
<script src="./public/config.js"></script> <script src="./public/config.js"></script>
</head> <script src="./config.js"></script>
<body> </head>
<body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>
\ No newline at end of file
public/config.js
浏览文件 @ 828fc014
window.baseURL = { window.baseURL = {
prodUrl: "/api", prodUrl: "/api",
devUrl: "http://192.168.102.153:9095", devUrl: "http://192.168.100.220:9085",
qyxypj: "http://192.168.102.153:9098", //获取token接口 qyxypj: "http://192.168.100.220:9098", //获取token接口
// devUrl: "http://192.168.102.183:9095", // devUrl: "http://192.168.102.183:9095",
// devUrl: "http://192.168.102.220:9095", // devUrl: "http://192.168.102.220:9095",
xypjUrl: "http://222.75.116.235:9020/#/", //信用评价线上地址 // xypjUrl: "http://222.75.116.235:9020", //信用评价线上地址
// xypjUrl: "http://192.168.100.220:99/#/", xypjUrl: "http://192.168.100.220:99",
// xypjUrl: "http://192.168.101.243:81/#/", // xypjUrl: "http://192.168.101.243:81",
api: '' api: ''
} }
\ No newline at end of file
src/layout/head.vue
浏览文件 @ 828fc014
...@@ -160,17 +160,21 @@ export default defineComponent({ ...@@ -160,17 +160,21 @@ export default defineComponent({
], ],
curYearIndex: 5, curYearIndex: 5,
token: '', token: '',
username:'',
password:''
}; };
}, },
created() { created() {
// 获取token // 获取token
this.getXypjToken()
const url = window.location.href; const url = window.location.href;
const str = url.split('?token=')[1] || ''; const str = url.split('?token=')[1] || '';
const token = str.split(this.$route.href)[0]; const token = str.split('&name=')[0];
const nameStr = str.split('&name=')[1].split('&')[0]
const passStr = str.split('&pass=')[1].split('#')[0]
this.username = decodeURI(nameStr)
this.password = passStr
this.token = token; this.token = token;
sessionStorage.setItem("cxsf_echarts_token",token) sessionStorage.setItem("cxsf_echarts_token",token)
console.log(this.years, 'years');
this.years.map((item, index) => { this.years.map((item, index) => {
if (index == this.curYearIndex) { if (index == this.curYearIndex) {
this.$store.commit("SET_CUR_DATA_TYPE", item.value); this.$store.commit("SET_CUR_DATA_TYPE", item.value);
...@@ -178,6 +182,7 @@ export default defineComponent({ ...@@ -178,6 +182,7 @@ export default defineComponent({
this.$store.commit("SET_CUR_DATA", { year: item.year, quarter: item.quarter }); this.$store.commit("SET_CUR_DATA", { year: item.year, quarter: item.quarter });
} }
}) })
this.getXypjToken()
}, },
computed: { computed: {
...mapState({ ...mapState({
...@@ -225,17 +230,21 @@ export default defineComponent({ ...@@ -225,17 +230,21 @@ export default defineComponent({
const xypjUrl = window.baseURL.xypjUrl const xypjUrl = window.baseURL.xypjUrl
// const xypjUrl = "http://192.168.101.243:81/#/" // const xypjUrl = "http://192.168.101.243:81/#/"
const token = localStorage.getItem("xypjToken") const token = localStorage.getItem("xypjToken")
const qyxypj = xypjUrl + 'sso?token=' + token +'&route=bigData' const qyxypj = xypjUrl + '/#/sso?token=' + token +'&route=bigData'
if (qyxypj) { if (qyxypj) {
// window.location.href = qyxypj; window.location.href = qyxypj;
window.open(qyxypj, "_blank"); // window.open(qyxypj, "_blank");
} }
}, },
getXypjToken(){ getXypjToken(){
// const loginForm = this.loginForm; const loginForm = {
username:this.username,
password:this.password,
}
axios({ axios({
url:window.baseURL.qyxypj + "/login/external", url:window.baseURL.qyxypj + "/login/external",
method:"POST", method:"POST",
data:loginForm,
headers: { 'Authorization': 'Bearer ' + this.token } headers: { 'Authorization': 'Bearer ' + this.token }
}).then(res => { }).then(res => {
const { token } = res.data; const { token } = res.data;
......
src/views/dataCenter/map/index.vue
浏览文件 @ 828fc014
...@@ -3,32 +3,32 @@ ...@@ -3,32 +3,32 @@
<el-col class="map-left" :span="8"> <el-col class="map-left" :span="8">
<div class="performance-com card-item"> <div class="performance-com card-item">
<div v-for="item in tableData" :key="item.id"> <div v-for="item in tableData" :key="item.id">
<div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sort == 1 && item.isView == '1')"> <div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sortIndex == 1 && item.isView == '1')">
<Performance /> <Performance />
</div> </div>
<div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sort == 1 && item.isView == '1')"> <div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sortIndex == 1 && item.isView == '1')">
<RankList /> <RankList />
</div> </div>
<div v-if="(item.dictLabel == '红榜' && item.sort == 1 && item.isView == '1')"> <div v-if="(item.dictLabel == '红榜' && item.sortIndex == 1 && item.isView == '1')">
<InvestmentProgress /> <InvestmentProgress />
</div> </div>
<div v-if="(item.dictLabel == '指标预警' && item.sort == 1 && item.isView == '1')"> <div v-if="(item.dictLabel == '指标预警' && item.sortIndex == 1 && item.isView == '1')">
<IndicatorWarning /> <IndicatorWarning />
</div> </div>
</div> </div>
</div> </div>
<div class="performance-com card-item"> <div class="performance-com card-item">
<div v-for="item in tableData" :key="item.id"> <div v-for="item in tableData" :key="item.id">
<div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sort == 3 && item.isView == '1')"> <div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sortIndex == 3 && item.isView == '1')">
<Performance /> <Performance />
</div> </div>
<div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sort == 3 && item.isView == '1')"> <div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sortIndex == 3 && item.isView == '1')">
<RankList /> <RankList />
</div> </div>
<div v-if="(item.dictLabel == '红榜' && item.sort == 3 && item.isView == '1')"> <div v-if="(item.dictLabel == '红榜' && item.sortIndex == 3 && item.isView == '1')">
<InvestmentProgress /> <InvestmentProgress />
</div> </div>
<div v-if="(item.dictLabel == '指标预警' && item.sort == 3 && item.isView == '1')"> <div v-if="(item.dictLabel == '指标预警' && item.sortIndex == 3 && item.isView == '1')">
<IndicatorWarning /> <IndicatorWarning />
</div> </div>
</div> </div>
...@@ -54,16 +54,16 @@ ...@@ -54,16 +54,16 @@
<div class="map-right"> <div class="map-right">
<div class="card-item rank-list"> <div class="card-item rank-list">
<div v-for="item in tableData" :key="item.id"> <div v-for="item in tableData" :key="item.id">
<div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sort == 2 && item.isView == '1')"> <div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sortIndex == 2 && item.isView == '1')">
<Performance /> <Performance />
</div> </div>
<div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sort == 2 && item.isView == '1')"> <div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sortIndex == 2 && item.isView == '1')">
<RankList /> <RankList />
</div> </div>
<div v-if="(item.dictLabel == '红榜' && item.sort == 2 && item.isView == '1')"> <div v-if="(item.dictLabel == '红榜' && item.sortIndex == 2 && item.isView == '1')">
<InvestmentProgress /> <InvestmentProgress />
</div> </div>
<div v-if="(item.dictLabel == '指标预警' && item.sort == 2 && item.isView == '1')"> <div v-if="(item.dictLabel == '指标预警' && item.sortIndex == 2 && item.isView == '1')">
<IndicatorWarning /> <IndicatorWarning />
</div> </div>
</div> </div>
...@@ -71,16 +71,16 @@ ...@@ -71,16 +71,16 @@
</div> </div>
<div class="card-item incom-graphic"> <div class="card-item incom-graphic">
<div v-for="item in tableData" :key="item.id"> <div v-for="item in tableData" :key="item.id">
<div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sort == 4 && item.isView == '1')"> <div v-if="(item.dictLabel == '全省军民融合创新示范绩效评价情况' && item.sortIndex == 4 && item.isView == '1')">
<Performance /> <Performance />
</div> </div>
<div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sort == 4 && item.isView == '1')"> <div v-if="(item.dictLabel == '创新示范区县(市、区）排名' && item.sortIndex == 4 && item.isView == '1')">
<RankList /> <RankList />
</div> </div>
<div v-if="(item.dictLabel == '红榜' && item.sort == 4 && item.isView == '1')"> <div v-if="(item.dictLabel == '红榜' && item.sortIndex == 4 && item.isView == '1')">
<InvestmentProgress /> <InvestmentProgress />
</div> </div>
<div v-if="(item.dictLabel == '指标预警' && item.sort == 4 && item.isView == '1')"> <div v-if="(item.dictLabel == '指标预警' && item.sortIndex == 4 && item.isView == '1')">
<IndicatorWarning /> <IndicatorWarning />
</div> </div>
</div> </div>
...@@ -187,7 +187,14 @@ export default defineComponent({ ...@@ -187,7 +187,14 @@ export default defineComponent({
method:"GET", method:"GET",
headers: { 'Authorization': 'Bearer ' + sessionStorage.getItem("cxsf_echarts_token") } headers: { 'Authorization': 'Bearer ' + sessionStorage.getItem("cxsf_echarts_token") }
}).then(res => { }).then(res => {
this.tableData = res.data.data // this.tableData = res.data.data
let data = res.data.data.sort(function(a,b){
return a.sort-b.sort
})
this.tableData = data.map((item,index) => {
item.sortIndex = index+1
return item
})
}) })
}, },
// getModule(label){ // getModule(label){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论