Browse Source

将任务推荐和任务导入设置成配置项,修改登录注册的配置

郭超 4 years ago
parent
commit
bb9babda50
5 changed files with 21 additions and 11 deletions
  1. 0 0
      dev-online
  2. 2 0
      src/components/Mine.vue
  3. 6 6
      src/components/commons/Header2.0.vue
  4. 7 3
      src/components/task/Task.vue
  5. 6 2
      src/config/index.js

+ 0 - 0
dev-online


+ 2 - 0
src/components/Mine.vue

@@ -160,6 +160,7 @@ import Apis from '@/js/api.js'
 import {notify} from '@/constants/index'
 import {defaultValue, storageGet} from '@/js/index'
 import echarts from 'echarts'
+import {CONFIG} from "../../config";
 
 export default {
   name: 'Mine',
@@ -175,6 +176,7 @@ export default {
   },
   data() {
     return {
+      featureTaskImport:CONFIG.feature_task_import,
       statisticData: {},
       showImportTaskModal:false,
       loading: false,

+ 6 - 6
src/components/commons/Header2.0.vue

@@ -55,12 +55,12 @@
               </router-link>
             </li>
 
-            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
-            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">
-              <router-link v-if="isLogin" to="/statistics">
-                <span>机构统计</span>
-              </router-link>
-            </li>
+<!--            <span v-if="isLogin&&rolesPermissions.isSystemAdministrator">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>-->
+<!--            <li v-if="isLogin&&rolesPermissions.isSystemAdministrator">-->
+<!--              <router-link v-if="isLogin" to="/statistics">-->
+<!--                <span>机构统计</span>-->
+<!--              </router-link>-->
+<!--            </li>-->
 
             <span v-if="isLogin&&(rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionManager)">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;</span>
             <li v-if="isLogin&&(rolesPermissions.isSystemAdministrator || rolesPermissions.isRegionManager)">

+ 7 - 3
src/components/task/Task.vue

@@ -205,7 +205,7 @@
               <el-button v-if="taskOperationControl.update" type="primary" size="mini" @click="modifyForm()">修改任务
               </el-button>
 
-              <el-button v-if="taskOperationControl.taskRecommend" type="primary" size="mini" @click="recommendTask()">任务推荐
+              <el-button v-if="featureTaskRecommend && taskOperationControl.taskRecommend" type="primary" size="mini" @click="recommendTask()">任务推荐
               </el-button>
 
 
@@ -277,6 +277,7 @@ import ReportList from '@/components/report/ReportList'
 import TaskCloud from '@/components/task/TaskCloud'
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
+import {CONFIG} from "../../config";
 import {notify} from '@/constants/index'
 import {
   ensureEndTask,
@@ -305,6 +306,8 @@ export default {
   },
   data() {
     return {
+      featureTaskRecommend:CONFIG.feature_task_recommend,
+      taskRecommendUrl: CONFIG.task_recommend_url,
       currType: {},
       user: {},
       serviceName:'',
@@ -482,6 +485,8 @@ export default {
       }
     },
     init() {
+      console.log("this.featureTaskRecommend " + this.featureTaskRecommend);
+      console.log("this.taskRecommendUrl " + this.taskRecommendUrl);
       this.taskId = this.$route.params.taskId
       this.projectId = this.$route.params.projectId
       this.setUserInfo()
@@ -815,8 +820,7 @@ export default {
         "datetime": this.task.datetime
       };
       Http.post('/recommendationtest/query',task).then((res)=>{
-        console.log("recommend")
-        window.open('http://8.134.39.104:7477/userinformation.html');
+        window.open(this.taskRecommendUrl, "_blank");
       })
     },
 

+ 6 - 2
src/config/index.js

@@ -133,8 +133,12 @@ export let CONFIG = {};
 export const setConfig = (conf) => {
   CONFIG = conf;
 }
-export const login_url = 'http://user.mooctest.net:8081/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome'
-export const register_url = 'http://user.mooctest.net:8081/page/register'
+
+// export const login_url = 'http://user.mooctest.net:8081/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome'
+// export const register_url = 'http://user.mooctest.net:8081/page/register'
+
+export const login_url = '/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome'
+export const register_url = '/page/register'
 
 // 线上环境
 // export const login_url = 'http://user.cofortest.com:8081/page/login?redirect=http%3a%2f%2fwww.cofortest.com%2f%23%2fhome'