菜单更改

.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
 
 
 # 本地端口

.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

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/`,

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;

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);
 
   },

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;
+          let base_name_short = this.$TOOL.data.get('BASE_INFO').base.base_name_short;
-          if(homePath=='enm'){
+          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",
               });

src/views/pm/utask_dept6.vue

@@ -11,6 +11,18 @@
                         <el-button type="primary" @click="utaskAssgin" v-loading="isLoading"
                             v-auth="'utask.assgin'">任务下达</el-button>
                     </div>
+                    <div class="'right-panel'">
+                        <el-date-picker
+                            v-model="dateValue"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                            value-format="YYYY-MM-DD"
+                            style="vertical-align: middle;margin-right:6px"
+                        />
+                        <el-button type="primary" @click="utaskSearch" v-loading="isLoading">搜索</el-button>
+                    </div>
                 </el-header>
                 <el-main class="nopadding">
                     <scTable ref="table" :apiObj="apiUtask" row-key="id" stripe :params="paramsUtask" @row-click="rowclick"
@@ -125,6 +137,11 @@ export default {
             dialog: {
                 save: false,
             },
+            query:{
+                start_date:'',
+                end_date:'',
+            },
+            dateValue:'',
             apiUtask: null,
             currentDept: { id: 0 },
             paramsUtask: {},
@@ -368,6 +385,11 @@ export default {
         handleSaveSuccess(data, mode) {
             this.$refs.table.refresh();
         },
+        utaskSearch(){
+            console.log(this.dateValue);
+            let start_date = this.dateValue[0];
+            let end_date = this.dateValue[1];
+        },
     }
 }
 </script>