diff --git a/.env.development b/.env.development
index d2fd0f19..db2b5d18 100644
--- a/.env.development
+++ b/.env.development
@@ -11,9 +11,15 @@ VUE_APP_TITLE = '中建材光子科技有限公司'
#VUE_APP_WS_API = 'ws://localhost:8000'
# VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
#VUE_APP_API_BASEURL = http://10.99.5.79:20309/api
-VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+# VUE_APP_BASEURL = http://49.232.14.174:2226
# VUE_APP_API_BASEURL = http://127.0.0.1:2226/api
-VUE_APP_BASEURL = http://49.232.14.174:2226
+
+
+
+#光子
+VUE_APP_API_BASEURL = http://49.232.14.174:2250/api
+VUE_APP_BASEURL = http://49.232.14.174:2250
# 本地端口
diff --git a/.env.production b/.env.production
index deb57ef0..9fa96525 100644
--- a/.env.production
+++ b/.env.production
@@ -10,8 +10,12 @@ VUE_APP_TITLE = '中建材光子科技有限公司'
# 接口地址
# VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
# VUE_APP_BASEURL = http://222.222.144.147:6013
-VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
-VUE_APP_BASEURL = http://49.232.14.174:2226
+#光子
+VUE_APP_API_BASEURL = http://192.168.10.5:2250/api
+VUE_APP_BASEURL = http://192.168.10.5:2250
+#托克逊
+# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+# VUE_APP_BASEURL = http://49.232.14.174:2226
# VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
# VUE_APP_BASEURL = http://1.203.161.103:2800
\ No newline at end of file
diff --git a/src/api/model/system.js b/src/api/model/system.js
index 52c97681..6e10c6df 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -3,19 +3,25 @@ import http from "@/utils/request"
import data from './../../../src/utils/baseJson';
const baseInFo = data[data.current];
-console.log(data);
-// console.log(baseInFo);
-
export default {
config:{
base: {
url: `${config.API_URL}/system/base_config/`,
name: "账户信息",
req: async function(){
- return baseInFo
+ return await http.get(this.url);
}
},
},
+ // config:{
+ // base: {
+ // url: `${config.API_URL}/system/base_config/`,
+ // name: "账户信息",
+ // req: async function(){
+ // return baseInFo
+ // }
+ // },
+ // },
dept: {
list: {
url: `${config.API_URL}/system/dept/`,
diff --git a/src/config/route.js b/src/config/route.js
index 69d48774..038eeb39 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -11,7 +11,7 @@ const routes = [
"title": "工作台",
"icon": "el-icon-home-filled",
"type": "menu",
- "perms": ["home"]
+ "perms": ["photon"]
},
"children": [
//首页
@@ -2096,79 +2096,6 @@ const routes = [
}
]
},
- // //运维
- {
- "name": "ops",
- "path": "/ops",
- "meta": {
- "title": "运维",
- "icon": "el-icon-briefcase",
- "type": "menu",
- "perms": ["ops"]
- },
- "children": [
- {
- "name": "menu",
- "path": "/ops/menu",
- "meta": {
- "title": "菜单管理",
- "icon": "el-icon-fold",
- "perms": ["menu"]
- },
- "component": "ops/menu"
- },
- {
- "name": "log",
- "path": "/ops/log",
- "meta": {
- "title": "请求日志",
- "icon": "el-icon-document",
- "perms": ["log"]
- },
- "component": "ops/log_request"
- },
- {
- "name": "thirdLogs",
- "path": "/ops/thirdLogs",
- "meta": {
- "title": "第三方日志",
- "icon": "el-icon-document",
- "perms": ["third_log"]
- },
- "component": "ops/thirdLogs"
- },
- {
- "name": "fileLogs",
- "path": "/ops/fileLogs",
- "meta": {
- "title": "文件日志",
- "icon": "el-icon-document",
- "perms": ["file_log"]
- },
- "component": "ops/fileLogs"
- },
- {
- "name": "server",
- "path": "/ops/server",
- "meta": {
- "title": "服务器",
- "icon": "el-icon-document",
- "perms": ["ops"]
- },
- "component": "ops/server"
- },
- {
- "name": "setting",
- "path": "/ops/setting",
- "meta": {
- "title": "配置",
- "icon": "el-icon-document",
- "perms": ["sysconfig"]
- },
- "component": "ops/setting"
- },
- ]
- },
]
},
//曲阳驾驶舱
@@ -2261,7 +2188,7 @@ const routes = [
"meta": {
"title": "统计分析",
"icon": "el-icon-histogram",
- "perms": ["bigScreenP"],
+ "perms": ["statistic"],
},
"children": [
//生产统计
@@ -2465,7 +2392,7 @@ const routes = [
"title": "报表",
"icon": "el-icon-trend-charts",
"type": "menu",
-"perms": ["bi"]
+ "perms": ["bi"]
},
"children": [
{
@@ -2490,5 +2417,78 @@ const routes = [
}
]
},
+ // //运维
+ {
+ "name": "ops",
+ "path": "/ops",
+ "meta": {
+ "title": "运维",
+ "icon": "el-icon-briefcase",
+ "type": "menu",
+ "perms": ["ops"]
+ },
+ "children": [
+ {
+ "name": "menu",
+ "path": "/ops/menu",
+ "meta": {
+ "title": "菜单管理",
+ "icon": "el-icon-fold",
+ "perms": ["menu"]
+ },
+ "component": "ops/menu"
+ },
+ {
+ "name": "log",
+ "path": "/ops/log",
+ "meta": {
+ "title": "请求日志",
+ "icon": "el-icon-document",
+ "perms": ["log"]
+ },
+ "component": "ops/log_request"
+ },
+ {
+ "name": "thirdLogs",
+ "path": "/ops/thirdLogs",
+ "meta": {
+ "title": "第三方日志",
+ "icon": "el-icon-document",
+ "perms": ["third_log"]
+ },
+ "component": "ops/thirdLogs"
+ },
+ {
+ "name": "fileLogs",
+ "path": "/ops/fileLogs",
+ "meta": {
+ "title": "文件日志",
+ "icon": "el-icon-document",
+ "perms": ["file_log"]
+ },
+ "component": "ops/fileLogs"
+ },
+ {
+ "name": "server",
+ "path": "/ops/server",
+ "meta": {
+ "title": "服务器",
+ "icon": "el-icon-document",
+ "perms": ["ops"]
+ },
+ "component": "ops/server"
+ },
+ {
+ "name": "setting",
+ "path": "/ops/setting",
+ "meta": {
+ "title": "配置",
+ "icon": "el-icon-document",
+ "perms": ["sysconfig"]
+ },
+ "component": "ops/setting"
+ },
+ ]
+ },
]
export default routes;
diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue
index b39667be..cdc265d4 100644
--- a/src/layout/components/userbar.vue
+++ b/src/layout/components/userbar.vue
@@ -92,7 +92,7 @@ export default {
},
created() {
var userInfo = this.$TOOL.data.get("USER_INFO");
- this.userName = userInfo.name;
+ this.userName = userInfo.username;
this.userNameF = this.userName.substring(0, 1);
},
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 21d70352..58dff710 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -145,7 +145,6 @@ export default {
if (!validate) {
return false;
}
-
that.islogin = true;
var data = {
username: that.form.user,
@@ -166,12 +165,13 @@ export default {
var res1 = await that.$API.auth.info.get();
that.$TOOL.data.set("USER_INFO", res1);
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
- let homePath = this.$TOOL.data.get('BASE_INFO').base.name;
- if(homePath=='enm'){
+ let base_name_short = this.$TOOL.data.get('BASE_INFO').base.base_name_short;
+ console.log( this.$TOOL.data.get('BASE_INFO'))
+ if(base_name_short=='托克逊能管'){
this.$router.replace({
path: "/dashboard_enm",
});
- }else if(homePath=='photon'){
+ }else if(base_name_short=='光子科技'){
this.$router.replace({
path: "/dashboard_photon",
});
diff --git a/src/views/pm/utask_dept6.vue b/src/views/pm/utask_dept6.vue
index c45312ad..2b21f146 100644
--- a/src/views/pm/utask_dept6.vue
+++ b/src/views/pm/utask_dept6.vue
@@ -11,6 +11,18 @@
任务下达
+
+
+ 搜索
+