no message
							parent
							
								
									c8eef05273
								
							
						
					
					
						commit
						fe87793aff
					
				| 
						 | 
					@ -2,6 +2,6 @@ ENV = 'production'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
 | 
					# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
 | 
				
			||||||
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
 | 
					# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
 | 
				
			||||||
VUE_APP_BASE_API  = 'http://115.159.67.99:8000'
 | 
					VUE_APP_BASE_API  = 'http://192.168.100.102:8000'
 | 
				
			||||||
# 如果接口是 http 形式, wss 需要改为 ws
 | 
					# 如果接口是 http 形式, wss 需要改为 ws
 | 
				
			||||||
VUE_APP_WS_API = 'ws://115.159.67.99:8000'
 | 
					VUE_APP_WS_API = 'ws://192.168.100.102:8000'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,7 +47,7 @@
 | 
				
			||||||
          slot='right'
 | 
					          slot='right'
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          action="/api/point/import_point"
 | 
					          :action="baseApi+'/api/point/import_point'"
 | 
				
			||||||
          :file-list="fileList"
 | 
					          :file-list="fileList"
 | 
				
			||||||
          :on-error="handleErr"
 | 
					          :on-error="handleErr"
 | 
				
			||||||
          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
					          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
				
			||||||
| 
						 | 
					@ -241,7 +241,6 @@ import udOperation from '@crud/UD.operation'
 | 
				
			||||||
import rrOperation from '@crud/RR.operation'
 | 
					import rrOperation from '@crud/RR.operation'
 | 
				
			||||||
import pagination from '@crud/Pagination'
 | 
					import pagination from '@crud/Pagination'
 | 
				
			||||||
import {getAres} from '@/api/area'
 | 
					import {getAres} from '@/api/area'
 | 
				
			||||||
import Treeselect from '@riophae/vue-treeselect'
 | 
					 | 
				
			||||||
import {getToken} from "@/utils/auth";
 | 
					import {getToken} from "@/utils/auth";
 | 
				
			||||||
import viewFullStockIn from '@/views/base-data/point/fullStockIn.vue';
 | 
					import viewFullStockIn from '@/views/base-data/point/fullStockIn.vue';
 | 
				
			||||||
import viewFullStockOut from '@/views/base-data/point/fullStockOut.vue';
 | 
					import viewFullStockOut from '@/views/base-data/point/fullStockOut.vue';
 | 
				
			||||||
| 
						 | 
					@ -264,7 +263,7 @@ export default {
 | 
				
			||||||
  name: 'Point',
 | 
					  name: 'Point',
 | 
				
			||||||
  components: {
 | 
					  components: {
 | 
				
			||||||
    multiAdjust,
 | 
					    multiAdjust,
 | 
				
			||||||
    Treeselect, pagination, crudOperation, udOperation, rrOperation, viewFullStockIn, viewFullStockOut
 | 
					    pagination, crudOperation, udOperation, rrOperation, viewFullStockIn, viewFullStockOut
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  mixins: [presenter(), header(), form(defaultForm), crud()],
 | 
					  mixins: [presenter(), header(), form(defaultForm), crud()],
 | 
				
			||||||
  dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea', 'item_height'],
 | 
					  dicts: ['base_staus', 'use_status', 'point_type', 'agv_on_off', 'smallArea', 'item_height'],
 | 
				
			||||||
| 
						 | 
					@ -281,6 +280,15 @@ export default {
 | 
				
			||||||
      queryOnPresenterCreated: true
 | 
					      queryOnPresenterCreated: true
 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  computed: {
 | 
				
			||||||
 | 
					    ...mapGetters([
 | 
				
			||||||
 | 
					      'baseApi'
 | 
				
			||||||
 | 
					    ]),
 | 
				
			||||||
 | 
					    showItemHeight() {
 | 
				
			||||||
 | 
					      // 通过库区控制高度显示隐藏
 | 
				
			||||||
 | 
					      return this.form.area && this.form.area.name === '小件存储区';
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  data() {
 | 
					  data() {
 | 
				
			||||||
    return {
 | 
					    return {
 | 
				
			||||||
      //地标点数据
 | 
					      //地标点数据
 | 
				
			||||||
| 
						 | 
					@ -331,12 +339,6 @@ export default {
 | 
				
			||||||
      //表单数据
 | 
					      //表单数据
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  computed: {
 | 
					 | 
				
			||||||
    showItemHeight() {
 | 
					 | 
				
			||||||
      // 通过库区控制高度显示隐藏
 | 
					 | 
				
			||||||
      return this.form.area && this.form.area.name === '小件存储区';
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
  mounted() {
 | 
					  mounted() {
 | 
				
			||||||
    this.getArea()
 | 
					    this.getArea()
 | 
				
			||||||
    //获取点位表的数据
 | 
					    //获取点位表的数据
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,7 +69,7 @@
 | 
				
			||||||
          slot='right'
 | 
					          slot='right'
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          action="/api/stock/import_stock"
 | 
					          :action="baseApi+'/api/stock/import_stock'"
 | 
				
			||||||
          :file-list="fileList"
 | 
					          :file-list="fileList"
 | 
				
			||||||
          :on-error="handleErr"
 | 
					          :on-error="handleErr"
 | 
				
			||||||
          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
					          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
				
			||||||
| 
						 | 
					@ -267,6 +267,11 @@ export default {
 | 
				
			||||||
      queryOnPresenterCreated: true
 | 
					      queryOnPresenterCreated: true
 | 
				
			||||||
    })
 | 
					    })
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  computed: {
 | 
				
			||||||
 | 
					    ...mapGetters([
 | 
				
			||||||
 | 
					      'baseApi'
 | 
				
			||||||
 | 
					    ])
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  data() {
 | 
					  data() {
 | 
				
			||||||
    return {
 | 
					    return {
 | 
				
			||||||
      //地标点数据
 | 
					      //地标点数据
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,7 @@ function resolve(dir) {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const name = defaultSettings.title // 网址标题
 | 
					const name = defaultSettings.title // 网址标题
 | 
				
			||||||
const port = 8081 // 端口配置
 | 
					const port = 8080 // 端口配置
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// All configuration  explanations can be find in https://cli.vuejs.org/config/
 | 
					// All configuration  explanations can be find in https://cli.vuejs.org/config/
 | 
				
			||||||
module.exports = {
 | 
					module.exports = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue