lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2025-09-17 11:06:34 +08:00
parent 5b8d3f2181 ffd65b87a1
commit 3ad6b67803
21 changed files with 292 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1
View File
@@ -1895,6 +1895,7 @@
<Content Include="res\images\zg05.png" />
<Content Include="res\image\message.png" />
<Content Include="res\index\images\logocenter.png" />
<Content Include="res\js\crypto-js.min.js" />
<Content Include="res\js\swiper-bundle.min.css" />
<Content Include="res\js\swiper-bundle.min.js" />
<Content Include="res\js\swiper.css" />
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
+7 -7
View File
@@ -129,7 +129,7 @@
<Items>
<f:DropDownList ID="drpProjectType" Label="项目类型" runat="server">
</f:DropDownList>
<f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right" >
<f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right">
<f:ListItem Text="在建" Value="1" Selected="true" />
<f:ListItem Text="停工" Value="2" />
<f:ListItem Text="竣工" Value="3" />
@@ -255,24 +255,24 @@
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理"
EnableEdit="true" Required="true" ShowRedStar="true">
<f:DropDownList ID="drpProjectSupervisor" runat="server" Label="项目主管" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
<f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpQAManager" runat="server" Label="质量经理"
EnableEdit="true" Required="true" ShowRedStar="true">
<f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" LabelWidth="150px" EnableEdit="true">
<f:DropDownList ID="drpQAManager" runat="server" Label="质量经理" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
</f:DropDownList>
</Items>
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
+52 -1
View File
@@ -57,6 +57,8 @@ namespace FineUIPro.Web.ProjectData
{
this.ProjectId = this.CurrUser.LoginProjectId;
}
///项目主管
UserService.InitUserDropDownList(this.drpProjectSupervisor, string.Empty, true);
///项目经理
UserService.InitUserDropDownList(this.drpProjectManager, string.Empty, true);
///施工经理
@@ -123,6 +125,12 @@ namespace FineUIPro.Web.ProjectData
var getPUser = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == this.ProjectId);
if (getPUser.Count() > 0)
{
///项目主管
var s = getPUser.FirstOrDefault(x => x.RoleId.Contains(BLL.Const.ProjectSupervisor));
if (s != null)
{
this.drpProjectSupervisor.SelectedValue = s.UserId;
}
///项目经理
var m = getPUser.FirstOrDefault(x => x.RoleId.Contains(BLL.Const.ProjectManager));
if (m != null)
@@ -490,7 +498,8 @@ namespace FineUIPro.Web.ProjectData
/// </summary>
/// <param name="projectId"></param>
private void SetProjectManager(string projectId)
{
{
string newProjectSupervisor = this.drpProjectSupervisor.SelectedValue;
string newProjectManager = this.drpProjectManager.SelectedValue;
string newConstructionManager = this.drpConstructionManager.SelectedValue;
string newHSSEManager = this.drpHSSEManager.SelectedValue;
@@ -499,6 +508,48 @@ namespace FineUIPro.Web.ProjectData
var project = BLL.ProjectService.GetProjectByProjectId(projectId);
if (project != null)
{
#region 项目主管
string OldProjectSupervisor = string.Empty; ////项目主管
var s = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.ProjectSupervisor));
if (s != null)
{
OldProjectSupervisor = s.UserId;
}
////此人不在项目中
if (!string.IsNullOrEmpty(newProjectSupervisor) && newProjectSupervisor != Const._Null && newProjectSupervisor != OldProjectSupervisor)
{
BLL.ProjectUserService.DeleteProjectUserByProjectIdUserId(projectId, newProjectSupervisor);
BLL.ProjectUserService.DeleteProjectUserByProjectIdUserId(projectId, OldProjectSupervisor);
var user = BLL.UserService.GetUserByUserId(newProjectSupervisor);
if (user != null && !string.IsNullOrEmpty(user.UnitId))
{
var punit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(projectId, user.UnitId);
if (punit == null) ///项目单位为空时要增加项目单位
{
Model.Project_ProjectUnit newProjectUnit = new Project_ProjectUnit
{
ProjectId = projectId,
UnitId = user.UnitId,
InTime = System.DateTime.Now
};
BLL.ProjectUnitService.AddProjectUnit(newProjectUnit);
}
Model.Project_ProjectUser newProjectUser = new Model.Project_ProjectUser
{
ProjectId = projectId,
UserId = newProjectSupervisor,
UnitId = user.UnitId,
RoleId = BLL.Const.ProjectSupervisor,
IsPost = true
};
BLL.ProjectUserService.AddProjectUser(newProjectUser);
}
}
#endregion
#region 项目经理
string OldProjectManager = string.Empty; ////项目经理
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs
Generated
+13 -4
View File
@@ -500,6 +500,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// drpProjectSupervisor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectSupervisor;
/// <summary>
/// drpProjectManager 控件。
/// </summary>
@@ -510,13 +519,13 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.DropDownList drpProjectManager;
/// <summary>
/// drpConstructionManager 控件。
/// drpHSSEManager 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpConstructionManager;
protected global::FineUIPro.DropDownList drpHSSEManager;
/// <summary>
/// drpQAManager 控件。
@@ -528,13 +537,13 @@ namespace FineUIPro.Web.ProjectData
protected global::FineUIPro.DropDownList drpQAManager;
/// <summary>
/// drpHSSEManager 控件。
/// drpConstructionManager 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHSSEManager;
protected global::FineUIPro.DropDownList drpConstructionManager;
/// <summary>
/// drpDriveManager 控件。
SGGL/FineUIPro.Web/SysManage/UserList.aspx
+1 -1
View File
@@ -47,7 +47,7 @@
<f:Button ID="btnImport" ToolTip="导入" Icon="ApplicationAdd" Hidden="true" runat="server"
OnClick="btnImport_Click">
</f:Button>
<f:Button ID="btnUpdata" Text="推送督查人员" Icon="PageSave" runat="server" ConfirmText="确定推送？"
<f:Button ID="btnUpdata" Text="推送集团检查负责人" Icon="PageSave" runat="server" ConfirmText="确定推送？"
ToolTip="推送" ValidateForms="SimpleForm1" OnClick="btnPush_Click" MarginRight="10px">
</f:Button>
</Items>
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
+1 -1
View File
@@ -84,7 +84,7 @@
<items>
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" LabelWidth="90px" EnableEdit="true" EnableCheckBoxSelect="True" EnableMultiSelect="True" EmptyText="--请选择--" AutoSelectFirstItem="false" >
</f:DropDownList>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="100px" />
<f:CheckBox runat="server" Label="是否是集团检查整改负责人" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="200px" />
</items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/common/main_new0.aspx
+4 -4
View File
@@ -155,28 +155,28 @@
<div class="videos">
<div class="video_title"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_Title%>"/></div>
<img src="./imags/16.png"></img>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span>2020-10-10 12:40:26</span></div>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span></span></div>
</div>
</div>
<div class="video" style="padding-left: .125rem;padding-bottom: .125rem;">
<div class="videos">
<div class="video_title"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_Title%>"/></div>
<img src="./imags/16.png"></img>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span>2020-10-10 12:40:26</span></div>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span></span></div>
</div>
</div>
<div class="video" style="padding-right: .125rem;padding-top: .125rem;">
<div class="videos">
<div class="video_title"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_Title%>"/></div>
<img src="./imags/16.png"></img>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span>2020-10-10 12:40:26</span></div>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span></span></div>
</div>
</div>
<div class="video" style="padding-left: .125rem;padding-top: .125rem;">
<div class="videos">
<div class="video_title"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_Title%>"/></div>
<img src="./imags/16.png"></img>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span>2020-10-10 12:40:26</span></div>
<div class="video_value"><span><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_Video_RealTimeVideo%>"/></span><span></span></div>
</div>
</div>
</div>
SGGL/FineUIPro.Web/indexProject.aspx
+7 -5
View File
@@ -20,6 +20,8 @@
<script src="~/res/lib/china.js"></script>
<script src="~/res/lib/echarts.min.js"></script>
<script src="~/res/lib/swiper.min.js"></script>
<script src="~/res/js/crypto-js.min.js"></script>
<link rel="stylesheet" href="~/res/css/company.css?v1">
<style>
.BMap_mask {
@@ -559,6 +561,7 @@
</Items>
</f:SimpleForm>
</form>
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
<script type="text/javascript">
var toolRefreshClientID = '<%= toolRefresh.ClientID %>';
var toolNewWindowClientID = '<%= toolNewWindow.ClientID %>';
@@ -677,7 +680,9 @@
var username = $('#<%= hfProjectCode.ClientID %>-inputEl').val()
var password = $('#<%= hfMonitorPW.ClientID %>-inputEl').val();
if (password != "") {
window.open(videoURL + "#/screen?username=" + username + "&password=" + password, '_blank');
var sign = CryptoJS.AES.encrypt(username + "$" + password +"$" + Date.now(), "nbd").toString();
sign = encodeURIComponent(sign);
window.open(videoURL + "#/screen?sign=" + sign , '_blank');
} else {
alert("该项目未关联监控信息！");
}
@@ -906,10 +911,7 @@
}
}
// 点击标题栏工具图标 - 查看源代码
var videoURL ='<%=VideoURL %>'
function openVideo() {
window.open(videoURL, '_blank');
}
// 获取当前激活选项卡的ID
function getActiveTabId() {
SGGL/FineUIPro.Web/res/js/crypto-js.min.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long