conflict

DAPlatform-front/src/assets/js/Download.js

-import baseURL from './env.js'
+import { baseURL } from './env.js'
 
 export function download (url, relationId) {
   url = baseURL + url + '/' + relationId

DAPlatform-front/src/assets/js/env.js

-export default {
-  baseURL: 'http://localhost:9100/api'
+var baseURL = 'http://47.92.1.107/api'
+
+export {
+  baseURL
 }

DAPlatform-front/src/assets/js/http.js

+import axios from 'axios'
+import { baseURL } from '@/assets/js/env.js'
+import { Message } from 'element-ui'
+
+axios.defaults.baseURL = baseURL
+axios.defaults.timeout = 8000
+
+// 添加响应拦截器
+axios.interceptors.response.use(function (response) {
+  let res = response.data
+  if (response.config.url === '/file/getFiles') {
+    res.id = response.config.params.pieceId
+  }
+  return res
+}, function (error) {
+  // 对响应错误做点什么
+  return Promise.reject(error)
+})
+// 添加请求拦截器，每次请求设置都请求cookie信息
+axios.interceptors.request.use(function (config) {
+  // 除了登录和注册请求，其余请求如果没有用户信息（即没登录），就跳转到登录页面
+  if (!window.vm.$store.state.userInfo &&
+      config.url !== '/user/signin' &&
+      config.url !== '/user/signup') {
+    Message({
+      type: 'warning',
+      message: '您未登录，请前往登录界面进行操作'
+    })
+    window.vm.$router.replace('/')
+  }
+  return config
+}, function (error) {
+  return Promise.reject(error)
+})
+
+export default axios

DAPlatform-front/src/components/Navigator.vue

@@ -33,7 +33,23 @@ export default {
     }
   },
   beforeMount () {
-    this.getTasks()
+    console.log('2')
+  },
+  mounted () {
+    var self = this
+    this.axios.get('/task/getTasks', {
+      params: {
+        pageSize: self.pageSize,
+        currentPage: self.currentPage,
+        ...self.condition
+      }
+    }).then(res => {
+      console.log(res)
+      self.tasks = res.data.tasks
+      self.pageNum = res.data.pageNum
+      self.pageChange()
+    })
+    console.log('1')
   },
   methods: {
     // 任务列表更新
@@ -50,6 +66,7 @@ export default {
           ...self.condition
         }
       }).then(res => {
+        console.log(res)
         self.tasks = res.data.tasks
         self.pageNum = res.data.pageNum
         self.pageChange()

DAPlatform-front/src/components/TaskHall.vue

@@ -5,8 +5,6 @@
         <div class="filter-item">
           任务名称：
           <el-input class="filter-input" prefix-icon="el-icon-search" v-model="keyword" placeholder="请输入查询条件"></el-input>
-        </div>
-        <div class="filter-item">
           <el-button class="filter-button" type="primary" @click="search()">查询</el-button>
         </div>
         <el-divider></el-divider>
@@ -26,13 +24,11 @@
       <div class="notice">
         <div class="notice-title">公告</div>
         <div class="notice-body">
-          <img src="@/assets/empty.png" alt="暂无公告">
-        </div>
-      </div>
-      <div class="notice">
-        <div class="notice-title">公告</div>
-        <div class="notice-body">
-          <img src="@/assets/empty.png" alt="暂无公告">
+          <h4>标注方法：</h4>
+          <p>1.在任务大厅选择想要标注的任务，进入任务详情界面，勾选想要标注的分片，跳转到我的任务界面，对勾选的任务分片进行标注。</p>
+          <p>2.文本标注：进入文本标注页面后，鼠标选中一段文本，自动弹出标注选项，选择对应的实体和属性即可完成标注。</p>
+          <p>3.图像图层标注：点击矩形标注、多边形标注或者地标标注，选择对应标注类型，之后选中图像或图层上的区域，对标注区域命名，最后保存标注结果即可标注成功。</p>
+          <!-- <img src="@/assets/empty.png" alt="暂无公告"> -->
         </div>
       </div>
     </div>
@@ -88,6 +84,7 @@ export default {
         margin-bottom: 15px;
         .filter-input{
           margin-left: 20px;
+          margin-right: 20px;;
           width: 300px;
         }
       }
@@ -106,10 +103,9 @@ export default {
       }
       .notice-body{
         background-color: white;
-        height: 200px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+        padding: 10px;
+        text-align: left;
+        font-size: 14px;
       }
     }
   }

DAPlatform-front/src/main.js

@@ -6,18 +6,14 @@ import router from './router'
 import store from './store'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
-import axios from 'axios'
+import axios from '@/assets/js/http.js'
 import VueAxios from 'vue-axios'
 import * as math from 'mathjs'
 // cnpm i default-passive-events -S
 import 'default-passive-events'
-import baseURL from '@/assets/js/env.js'
 
 Vue.prototype.$math = math
 
-axios.defaults.baseURL = baseURL
-axios.defaults.timeout = 8000
-
 Vue.prototype.baseURL = axios.defaults.baseURL // 图片标注接口使用
 
 Vue.use(VueAxios, axios)
@@ -38,30 +34,4 @@ var vm = new Vue({
   template: '<App/>'
 })
 
-// 添加响应拦截器
-axios.interceptors.response.use(function (response) {
-  let res = response.data
-  if (response.config.url === '/file/getFiles') {
-    res.id = response.config.params.pieceId
-  }
-  return res
-}, function (error) {
-  // 对响应错误做点什么
-  return Promise.reject(error)
-})
-// 添加请求拦截器，每次请求设置都请求cookie信息
-axios.interceptors.request.use(function (config) {
-  // 除了登录和注册请求，其余请求如果没有用户信息（即没登录），就跳转到登录页面
-  if (!vm.$store.state.userInfo &&
-    config.url !== '/user/signin' &&
-    config.url !== '/user/signup') {
-    ElementUI.Message({
-      type: 'warning',
-      message: '您未登录，请前往登录界面进行操作'
-    })
-    vm.$router.replace('/')
-  }
-  return config
-}, function (error) {
-  return Promise.reject(error)
-})
+window.vm = vm