From be55c25959a26aa610bc0c15b7cad75b586e72ef Mon Sep 17 00:00:00 2001 From: dev02 Date: Sat, 3 Dec 2022 08:38:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B6=AD=E4=BF=AE/=E4=BF=9D?= =?UTF-8?q?=E9=A4=8A=E7=85=A7=E7=89=87=E4=B8=8A=E5=82=B3=E5=92=8C=E7=8F=BE?= =?UTF-8?q?=E5=AF=A6,=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=96=AE=E6=9F=A5?= =?UTF-8?q?=E8=A9=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_historyData.html | 6 +- Frontend/_operation.html | 720 +++++++++++++++--- .../js/yourteam/yourteam.utility.class.js | 9 +- .../ApiControllers/OperationController.cs | 49 +- FrontendWebApi/Models/Operation.cs | 8 +- .../wwwroot/excel/operation/維修.xlsx | Bin 0 -> 6416 bytes .../01feac02-0141-4554-99c6-490747c743eb.png | Bin 0 -> 73427 bytes .../04e7992a-da7d-4347-9f0c-3e30f65794c4.png | Bin 0 -> 73427 bytes .../21176f4b-b010-4c70-bf6f-e3065fc7e8a2.jpg | Bin 0 -> 37775 bytes ... 6a095414-ceba-47d0-bd57-6193d440640d.jpg} | Bin .../9fc18636-f154-4409-a69c-fef11a18cb3f.jpg | Bin 0 -> 7477 bytes 11 files changed, 652 insertions(+), 140 deletions(-) create mode 100644 FrontendWebApi/wwwroot/excel/operation/維修.xlsx create mode 100644 FrontendWebApi/wwwroot/upload/operation/01feac02-0141-4554-99c6-490747c743eb.png create mode 100644 FrontendWebApi/wwwroot/upload/operation/04e7992a-da7d-4347-9f0c-3e30f65794c4.png create mode 100644 FrontendWebApi/wwwroot/upload/operation/21176f4b-b010-4c70-bf6f-e3065fc7e8a2.jpg rename FrontendWebApi/wwwroot/upload/operation/{image1.jpg => 6a095414-ceba-47d0-bd57-6193d440640d.jpg} (100%) create mode 100644 FrontendWebApi/wwwroot/upload/operation/9fc18636-f154-4409-a69c-fef11a18cb3f.jpg diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html index a2543c1..12243f7 100644 --- a/Frontend/_historyData.html +++ b/Frontend/_historyData.html @@ -198,6 +198,7 @@ if (index == 0) { strHtml += ``; pageAct.deviceItem = val.points; + pageAct.devicePoiName = val.full_name + ' ' + val.points; getData(); } else { strHtml += ``; @@ -242,7 +243,8 @@ pageAct.deviceName = deviceName; devPointsList(); } - else if (deviceItem != null && deviceItem != undefined) { + else if (deviceItem != null && deviceItem != undefined) { + pageAct.devicePoiName = $(elem).text(); pageAct.deviceItem = deviceItem; getData(); } @@ -330,7 +332,7 @@ function loadTable(data) { if (data) { $.each(data, function (i, v) { - v.type = deviceName; + v.type = pageAct.devicePoiName; }); } diff --git a/Frontend/_operation.html b/Frontend/_operation.html index 21fc8fc..3cbc47e 100644 --- a/Frontend/_operation.html +++ b/Frontend/_operation.html @@ -6,8 +6,8 @@
- - + +
@@ -40,7 +40,7 @@
@@ -78,8 +78,8 @@