diff --git a/src/util/api/api.js b/src/util/api/api.js index d79ce50..4d339d8 100644 --- a/src/util/api/api.js +++ b/src/util/api/api.js @@ -515,3 +515,19 @@ export const getUserGrow = data => post("PetrolCafeteriaFee/User/getUserGrow",da export const getUserVehicleGrow = data => post("PetrolCafeteriaFee/UserVehicle/getUserVehicleGrow",data); + +//获取蒙马录入用户名信息 +export const getMMUserInfo = data => post("PetrolCafeteriaFee/User/getMMUserInfo", data) + + +//保存蒙马录入用户名信息 +export const saveMMUserInfo = data => post("PetrolCafeteriaFee/User/addMMUserInfo", data) + +//保存蒙马录入用户名信息 +export const deleteMMUser = data => post("PetrolCafeteriaFee/User/deleteMMUser", data) + + + + + + diff --git a/src/util/axios/axios.js b/src/util/axios/axios.js index a6f1175..b714481 100644 --- a/src/util/axios/axios.js +++ b/src/util/axios/axios.js @@ -5,8 +5,8 @@ import {ElMessage} from "element-plus"; // axios.defaults.staticBaseURL = '../' -axios.defaults.baseURL = 'http://' + window.location.host //正式 -//axios.defaults.baseURL = 'http://' + window.location.hostname + ':9440' //测试 +//axios.defaults.baseURL = 'http://' + window.location.host //正式 +axios.defaults.baseURL = 'http://' + window.location.hostname + ':9440' //测试 //post请求头 axios.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8"; diff --git a/src/util/router/router.js b/src/util/router/router.js index 02b61fc..31bfdcd 100644 --- a/src/util/router/router.js +++ b/src/util/router/router.js @@ -84,6 +84,11 @@ import uservehiclegrowcollection from '../..//views/PetrolCafeteriaFee/uservehic import vehiclescoredivPage from '../..//views/PetrolCafeteriaFee/vehiclescoredivPage.vue'; + +import mmUserManage from '../..//views/PetrolCafeteriaFee/mmUserManage/mmUserManage.vue'; + + + import menu from '../../views/menu/menu.vue'; import menuIndex from '../../views/menu/menuIndex.vue'; @@ -198,6 +203,9 @@ const routes = [ },{ path: 'vehiclescoredivPage',//cafterqueryPage component: vehiclescoredivPage, + },{ + path: 'mmUserManage',//cafterqueryPage + component: mmUserManage, }, { path: 'index',//index diff --git a/src/views/PetrolCafeteriaFee/index.vue b/src/views/PetrolCafeteriaFee/index.vue index 4425cae..c90fd25 100644 --- a/src/views/PetrolCafeteriaFee/index.vue +++ b/src/views/PetrolCafeteriaFee/index.vue @@ -1570,7 +1570,7 @@ function handleCurrentChangeEvery(pageNum) { function handleSizeChangeDay(pageSize) { //开启表格加载 tableLoading.value = true; - tableSearchEvery.pageSize = pageSize; + tableSearchDay.pageSize = pageSize; loadDayTableDate(); } @@ -1578,7 +1578,7 @@ function handleSizeChangeDay(pageSize) { function handleCurrentChangeDay(pageNum) { //开启表格加载 tableLoading.value = true; - tableSearchEvery.pageNum = pageNum; + tableSearchDay.pageNum = pageNum; loadDayTableDate() } diff --git a/src/views/PetrolCafeteriaFee/mealManage/mealAddUpdate.vue b/src/views/PetrolCafeteriaFee/mealManage/mealAddUpdate.vue index edb01e8..634f137 100644 --- a/src/views/PetrolCafeteriaFee/mealManage/mealAddUpdate.vue +++ b/src/views/PetrolCafeteriaFee/mealManage/mealAddUpdate.vue @@ -248,7 +248,7 @@ async function beforeUpload(file) { } function exeedFile(file) { - ElMessage.warning("最多只允许上传四张图片"); + ElMessage.warning("最多只允许上传一张图片"); } diff --git a/src/views/PetrolCafeteriaFee/mmUserManage/mmUserAddUpdate.vue b/src/views/PetrolCafeteriaFee/mmUserManage/mmUserAddUpdate.vue new file mode 100644 index 0000000..69c9cb0 --- /dev/null +++ b/src/views/PetrolCafeteriaFee/mmUserManage/mmUserAddUpdate.vue @@ -0,0 +1,235 @@ + + + + + + \ No newline at end of file diff --git a/src/views/PetrolCafeteriaFee/mmUserManage/mmUserManage.vue b/src/views/PetrolCafeteriaFee/mmUserManage/mmUserManage.vue new file mode 100644 index 0000000..da3545a --- /dev/null +++ b/src/views/PetrolCafeteriaFee/mmUserManage/mmUserManage.vue @@ -0,0 +1,547 @@ + + + + + \ No newline at end of file diff --git a/src/views/PetrolCafeteriaFee/serviceAreaSpecialManage/serviceAreaSpecialAddUpdate.vue b/src/views/PetrolCafeteriaFee/serviceAreaSpecialManage/serviceAreaSpecialAddUpdate.vue index 8f2c509..0ffddb5 100644 --- a/src/views/PetrolCafeteriaFee/serviceAreaSpecialManage/serviceAreaSpecialAddUpdate.vue +++ b/src/views/PetrolCafeteriaFee/serviceAreaSpecialManage/serviceAreaSpecialAddUpdate.vue @@ -121,7 +121,6 @@ onMounted(() => { if(formData.value.picList.length > 0){ formData.value.picList[0].url = picUrl.value + formData.value.picList[0].url+"?v="+Math.random(); changePic(picUrl.value + formData.value.picList[0].url+"?v="+Math.random()); - } //获取下拉数据 getOtherData();