前端bug修改

2024-03-18 11:21:44 +08:00
parent 99dc716916
commit a998ff7c85
7 changed files with 110 additions and 68 deletions
--- a/common/style/mixin.styl
+++ b/common/style/mixin.styl
@@ -1,7 +1,7 @@
 $red = #ff6a00
 $green = #6CBE8B
 $yellow = #E9B451
-$blue = #6798ef
+$blue = #2367e2
 $gray = #c9c9c9
 $fc1 = #323232

--- a/pages/modules/mater-inventory.vue
+++ b/pages/modules/mater-inventory.vue
@@ -40,7 +40,7 @@

 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {materialList, getInventoryMaterialInfo} from '@/utils/getData2.js'
+	import {materialList, getInventoryMaterialInfo} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -5,13 +5,6 @@ import request1 from './request1.js'
 export const pdaUpdate = () => request({
 	url:'api/pda/update'
 })
-// export const pdaUpdate = () => {
-// 	let res = {
-// 		versionName: '1.0.1',
-// 		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
-// 	}
-// 	return res
-// }

 // 登录
 export const handLogin = (user, password) => request({
@@ -30,51 +23,7 @@ export const manualSortingOrders = () => request({
 	url:'api/pda/manualSorting/orders',
 	data: {}
 })
-// export const manualSortingOrders = () => {
-// 	let res = [
-//     {
-//         "workorder_code": "231117001",
-//         "material_code": "ZJB",
-//         "material_name": "正极板",
-//         "workorder_status": "1",
-//         "operator": null,
-//         "create_name": "管理员",
-//         "plan_qty": "1111",
-//         "real_qty": "0"
-//     },
-//     {
-//         "workorder_code": "231128002",
-//         "material_code": "FJB",
-//         "material_name": "负极板",
-//         "workorder_status": "3",
-//         "operator": null,
-//         "create_name": "管理员",
-//         "plan_qty": "2222",
-//         "real_qty": "0"
-//     },
-//     {
-//         "workorder_code": "231128003",
-//         "material_code": "BFJB",
-//         "material_name": "边负极板",
-//         "workorder_status": "4",
-//         "operator": 'admin',
-//         "create_name": "管理员",
-//         "plan_qty": "1111",
-//         "real_qty": "0"
-//     },
-//     {
-//         "workorder_code": "231212003",
-//         "material_code": "BFJB",
-//         "material_name": "边负极板",
-//         "workorder_status": "1",
-//         "operator": null,
-//         "create_name": "管理员",
-//         "plan_qty": "8989767",
-//         "real_qty": "0"
-//     }
-// ]
-// 	return res
-// }
+
 // 开工
 export const productionScheduling = (code, user) => request({
 	url:'api/pda/manualSorting/productionScheduling',
@@ -100,10 +49,7 @@ export const coatedWireIntoStorageTaskShow = () => request({
 	url:'api/pda/manualSorting/coatedWireIntoStorageTaskShow',
 	data: {}
 })
-// export const coatedWireIntoStorageTaskShow = () => {
-// 	let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}]
-// 	return res
-// }
+
 // 入库
 export const coatedWireIntoStorageTask = (code, qty) => request({
 	url:'api/pda/manualSorting/coatedWireIntoStorageTask',
@@ -121,10 +67,7 @@ export const materialList = () => request({
 	url:'api/pda/materialList',
 	data: {}
 })
-// export const materialList = () => {
-// 	let res = [{"value":"BFJB","text":"边负极板"},{"value":"FJB","text":"负极板"},{"value":"ZJB","text":"正极板"}]
-// 	return res
-// }
+
 // 根据物料获取库存数据
 export const getInventoryMaterialInfo = (code) => request({
 	url:'api/pda/getInventoryMaterialInfo',
@@ -132,7 +75,3 @@ export const getInventoryMaterialInfo = (code) => request({
 		material_code: code
 	}
 })
-// export const getInventoryMaterialInfo = (code) => {
-// 	let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}]
-// 	return res
-// }
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -0,0 +1,64 @@
+export const pdaUpdate = () => {
+	let res = {
+		versionName: '1.0.1',
+		url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk'
+	}
+	return res
+}
+export const manualSortingOrders = () => {
+	let res = [
+    {
+        "workorder_code": "231117001",
+        "material_code": "ZJB",
+        "material_name": "正极板",
+        "workorder_status": "1",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "1111",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231128002",
+        "material_code": "FJB",
+        "material_name": "负极板",
+        "workorder_status": "3",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "2222",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231128003",
+        "material_code": "BFJB",
+        "material_name": "边负极板",
+        "workorder_status": "4",
+        "operator": 'admin',
+        "create_name": "管理员",
+        "plan_qty": "1111",
+        "real_qty": "0"
+    },
+    {
+        "workorder_code": "231212003",
+        "material_code": "BFJB",
+        "material_name": "边负极板",
+        "workorder_status": "1",
+        "operator": null,
+        "create_name": "管理员",
+        "plan_qty": "8989767",
+        "real_qty": "0"
+    }
+]
+	return res
+}
+export const coatedWireIntoStorageTaskShow = () => {
+	let res = [{"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"1","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"2","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"3","remark":"普涂线01对接位01"}, {"point_name1":"普涂线01对接位01","point_name2":'普涂线01对接位01',"point_name3":'普涂线01对接位01',"point_name4":'普涂线01对接位01',"task_status":"4","remark":"普涂线01对接位01"}]
+	return res
+}
+export const materialList = () => {
+	let res = [{"value":"BFJB","text":"边负极板"},{"value":"FJB","text":"负极板"},{"value":"ZJB","text":"正极板"}]
+	return res
+}
+export const getInventoryMaterialInfo = (code) => {
+	let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}]
+	return res
+}
--- a/vuex/modules/data.js
+++ b/vuex/modules/data.js
@@ -0,0 +1,31 @@
+import * as types from '../types'
+const state = {
+	publicObj: '',
+	publicArr: ''
+}
+const getters = {
+	publicObj: state => state.publicObj,
+	publicArr: state => state.publicArr
+}
+const actions = {
+  setPublicObj ({commit}, res) {
+    commit(types.PUBLIC_OBJ, res)
+  },
+  setPublicArr ({commit}, res) {
+    commit(types.PUBLIC_ARR, res)
+  }
+}
+const mutations = {
+	[types.PUBLIC_OBJ] (state, res) {
+	  state.publicObj = res
+	},
+	[types.PUBLIC_ARR] (state, res) {
+	state.publicArr = res
+	}
+}
+export default {
+  state,
+  getters,
+  actions,
+  mutations
+}
--- a/vuex/store.js
+++ b/vuex/store.js
@@ -2,11 +2,13 @@ import Vue from 'vue'
 import Vuex from 'vuex'

 import user from './modules/user'
+import data from './modules/data'

 Vue.use(Vuex)

 export default new Vuex.Store({
  modules: {
-    user
+    user,
+	data
  }
 })
--- a/vuex/types.js
+++ b/vuex/types.js
@@ -6,4 +6,10 @@ export const DEL_LOGIN_NAME = 'DEL_LOGIN_NAME'
 export const COM_CONFIG = 'COM_CONFIG'
 export const SAVE_USER_INFO = 'SAVE_USER_INFO'
 export const DEL_USER_INFO = 'DEL_USER_INFO'
-export const SAVE_TOKEN = 'SAVE_TOKEN'
+export const SAVE_TOKEN = 'SAVE_TOKEN'
+
+/**
+ * data
+ */
+export const PUBLIC_OBJ = 'PUBLIC_OBJ'
+export const PUBLIC_ARR = 'PUBLIC_ARR'