Skip to content

Administrator / project_progress

Go to a project
Commit 74c8300b by bingobo
Options

修改菜单逻辑

1 parent 94b54838
Expand all
Inline Side-by-side
Showing with 23 additions and 66 deletions
public/js/system.config.js
...@@ -6,7 +6,7 @@ const SystemConfig = { ...@@ -6,7 +6,7 @@ const SystemConfig = {
PUBLIC_PATH: '/api', PUBLIC_PATH: '/api',
// VUE_APP_BASE_URL: "http://25.66.210.41/tools", // VUE_APP_BASE_URL: "http://25.66.210.41/tools",
// VUE_APP_BASE_URL: "http://25.66.215.209/tools", // 南瑞新ip // VUE_APP_BASE_URL: "http://25.66.215.209/tools", // 南瑞新ip
VUE_APP_BASE_URL: "http://192.168.0.114:18088/tools", VUE_APP_BASE_URL: "http://192.168.0.106:18088/tools",
// VUE_APP_ZJ_IFRAME: "http://25.66.210.41/arch" // VUE_APP_ZJ_IFRAME: "http://25.66.210.41/arch"
// VUE_APP_ZJ_IFRAME: "http://25.66.215.209/arch" // 南瑞新ip // VUE_APP_ZJ_IFRAME: "http://25.66.215.209/arch" // 南瑞新ip
VUE_APP_ZJ_IFRAME: "http://localhost:30478/arch" VUE_APP_ZJ_IFRAME: "http://localhost:30478/arch"
......
src/utils/http.js
...@@ -124,6 +124,7 @@ export function get(url, params = {}) { ...@@ -124,6 +124,7 @@ export function get(url, params = {}) {
}) })
} }
export function post(url, data = {}) { export function post(url, data = {}) {
console.log('url', url);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
axios.post(url, data).then(response => { axios.post(url, data).then(response => {
if (response) { if (response) {
......
src/views/assessChecks/mianHome.vue
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
</template> </template>
<script> <script>
import axios from 'axios';
import { projectInfoSy, getIscInfo, evaluationMaterials } from "@/api/index"; import { projectInfoSy, getIscInfo, evaluationMaterials } from "@/api/index";
import { generateYearOptions } from "@/utils/cache"; import { generateYearOptions } from "@/utils/cache";
export default { export default {
...@@ -139,7 +140,10 @@ export default { ...@@ -139,7 +140,10 @@ export default {
// module: 0, // module: 0,
// }) // })
try { try {
let res = await getIscInfo(); let res = await axios.post(`http://25.66.215.209/gateway/getUser`, null, {
timeout: 5000,
});
// let res = await getIscInfo();
if (res.code === 200) { if (res.code === 200) {
sessionStorage.setItem("userid", res.content.id); sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name); sessionStorage.setItem("username", res.content.name);
...@@ -154,11 +158,11 @@ export default { ...@@ -154,11 +158,11 @@ export default {
id: "FA84A11538656BBCE0430100007F9766", id: "FA84A11538656BBCE0430100007F9766",
loginName: "lhb", loginName: "lhb",
name: "实物ID运维", name: "实物ID运维",
password: "403B8BB4B09", password: "",
mobile: "1111111111", mobile: "",
email: "lhb@In.sgcc,com.cn", email: "",
department: "数据运营中心", department: "数据运营中心",
departmentId: "8a20318c948334c201951824f892660e", departmentId: "",
funcList: [], funcList: [],
}, },
}; };
......
src/views/assessZC/materialAcquisition.vue
...@@ -571,7 +571,7 @@ export default { ...@@ -571,7 +571,7 @@ export default {
"projectCategory": null, "projectCategory": null,
"fullName": null, "fullName": null,
"projectName": "信息安全-2023年全场景网络安全态势感知平台优化-设计开发实施项目（态势感知能", "projectName": "信息安全-2023年全场景网络安全态势感知平台优化-设计开发实施项目（态势感知能",
"projectCode": "7422XT230023", "projectCode": "",
"constructionForm": "4", "constructionForm": "4",
"issueYear": "2024", "issueYear": "2024",
"projectType": "1", "projectType": "1",
......
src/views/layout/index.vue
<template> <template>
<div class="mian"> <div class="mian">
<div class="head-container"> <div v-if="false" class="head-container">
<div class="logo" style="z-index: 10"> <div class="logo" style="z-index: 10">
<div class="logo-inner"> <div class="logo-inner">
<img src="../../assets/logo.png" alt="" /> <img src="../../assets/logo.png" alt="" />
...@@ -234,6 +234,8 @@ ...@@ -234,6 +234,8 @@
<script> <script>
import MainLayout from "./mainLayout"; import MainLayout from "./mainLayout";
import axios from 'axios';
import { getIscInfo, evaluationMaterials } from "@/api/index"; import { getIscInfo, evaluationMaterials } from "@/api/index";
import { getMessageListApi, updateMessageApi, readWholwMsg } from "@/api/indexzc"; import { getMessageListApi, updateMessageApi, readWholwMsg } from "@/api/indexzc";
// import tableMixin from '@/mixins/table.mixin.js' // import tableMixin from '@/mixins/table.mixin.js'
...@@ -404,7 +406,10 @@ export default { ...@@ -404,7 +406,10 @@ export default {
// module: 0, // module: 0,
// }) // })
try { try {
let res = await getIscInfo(); let res = await axios.post(`http://25.66.215.209/gateway/getUser`, null, {
timeout: 5000,
});
// let res = await getIscInfo();
if (res.code === 200) { if (res.code === 200) {
sessionStorage.setItem("userid", res.content.id); sessionStorage.setItem("userid", res.content.id);
sessionStorage.setItem("username", res.content.name); sessionStorage.setItem("username", res.content.name);
...@@ -419,11 +424,11 @@ export default { ...@@ -419,11 +424,11 @@ export default {
id: "FA84A11538656BBCE0430100007F9766", id: "FA84A11538656BBCE0430100007F9766",
loginName: "lhb", loginName: "lhb",
name: "实物ID运维", name: "实物ID运维",
password: "403B8BB4B09", password: "",
mobile: "1111111111", mobile: "",
email: "lhb@In.sgcc,com.cn", email: "",
department: "数据运营中心", department: "数据运营中心",
departmentId: "8a20318c948334c201951824f892660e", departmentId: "",
funcList: [], funcList: [],
}, },
}; };
......
src/views/layout/leftBar copy.vue
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
<script> <script>
import { trendsRules } from "@/utils/leftBarRules"; import { trendsRules } from "@/utils/leftBarRules";
import { getIscInfo } from "@/api/index";
export default { export default {
data() { data() {
return { return {
...@@ -179,9 +178,6 @@ export default { ...@@ -179,9 +178,6 @@ export default {
} }
}, },
}, },
async created(){
await this.getIscInfoAndRoutes()
},
mounted() { mounted() {
// console.log( // console.log(
...@@ -204,55 +200,6 @@ export default { ...@@ -204,55 +200,6 @@ export default {
}, },
methods: { methods: {
async getIscInfoAndRoutes() {
// console.log('menuList1111', JSON.parse(JSON.stringify(this.menuList)));
const resMockData = {
"success": true,
"code":200,
"message":"OK",
"content": {
id:"FA84A11538656BBCE0430100007F9766",
loginName: "lhb",
name:"实物ID运维",
password:"403B8BB4B09",
mobile: "1111111111",
email: "lhb@In.sgcc,com.cn",
department: '数据运营中心',
departmentId: "8a20318c948334c201951824f892660e",
menuList: [
{
name: '立项统筹中心',
url: '/asdasdas',
type: '01',
level: '1',
ascription: 'lxtczx',
ps: null,
children: [
{
name: '首页',
url: '/asdasda',
type: '01',
level: '2',
ascription: 'lxsy',
ps: null,
children: [],
menu: true
}
],
menu: true
}
],
funcList:[],
}
}
// console.log(11111, resMockData);
// res = await getIscInfo();
const res = resMockData
if (res.code === 200) {
// console.log(123123, res.content);
}
},
handleOpen(e, a) { handleOpen(e, a) {
// console.log("打开", e); // console.log("打开", e);
this.keyIndex = e.charAt(0); this.keyIndex = e.charAt(0);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!