opt:1.更新LOGO国际化以及其它国际化内容。

public/config.js

@@ -1,9 +1,8 @@
 window.g = {
   dev: {
-    VUE_APP_BASE_API: 'http://192.168.101.38:8011'
+    VUE_APP_BASE_API: '/'
   },
   prod: {
-    VUE_APP_BASE_API: 'http://192.168.101.38:8011'
+    VUE_APP_BASE_API: '/frobot'
   }
-
 }

src/api/frobot/task/task.js

@@ -41,6 +41,14 @@ export function cancelTask(taskCode) {
   })
 }
 
+export function forceCancelTask(taskCode) {
+  return request({
+    url: '/managerTask/forceCancelTask?taskCode=' + taskCode,
+    method: 'post',
+    data: null
+  })
+}
+
 export function oneClickOperation(params) {
   return request({
     url: '/managerTask/oneClickOperation',
@@ -49,4 +57,4 @@ export function oneClickOperation(params) {
   })
 }
 
-export default { createTask, queryCurrentTaskInfo, queryTask, cancelTask, oneClickOperation }
+export default { createTask, queryCurrentTaskInfo, queryTask, cancelTask, oneClickOperation, forceCancelTask }

src/i18n/langs/task/zh.js

@@ -17,7 +17,7 @@ export default {
       'Routing_scheme': '路由方案',
       'agv_action_type': 'agv二次分配类型',
       'Priority': '优先级',
-      'Vehicle_number': '载具号',
+      'Vehicle_number': '车辆号',
       'Task_code': '任务号',
       'Task': '任务',
       'start_or_end': '起点或终点',

src/layout/components/Sidebar/Logo.vue

@@ -41,7 +41,7 @@ export default {
   },
   created() {
     this.getValueByCode(this.title_param).then(res => {
-      this.title = res.value
+      this.title = this.$i18n.locale === 'zh' ? res.value : res.en_value
     })
   }
 }
@@ -82,7 +82,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 10px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/utils/request.js

@@ -7,11 +7,14 @@ import Config from '@/settings'
 import Cookies from 'js-cookie'
 import i18n from '@/i18n'
 
-const baseURLStr = window.g.prod.VUE_APP_BASE_API
+const env = process.env.NODE_ENV === 'production' ? 'prod' : 'dev'
+const baseURLStr = (window.g && window.g[env] && window.g[env].hasOwnProperty('VUE_APP_BASE_API')) 
+  ? window.g[env].VUE_APP_BASE_API 
+  : '/frobot'
 
 // 创建axios实例
 const service = axios.create({
-  baseURL: process.env.NODE_ENV === 'production' ? baseURLStr : '/', // api 的 base_url
+  baseURL: baseURLStr, // api 的 base_url
   timeout: Config.timeout, // 请求超时时间
   withCredentials: true
 })

src/views/acs/task/index.vue

@@ -153,7 +153,7 @@
         <el-table-column prop="source" :label="$t('task.txt_box.Task_source')" width="120px" />
         <el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
         <el-table-column prop="update_time" :label="$t('task.select.update_time')" width="135px" />
-        <el-table-column v-permission="['admin','task:del']" fixed="right" :label="$t('task.select.Operation')" width="80px" align="center">
+        <el-table-column v-permission="['admin','task:del']" fixed="right" :label="$t('task.select.Operation')" width="160px" align="center">
           <template slot-scope="scope">
             <el-button
               v-if="scope.row.status !== '2' && scope.row.status !== '3'"
@@ -164,6 +164,15 @@
               {{ $t('task.select.Cancel') }}
             </el-button>
             <span v-else style="color: #909399;">-</span>
+            <el-button
+              v-if="scope.row.status !== '2' && scope.row.status !== '3'"
+              type="text"
+              size="mini"
+              @click="forced_cancel(scope.$index, scope.row)"
+            >
+              {{ $t('auto.common.Forced_cancellation') }}
+            </el-button>
+            <span v-else style="color: #909399;">-</span>
           </template>
         </el-table-column>
       </el-table>
@@ -188,6 +197,7 @@ import crudTask from '@/api/acs/task/task'
 import frobot_task from '@/api/frobot/task/task'
 import station from '@/api/frobot/map/station/station'
 import { getDicts } from '@/views/system/dict/dict'
+import {forceCancelTask} from "../../../api/frobot/task/task";
 
 export default {
   name: 'Task',
@@ -392,6 +402,14 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    forced_cancel(index, row) {
+      frobot_task.forceCancelTask(row.task_code).then(res => {
+        this.fetchData()
+        this.$message.success(this.$t('task.select.Cancel') + this.$t('auto.common.succeed'))
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    },
     reload() {
       this.fetchData()
     },

src/views/login.vue

@@ -99,7 +99,7 @@ export default {
   created() {
     this.setLang(localStorage.getItem('lang'))
     this.getValueByCode(this.title_param).then(res => {
-      this.title = res.value
+      this.title = this.$i18n.locale === 'zh' ? res.value : res.en_value
     })
     // 获取验证码
     this.getCode()