Commit 415faf80 authored by daniel's avatar daniel

feat(road): 线上赛测试

parent 012a9720
...@@ -421,8 +421,8 @@ ...@@ -421,8 +421,8 @@
const { useMessage, useNotification, dateZhCN, NButton, NTag, zhCN, NSpace, NImageGroup, NImage, NText } = naive const { useMessage, useNotification, dateZhCN, NButton, NTag, zhCN, NSpace, NImageGroup, NImage, NText } = naive
// 添加全局 loading 指令 // 添加全局 loading 指令
const uploadUrl = window.location.origin + '/api-common/v1/upload?folder=' + 'gk/invoice' + '&cmptId=' + getCId() const uploadUrl = window.location.origin + '/api-common/v1/upload?folder=' + 'gk/invoice' + '&cmptId=' + getCId()
// const BASE_ECC_URL = "https://ecc.geexek.com" const BASE_ECC_URL = "https://ecc.geexek.com"
const BASE_ECC_URL = "http://localhost:8081" // const BASE_ECC_URL = "http://localhost:8081"
// 随机分配名单 // 随机分配名单
const RANDOM_ASSIGN_URL = BASE_ECC_URL + '/api-pick/v1/pick-up-batch?cmptId=' + getCId() const RANDOM_ASSIGN_URL = BASE_ECC_URL + '/api-pick/v1/pick-up-batch?cmptId=' + getCId()
...@@ -750,6 +750,7 @@ ...@@ -750,6 +750,7 @@
const editOrderValue = reactive({ const editOrderValue = reactive({
id: undefined, id: undefined,
markNo: '', markNo: '',
cmptId: getCId(),
}) })
// 反馈的校验规则 // 反馈的校验规则
editOrderRules = { editOrderRules = {
...@@ -772,7 +773,7 @@ ...@@ -772,7 +773,7 @@
const depositForm = ref({ const depositForm = ref({
amount: 300, // 金额 amount: 300, // 金额
id: undefined, id: undefined,
cmptId: getCmptId(), cmptId: getCId(),
notice: '', // 公告 notice: '', // 公告
content: '', // 富文本 content: '', // 富文本
status: 0,// 0 关闭,1开启 status: 0,// 0 关闭,1开启
...@@ -933,7 +934,6 @@ ...@@ -933,7 +934,6 @@
const openEditModal = (row) => { const openEditModal = (row) => {
editOrderValue.id = row.id editOrderValue.id = row.id
editOrderValue.markNo = row.markNo editOrderValue.markNo = row.markNo
editOrderFormRef.value?.resetFields() editOrderFormRef.value?.resetFields()
showEditModal.value = true showEditModal.value = true
} }
......
...@@ -42,6 +42,7 @@ $(document).ready(function () { ...@@ -42,6 +42,7 @@ $(document).ready(function () {
obj.distance = $(e).find('input[type=number]').val(); obj.distance = $(e).find('input[type=number]').val();
obj.isTime = $(e).find('input[type=checkbox]').get(0).checked; obj.isTime = $(e).find('input[type=checkbox]').get(0).checked;
obj.name = $(e).find('input[type=text]').val(); obj.name = $(e).find('input[type=text]').val();
obj.pathId = $("#pathId").val();
if (obj.isTime) timerCount++; if (obj.isTime) timerCount++;
if (obj.isTime && !obj.distance && obj.distance <= 0) { if (obj.isTime && !obj.distance && obj.distance <= 0) {
flag = false; flag = false;
...@@ -66,7 +67,7 @@ $(document).ready(function () { ...@@ -66,7 +67,7 @@ $(document).ready(function () {
success: function (data) { success: function (data) {
if (data.code == 200) { if (data.code == 200) {
layer.msg('保存成功', { icon: 1, time: 1500 }); layer.msg('保存成功', { icon: 1, time: 1500 });
getPath($("#roadId").val(), $("#pahtId").val()); getPath($("#roadId").val(), $("#pathId").val());
} }
}, error: function () { }, error: function () {
layer.msg('操作失败', { icon: 5, time: 1500 }); layer.msg('操作失败', { icon: 5, time: 1500 });
...@@ -87,6 +88,7 @@ $(document).ready(function () { ...@@ -87,6 +88,7 @@ $(document).ready(function () {
var parent = $(this).parent(); var parent = $(this).parent();
var id = parent.attr('data-id'); var id = parent.attr('data-id');
var pathId = parent.attr('data-path-id'); var pathId = parent.attr('data-path-id');
$("#pathId").val(pathId);
var pathName = parent.attr('data-path-name'); var pathName = parent.attr('data-path-name');
var fileName = parent.attr('data-file-name'); var fileName = parent.attr('data-file-name');
var fileSize = parent.attr('data-file-size') ? Number(parent.attr('data-file-size')).toFixed(2) : 0; var fileSize = parent.attr('data-file-size') ? Number(parent.attr('data-file-size')).toFixed(2) : 0;
...@@ -310,6 +312,7 @@ function uploadFile(obj) { ...@@ -310,6 +312,7 @@ function uploadFile(obj) {
loadGps(res.result); loadGps(res.result);
// $('.equip-item[data-id='+dataId+']').find('.edit-new').trigger('click'); // $('.equip-item[data-id='+dataId+']').find('.edit-new').trigger('click');
$('#route-file').val(''); $('#route-file').val('');
window.location.reload();
} else { } else {
console.log(res); console.log(res);
} }
...@@ -538,6 +541,7 @@ function saveCpDis() { ...@@ -538,6 +541,7 @@ function saveCpDis() {
var pathId = $(item).attr("path-id"); var pathId = $(item).attr("path-id");
var disPoint = $(item).find("input").attr('name'); var disPoint = $(item).find("input").attr('name');
var distance = $(item).find("input").val() ? $(item).find("input").val() : 0; var distance = $(item).find("input").val() ? $(item).find("input").val() : 0;
$("#pathId").val(pathId);
var obj = { cmptId: cmptId, roadId: roadId, pathId: pathId, disPoint: disPoint, distance: distance * 1000 }; var obj = { cmptId: cmptId, roadId: roadId, pathId: pathId, disPoint: disPoint, distance: distance * 1000 };
arr.push(obj); arr.push(obj);
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment