From 317a12f53245e8be0ad7996b1285cbb389fa70fb Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期六, 23 十一月 2024 19:35:48 +0800
Subject: [PATCH] 前端调整
---
代码管理/WCS/WIDESEAWCS_Client/src/api/http.js | 4 +-
代码管理/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 21 +++++-----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs | 6 +-
代码管理/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue | 15 +++++++
代码管理/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue | 16 ++++----
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 5 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 18 ++++++++
7 files changed, 58 insertions(+), 27 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
index f73725b..48c649a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
@@ -15,11 +15,11 @@
axios.defaults.baseURL = 'http://127.0.0.1:9291/';
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://127.0.0.1:8098/';
+ axios.defaults.baseURL = 'http://10.0.250.15:9291/';
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://127.0.0.1:8098/';
+ axios.defaults.baseURL = 'http://10.0.250.15:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
index ced7068..3b9ce32 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
@@ -53,23 +53,23 @@
</el-steps>
</div>
<el-row height="50" v-show="previousShow || nextShow">
- <el-col :span="8">
+ <!-- <el-col :span="12">
<div v-show="previousShow" class="grid-content content-text">
<el-button type="danger" @click="previous"
>鍥炴粴鍒颁笂涓�姝�</el-button
>
</div>
- </el-col>
- <el-col :span="8">
+ </el-col> -->
+ <!-- <el-col :span="8">
<div v-show="recoveryShow" class="grid-content content-text">
<el-button type="primary" @click="recovery">浠诲姟鎸傝捣鎭㈠</el-button>
</div>
- </el-col>
- <el-col :span="8">
+ </el-col> -->
+ <!-- <el-col :span="12">
<div v-show="nextShow" class="grid-content content-text">
<el-button type="warning" @click="next">璺宠浆鍒颁笅涓�姝�</el-button>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</div>
<div v-else>
@@ -83,10 +83,10 @@
</el-table-column>
<el-table-column prop="taskState" label="浠诲姟鐘舵��" width="90">
</el-table-column>
- <el-table-column prop="currentAddress" label="褰撳墠浣嶇疆" width="90">
+ <!-- <el-table-column prop="currentAddress" label="褰撳墠浣嶇疆" width="90">
</el-table-column>
<el-table-column prop="nextAddress" label="涓嬩竴浣嶇疆" width="90">
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="isManual" label="鏄惁浜哄伐鎿嶄綔" width="120">
</el-table-column>
<el-table-column prop="isNormal" label="鏄惁姝ｅ父" width="90">
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
index 84438e1..ed2cca7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basic/locationInfo.vue"
@@ -92,7 +92,20 @@
const searchFormOptions = ref([
[
{ title: "璐т綅缂栧彿", field: "locationCode" },
- { title: "宸烽亾缂栧彿", field: "roadwayNo" },
+ {
+ title: "璐т綅绫诲瀷",
+ field: "locationType",
+ type: "selectList",
+ dataKey: "locationTypeEnum",
+ data: [],
+ },
+ {
+ title: "璐т綅鐘舵��",
+ field: "locationStatus",
+ type: "selectList",
+ dataKey: "locationStatusEnum",
+ data: [],
+ },
],
]);
const columns = ref([
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
index 23d0c1a..58e392d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue"
@@ -50,25 +50,26 @@
dataKey: "taskType",
data: [],
},
- {
+
+ ],
+ [
+ {
title: "浠诲姟鐘舵��",
field: "taskState",
type: "selectList",
dataKey: "taskState",
data: [],
},
- ],
- [
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
- { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
- { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
+ // { title: "褰撳墠浣嶇疆", field: "currentAddress", type: "like" },
+ // { title: "涓嬩竴浣嶇疆", field: "nextAddress", type: "like" },
],
- [
- { title: "宸烽亾鍙�", field: "roadway", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
- ],
+ // [
+ // { title: "宸烽亾鍙�", field: "roadway", type: "like" },
+ // { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ // { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ // ],
]);
const columns = ref([
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs"
index fd5dc39..64fb47e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs"
@@ -107,12 +107,12 @@
app.ConfigureApplication();//配置文件
app.UseApplicationSetup();//启动配置
app.UseSession();
-if (app.Environment.IsDevelopment())
-{
+//if (app.Environment.IsDevelopment())
+//{
//todo
//app.UseSwaggerAuthorized();
app.UseSwaggerMiddle(() => Assembly.GetExecutingAssembly().GetManifestResourceStream("WIDESEAWCS_Server.index.html"));
-}//判断是否需要打开swagger
+//}//判断是否需要打开swagger
app.UseIpLimitMiddle();
app.UseApiLogMiddleware();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 04881e9..1e5a355 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -11,8 +11,9 @@
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+
+ //"ConnectionString": "Data Source=10.0.250.20;Initial Catalog=WIDESEAWCS_GD;User ID=sa;Password=STC@123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEAWCS_GD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index 4da2fa5..4c748fa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -178,7 +178,23 @@
}
else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
- //todo 璋冪敤WMS绉诲簱瀹屾垚
+ steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList();
+
+ foreach (var item in steps)
+ {
+ object obj;
+ FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
+ DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (descriptionAttribute != null)
+ {
+ obj = new { title = item, description = descriptionAttribute.Description };
+ }
+ else
+ {
+ obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() };
+ }
+ list.Add(obj);
+ }
}
else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result))
{
--
Gitblit v1.9.3