diff --git a/sys/Hh.Mes.POJO/WebEntity/EntityExtension/Extension.cs b/sys/Hh.Mes.POJO/WebEntity/EntityExtension/Extension.cs
index 92c10cb..6a2072f 100644
--- a/sys/Hh.Mes.POJO/WebEntity/EntityExtension/Extension.cs
+++ b/sys/Hh.Mes.POJO/WebEntity/EntityExtension/Extension.cs
@@ -157,12 +157,35 @@ namespace Hh.Mes.POJO.Entity
}
- public partial class base_project {
-
+ public partial class base_project
+ {
/// <summary>
/// projectMapList 读取项目对应设备信息
/// </summary>
[SugarColumn(IsIgnore = true)]
+ public string falg { get; set; }
+
+ /// <summary>
+ /// 设备总数
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public int eqCount { get; set; }
+
+ /// <summary>
+ /// 设备在线
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public int eqOnLine { get; set; }
+
+ /// <summary>
+ /// 设备待机
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public int eqOff { get; set; }
+
+ //设备故障
+ [SugarColumn(IsIgnore = true)]
+ public int eqAlarm { get; set; }
public string flag { get; set; }
}
}
diff --git a/sys/Hh.Mes.POJO/WebEntity/configure/base_project.cs b/sys/Hh.Mes.POJO/WebEntity/configure/base_project.cs
index f8f45a2..f94e98a 100644
--- a/sys/Hh.Mes.POJO/WebEntity/configure/base_project.cs
+++ b/sys/Hh.Mes.POJO/WebEntity/configure/base_project.cs
@@ -4,7 +4,7 @@ using SqlSugar;
namespace Hh.Mes.POJO.Entity
{
[SugarTable("base_project")]
- public partial class base_project
+ public partial class base_project:base_entity
{
/// <summary>
/// 主键
diff --git a/sys/Hh.Mes.Service/WebService/Configure/BaseProjectService.cs b/sys/Hh.Mes.Service/WebService/Configure/BaseProjectService.cs
index f8fe01f..139add2 100644
--- a/sys/Hh.Mes.Service/WebService/Configure/BaseProjectService.cs
+++ b/sys/Hh.Mes.Service/WebService/Configure/BaseProjectService.cs
@@ -18,6 +18,7 @@ using Hh.Mes.Common.config;
using Microsoft.AspNetCore.Hosting;
using MySqlX.XDevAPI.Common;
using System.Security.Claims;
+using NPOI.SS.Formula.Functions;
namespace Hh.Mes.Service.Configure
{
@@ -31,6 +32,11 @@ namespace Hh.Mes.Service.Configure
var expression = LinqWhere(entity);
//先组合查询表达式
var query = Context.Queryable<base_project>().Where(expression);
+ if (entity.falg == "projectMapList")
+ {
+ result.Result = query.ToList();
+ return result;
+ }
//Exel为ture就不分页，因为导出的话是全部导出
if (pageReq != null)
{
@@ -39,7 +45,7 @@ namespace Hh.Mes.Service.Configure
result.Count = total;
return result;
}
- if (entity.flag == "projectMapList")
+ if (entity.falg == "projectMapList")
{
result.Result = new
{
diff --git a/web/WebMvc/Areas/configure/Views/SysCompany/Index.cshtml b/web/WebMvc/Areas/configure/Views/SysCompany/Index.cshtml
deleted file mode 100644
index 8358112..0000000
--- a/web/WebMvc/Areas/configure/Views/SysCompany/Index.cshtml
+++ /dev/null
@@ -1,87 +0,0 @@
-@{ Layout = "~/Views/Shared/_Layout.cshtml"; }
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@section header
-{
-
-}
-
-<div id="listForm" class="layui-tab-item layui-show">
- <form class="layui-form layui-form-pane" action="" lay-filter="listForm">
- <table id="mainList" lay-filter="mainList"></table>
- </form>
-</div>
-
-<div id="modifyForm" class="layui-tab-item">
- <form class="layui-form layui-form-pane" action="" lay-filter="modifyForm" onsubmit="return false;">
- <div class="layui-card">
- <div class="layui-row">
-
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">公司名称<label class="lable-required">*</label></label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="name" type="text" lay-verify="required" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">地址</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="address" type="text" maxlength="50" class="layui-input">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">联系电话</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="telephone" type="text" class="layui-input NumText">
- </div>
- </div>
- <div class="layui-col-sm6">
- <label class="layui-form-label layui-col-sm3">版本</label>
- <div class="layui-input-inline layui-col-sm6">
- <input name="ver" type="text" maxlength="50" class="layui-input">
- </div>
- </div>
- <!--表单验证按钮-->
- <button class="layui-btn" style="display:none" name="fromAdd" lay-filter="fromAdd" lay-submit>fromAdd</button>
- <button class="layui-btn" style="display:none" name="fromUpdate" lay-filter="fromUpdate" lay-submit>fromUpdate</button>
- </div>
- </div>
- <div hidden>
- <input name="companyId" readonly type="text" class="layui-input">
- <input name="fileId" readonly type="text" class="layui-input">
- <input name="isDelete" readonly type="text" class="layui-input">
-
- <input name="createBy" type="text" readonly class="layui-input">
- <input name="createTime" type="text" readonly class="layui-input">
- <input name="updateTime" type="text" readonly class="layui-input">
- <input name="updateBy" type="text" readonly class="layui-input">
- </div>
- </form>
-</div>
-
-
-<div id="ImportData" style="padding: 60px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;display: none;">
- <div>
- <div>
- <label>图片位置：</label>
- <select name="position" id="position">
- <option value="home">首页</option>
- <option value="login">登入页</option>
- </select>
- </div>
- <br />
- <input type="file" name="excelfile" id="excelfile" accept="image/gif, image/jpeg, image/png">
- </div>
-</div>
-
-<script type="text/html" id="toolbarTable">
- <div class="layui-btn-container">
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnSelect"><i class="layui-icon"></i>检索</a>
- <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-mini" lay-event="btnRefresh"><i class="layui-icon"></i>刷新</a>
- {{ loadMenus("SysCompany", 1) }}
- </div>
-</script>
-
-@section Scripts
-{
- <script type="text/javascript" src="/productjs/configure/SysCompany.js" asp-append-version="true"></script>
-}
\ No newline at end of file
diff --git a/web/WebMvc/wwwroot/baseJs/projectMap.js b/web/WebMvc/wwwroot/baseJs/projectMap.js
index 51ea142..ad0ecc7 100644
--- a/web/WebMvc/wwwroot/baseJs/projectMap.js
+++ b/web/WebMvc/wwwroot/baseJs/projectMap.js
@@ -31,24 +31,24 @@ layui.config({
getProjectData() {
var ajaxConfig = {
- data: null,
+ data: { pageRequest: null, entity: { falg:"projectMapList" } },
url: `/configure/BaseProject/Load`,
success: function (result) {
if (sysU.successBefore(result)) return false;
- app.methods.createMarkerInfo(result.Result)
+ app.methods.createMarkerInfo(result)
}
};
sysU.ajax(ajaxConfig);
},
createMarkerInfo(json) {
- json.forEach(item => {
- var content = `<h4 style = 'margin:0;'>${item.projectAddress}</h4><br/>
- 这里是显示项目信息
+ json.Result.forEach(item => {
+ var content = `<h4 style = 'margin:0;'>${item.projectAddress}</h4>
+ 设备总数:${item.eqCount}、在线:${item.eqOnLine}、待机:${item.eqOff}、故障:<span style='color:red;'>${item.eqAlarm}</span>
<div style = 'display: flex;' >
<div><a style='text-decoration: underline;color: blue;' onclick='app.methods.mapMarkerClick(${JSON.stringify(item)})' href='#'>点击链接</a></div>
</div >` ;//定义大标题 写html语句标签
mapObj.createMarkerInfo(content, {
- title: item.projectName,
+ title: "项目名称:"+item.projectName,
longitude: item.longitude,
latitude: item.latitude
});