Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

Jeffery

2023-08-31 e312eb6ad07dd3e652d830c6b97e3dc94f9c3031

Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

 src/DIXWeb.Business/BasicInfo/MotifInfoBusiness.cs

@@ -75,8 +75,24 @@
        public List<InspectObject> GetDataList1()
        {
            string sql = "select * from [meta].[InspectObject] where InspectObjectTypeId=16";

            string sql2 = "SELECT distinct InspectObjectId FROM [DIX].[dbo].[Toprie_Motif]";

            var table = GetDataTableWithSql(sql);
            var InspectObjectIdsqlTb = GetDataTableWithSql(sql2);
            List<InspectObject> list = DataTableToList<InspectObject>(table);
            List<Toprie_Motif> InspectObjectIdList = DataTableToList<Toprie_Motif>(InspectObjectIdsqlTb);

            foreach (var item in list)
            {
                if (InspectObjectIdList.Where(m => m.InspectObjectId==item.Id).ToList().Count()>0) {

                    item.InspectObjectCode+="-正在使用";
                
                }
            }



            return list;
        }

 src/DIXWeb.Business/GlobalM/StatementBusiness.cs

@@ -1,6 +1,7 @@
using DIXWeb.DAL;
using DIXWeb.Entity.Statement;
using DIXWeb.Entity.Workflow;
using DIXWeb.Util.Helper;
using System;
using System.Collections.Generic;
using System.Data;
@@ -174,8 +175,8 @@
                    List<int> xAxisList = objArr[0] as List<int>;
                    List<string> lineNameList = objArr[1] as List<string>;
                    List<string> xAxisStrList = objArr[2] as List<string>;
                    receive.Extend = GetEChartsTemperature(list, xAxisList, lineNameList, xAxisStrList, yMinTemperature,yMaxTemperature);//转换
                    receive.Extend1 = GetEChartsHumidity(list, xAxisList, lineNameList, xAxisStrList,yMinHumidity,yMaxHumidity);//转换
                    receive.Extend = GetEChartsTemperature(list, xAxisList, lineNameList, xAxisStrList, yMinTemperature, yMaxTemperature);//转换
                    receive.Extend1 = GetEChartsHumidity(list, xAxisList, lineNameList, xAxisStrList, yMinHumidity, yMaxHumidity);//转换

                    receive.Code = 200;
                    receive.Message = "SUCCESS";
@@ -221,7 +222,7 @@
            return receive;
        }

        private ECharts GetEChartsTemperature(List<TransitionDiagram> list, List<int> xAxisList, List<string> lineNameList, List<string> xAxisStrList,string yMin,string yMax)
        private ECharts GetEChartsTemperature(List<TransitionDiagram> list, List<int> xAxisList, List<string> lineNameList, List<string> xAxisStrList, string yMin, string yMax)
        {
            ECharts record = new ECharts();
            record.yMin = yMin;
@@ -250,7 +251,7 @@
                record.EChartsSeriesArr[index].data = TemperatureArr;
                record.EChartsSeriesArr[index].ShowDesc = 0;
                index++;
            } 
            }
            record.EChartsSeriesArr[index] = new EChartsSeries();
            record.EChartsSeriesArr[index].InspectObjectName = "温度上限";
            string[] TemperatureMaxArr = list.Select(x => x.TemperatureMax).ToArray<string>();
@@ -341,6 +342,66 @@
            return new object[] { xAxisList, lineNameList, xAxisStrList };
        }

        public Receive GetItemNameByObjectCode(string InspectObjectCode)
        {
            Receive receive = new Receive();
            try
            {
                Dictionary<string, object> dictIn = new Dictionary<string, object>();
                dictIn.Add("@InspectObjectCode", InspectObjectCode);
                DataTable table = new DBHelper().GetDataTable("dbo.zp_GetItemNameByObjectCode", dictIn);
                
                receive.Code = 200;
                receive.Message = table.Rows[0][0].ToString();
            }
            catch (Exception ex)
            {
                receive.Code = 500;
                receive.Message = ex.Message;
            }
            return receive;
        }

        public Receive GetObjectInspectDetail(string InspectObjectCode, DateTime TimeBegin, DateTime TimeEnd, int page = 1, int rows = 200)
        {
            Receive receive = new Receive();
            try
            {
                Dictionary<string, object> dictIn = new Dictionary<string, object>();
                List<string> dictOutAttr = new List<string>();
                dictIn.Add("@InspectObjectCode", InspectObjectCode);
                dictIn.Add("@TimeBegin", TimeBegin);
                dictIn.Add("@TimeEnd", TimeEnd);
                dictIn.Add("@PageIndex", page);
                dictIn.Add("@PageSize", rows);
                dictOutAttr.Add("@Total");
                dictOutAttr.Add("@colNameArrStr");
                object[] result = new DBHelper("DIX").GetDataTableWithOutPut("dbo.zp_GetObjectInspectDetail", dictIn, dictOutAttr);
                Dictionary<string, object> dictOut = result[1] as Dictionary<string, object>;
                string totalStr = dictOut["@Total"].ToString();
                if (string.IsNullOrEmpty(totalStr))
                {
                    receive.Code = 404;
                    receive.Message = "未查询到数据";
                    return receive;
                }
                receive.total = int.Parse(totalStr);
                if (receive.total <= 0)
                {
                    receive.Code = 404;
                    receive.Message = "未查询到数据";
                    return receive;
                }
                receive.Code = 200;
                receive.rows = new DataHelper().ToDataList(result[0] as DataTable);
                receive.Extend = dictOut["@colNameArrStr"].ToString();
            }
            catch (Exception ex)
            {
                receive.Code = 500;
                receive.Message = ex.Message;
            }
            return receive;
        }
    }
}

 src/DIXWeb.Util/Helper/DataHelper.cs

@@ -63,5 +63,29 @@
            }
            return list;
        }

        public List<Dictionary<string, string>> ToDataList(DataTable dt)
        {
            List<Dictionary<string, string>> resultList = new List<Dictionary<string, string>>();
            List<string> titleList = new List<string>();
            Dictionary<string, string> titleDict = new Dictionary<string, string>();
            for (int i = 0; i < dt.Columns.Count; i++)
            {
                titleList.Add(dt.Columns[i].ToString());
                if (!titleDict.ContainsKey(dt.Columns[i].ToString())) titleDict.Add(dt.Columns[i].ToString(), "");
            }
            for (int i = 0; i < dt.Rows.Count; i++)
            {
                DataRow row = dt.Rows[i];
                for (int j = 0; j < titleList.Count; j++)
                {
                    titleDict[titleList[j]] = row[titleList[j]].ToString();
                }
                resultList.Add(titleDict.Copy(0, titleList.Count).ToDictionary(x => x.Key.ToString(), x => x.Value.ToString()));
            }
            titleDict.Clear();
            titleDict = null;
            return resultList;
        }
    }
}

 src/DIXWeb.Web/Areas/GlobalM/Controllers/StatementController.cs

@@ -31,6 +31,10 @@
            return View();
        }

        public ActionResult ObjectInspectDetail()
        {
            return View();
        }

        public ActionResult GetInspectObjectType()
        {
@@ -84,5 +88,18 @@
            Receive receive = this._statementBusiness.GetNeedCheckDetail(InspectTypeId, InspectObjectTypeId, Attention, page, rows);
            return Json(receive);
        }

        public ActionResult GetItemNameByObjectCode(string InspectObjectCode)
        {
            Receive receive = this._statementBusiness.GetItemNameByObjectCode(InspectObjectCode);
            return Json(receive);
        }

        public ActionResult GetObjectInspectDetail(string InspectObjectCode,DateTime TimeBegin, DateTime TimeEnd, int page = 1, int rows = 200)
        {
            Receive receive = this._statementBusiness.GetObjectInspectDetail(InspectObjectCode, TimeBegin, TimeEnd, page, rows);
            return Json(receive);
        }

    }
}

 src/DIXWeb.Web/Areas/GlobalM/Controllers/Workflow/BillController.cs

@@ -59,9 +59,11 @@
            return PartialView();
        }

        public ActionResult InspectFalseDetail(int InspectBookId = 0)
        public ActionResult InspectFalseDetail(int InspectBookId = 0, int ShowBtn = 0)
        {
            ViewData["InspectBookId"] = InspectBookId;
            ViewData["RoleNameString"] = Util.SessionHelper.Session["RoleNameString"].ToString();
            ViewData["ShowBtn"] = ShowBtn;
            return PartialView();
        }


 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/InspectFalseDetail.cshtml

@@ -46,5 +46,7 @@
</style>
<script src="~/Scripts/Bill/PartialInspectFalseDetail.js"></script>
<input id="tbxInspectBookId" readonly="readonly" value='@ViewData["InspectBookId"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="RoleNameStringInspectFalseDetail" readonly="readonly" value='@ViewData["RoleNameString"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="ShowBtnInspectFalseDetail" readonly="readonly" value='@ViewData["ShowBtn"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />

<table id="tabPartialInspectFalseDetail"></table>

 src/DIXWeb.Web/Areas/GlobalM/Views/Statement/ObjectInspectDetail.cshtml

New file
@@ -0,0 +1,47 @@

@{
    ViewBag.Title = "ObjectInspectDetail";
    Layout = "~/Views/Shared/_Layout_List.cshtml";
}
<script src="~/Scripts/Statement/ObjectInspectDetail.js"></script>


<table id="tabOIDSearch">
    <tr>
        <td class="tabTitle">设备编码：</td>
        <td class="tabCBB">
            <input id="searchOIDInspectObjectCode" type="text" style="width:120px;" />
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td class="tabTitle">时间区间：</td>
        <td class="tabTime" colspan="2">
            <input id="searchOIDtimeBegin" style="width:120px;" type="date" />
            &nbsp;&nbsp;至&nbsp;&nbsp;
            <input id="searchOIDtimeEnd" style="width:120px;" type="date" />
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td class="tabButton">
            &nbsp;&nbsp;&nbsp;&nbsp;
            <a id="btnOIDSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">搜索</a>
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td></td>
        <td></td>
    </tr>
</table>
<table id="tabOIDTable" class="easyui-datagrid"></table>


<style type="text/css">
    #tabOIDSearch td {
        padding: 5px 0px 5px 0px;
    }

    select {
        width: 115px;
        background-color: white;
        text-align: center;
    }
</style>



 src/DIXWeb.Web/DIXWeb.Web.csproj

@@ -805,6 +805,8 @@
    <Content Include="Areas\GlobalM\Views\Bill\ReckUpdateHistory.cshtml" />
    <Content Include="Areas\GlobalM\Views\Bill\StartDIXFireControl.cshtml" />
    <Content Include="Areas\GlobalM\Views\Bill\InspectFalseDetail.cshtml" />
    <Content Include="Areas\GlobalM\Views\Statement\ObjectInspectDetail.cshtml" />
    <Content Include="Areas\GlobalM\Views\WorkflowRoute\EntrustIndex.cshtml" />
    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
    <Content Include="Scripts\Download\TwoDCodeView.js" />
    <Content Include="Scripts\echarts.common.min.js" />
@@ -818,6 +820,7 @@
    <Content Include="Scripts\Organize\User\Search.js" />
    <Content Include="Scripts\resize.js" />
    <Content Include="Scripts\Statement\InspectCheckedSelect.js" />
    <Content Include="Scripts\Statement\ObjectInspectDetail.js" />
    <Content Include="Scripts\Statement\TransitionDiagram.js" />
    <Content Include="Scripts\TimePluggable\jquery.datetimepicker.css" />
    <Content Include="Scripts\TimePluggable\jquery.datetimepicker.full.min.js" />
@@ -1650,6 +1653,7 @@
    <Content Include="Views\MotifInfo\Form.cshtml" />
    <Content Include="Views\MotifInfo\Index.cshtml" />
    <Content Include="Views\MotifInfo\warningForm.cshtml" />
    <Content Include="Views\MotifInfo\RunForm.cshtml" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>

 src/DIXWeb.Web/Scripts/Bill/BillInspectFinished.js

@@ -218,7 +218,7 @@
        var rows = $('#tabBillInspectFinishedTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
        var BookId = rows[0].Id
        var param = { InspectBookId: BookId };
        var param = { InspectBookId: BookId, ShowBtn: 1  };
        var data = ajaxSame('../../GlobalM/Bill/InspectFalseDetail', param, 'post', 'html');

        $('#processBillInspectFinished').empty();

 src/DIXWeb.Web/Scripts/Bill/PartialInspectFalseDetail.js

@@ -6,6 +6,11 @@
    var bookId = $('#tbxInspectBookId').val();
    var $table = $('#tabPartialInspectFalseDetail');
    var $tr = $('');

    var roleNameStr = $('#RoleNameStringInspectFalseDetail').val();
    var showBtn = $('#ShowBtnInspectFalseDetail').val();
    var showIndex1 = roleNameStr.indexOf('单据修改者');
    var showIndex2 = roleNameStr.indexOf('流程发起角色');
    $.ajax({
        url: '../../GlobalM/Bill/GetInspectDetailByBookId',
        data: { BookId: bookId, FilterType: 'FALSE'  },
@@ -15,7 +20,11 @@
        success: function (data) {
            if (data.Code == 200) {
                $table.empty();
                $tr = $('<thead><tr><td>序号</td><td>点检项</td><td>基准</td><td>结果</td><td>结果</td><td>NG原因</td><td>改善？</td><td>对策</td><td>次数</td><td>时间</td><td>点检人</td><td>图片</td><td>修改</td></tr></thead>');
                var titleTd = '';
                if ((showIndex1 > 0 || showIndex2 > 0) && showBtn == '1') {
                    titleTd = '<td>备注</td>';
                }
                $tr = $('<thead><tr><td>序号</td><td>点检项</td><td>基准</td><td>结果</td><td>结果</td><td>NG原因</td><td>改善？</td><td>对策</td><td>次数</td><td>时间</td><td>点检人</td><td>图片</td>' + titleTd + '</tr></thead>');
                $table.append($tr);
                for (var i in data.rows) {
                    var detail = data.rows[i];
@@ -25,7 +34,10 @@
                    } else {
                        bgColor = 'class="bgWhite" ';
                    }

                    var btnTd = '';
                    if ((showIndex1 > 0 || showIndex2 > 0) && showBtn == '1') {
                        btnTd = '<td><button onclick="setDataPartialInspectFalseDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectFalseDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>';
                    }
                    $tr = $('<tbody><tr ' + bgColor + '>' +
                        '<td style="width:4%;">' + detail.InspectItemId + '</td>' +
                        '<td style="width:10%;">' + detail.InspectItemName + '</td>' +
@@ -41,7 +53,7 @@
                        '<td style="width:8%;">' + detail.InspectOperator + '</td>' +

                        '<td style="width:4%;">' + (detail.ImgCount > 0 ? '<button onclick="selImgPartialInspectFalseDetail(this);">检测<span class="spanHidden">' + detail.ImgString + '</span></button>' : '') + '</td>' +
                        '<td><button onclick="setDataPartialInspectFalseDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectFalseDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>' +
                        btnTd +
                        '</tr ></tbody > ');
                    $table.append($tr);
                }

 src/DIXWeb.Web/Scripts/Statement/ObjectInspectDetail.js

New file
@@ -0,0 +1,112 @@
var dataOIDECharts = [];

$(function () {
    initOIDHeight()
    initOIDTime();
    initOIDClick();
});

function initOIDHeight(){
    var pageHeight = $('#page', window.parent.document).height();
    var whereHeight = $('#tabOIDSearch').height();
    var showHeight = parseInt(pageHeight) - parseInt(whereHeight);
    debugger;
    $('#tabOIDTable').css({ "width": "100%", "height": showHeight + "px" });
}

function initOIDTime() {
    var date = new Date();
    var year = date.getFullYear();
    var month = date.getMonth() + 1;
    var day = date.getDate();
    var dateBeginStr = year + '-' + (month >= 10 ? '' : '0') + month + '-01';
    var dateEndStr = year + '-' + (month >= 10 ? '' : '0') + month + '-' + (day >= 10 ? '' : '0') + day;
    $('#searchOIDtimeBegin').val(dateBeginStr);
    $('#searchOIDtimeEnd').val(dateEndStr);
}


function initOIDTable() {
    initOIDHeight();
    $('#tabOIDTable').empty();
    var param = getOIDSearchParam();
    console.info(param);
    var data = ajaxSame('../../GlobalM/Statement/GetItemNameByObjectCode', param, 'POST', 'JSON');
    if (data.Code != 200) {
        alert(data.Message);
        return;
    }
    var columns = getColumnsOID(data.Message);
    debugger;
    $('#tabOIDTable').datagrid({
        singleSelect: true,
        url: '../../GlobalM/Statement/GetObjectInspectDetail',
        singleSelect: true,
        queryParams: param,
        idField: 'InspectBookId',
        animate: true,
        pagination: true,
        rownumbers: true,
        pagePosition: 'bottom',
        pageSize: 100,
        pageNumber: 1,
        fitColumns: true,
        columns: columns,
        pageList: [20, 50, 100, 200, 500, 1000, 10000],
        //toolbar: '#tabOIDSearch',
        loadFilter: function (data) {
            if (data.Code == 200) {
                return data;
            } else {
                alert(data.Message);
                return null;
            }
        },
    });
}
function getColumnsOID(colArr) {
    var title = [
        { field: "InspectBookId", title: "InspectBookId", hidden: true, },
        { field: "InspectObjectCode", title: "编号",},
        { field: "InspectTime", title: "点检时间", },
        {
            field: "Judge", title: "点检结果", formatter: function (value, row, index) {
                if (value == 'OK') {
                    return '<span style="color:green;">OK</span>';
                } else if (value == 'NG') {
                    return '<span style="color:red;">NG</span>';
                }
            }  },
    ];
    var arr = colArr.split(',');
    for (var i = 0; i < arr.length; i++) {
        title.push({ field: arr[i] + '_Value', title: arr[i], });
        title.push({ field: arr[i] + '_CheckType', title: '基准', });
        title.push({
            field: arr[i] + '_Judge', title: '判定', formatter: function (value, row, index) {
                if (value == 'OK') {
                    return '<span style="color:green;">OK</span>';
                } else if (value == 'NG') {
                    return '<span style="color:red;">NG</span>';
                }
            } });
    }
    return [title];
}

function initOIDClick() {

    //点击查询按钮
    $('#btnOIDSearch').click(function () {
        initOIDTable();
    });

}
function getOIDSearchParam() {
    var timeBegin = $('#searchOIDtimeBegin').val();
    var timeEnd = $('#searchOIDtimeEnd').val();
    var InspectObjectCode = $('#searchOIDInspectObjectCode').val();
    var param = { InspectObjectCode: InspectObjectCode, TimeBegin: timeBegin, TimeEnd: timeEnd }
    return param;
}


 src/DIXWeb.Web/Views/Home/Index.cshtml

@@ -52,8 +52,8 @@
                if (firstMenu.isvisible > 0 && firstMenu.parentCode == "-1")
                {
                    <a class="main_item" href="javascript:void(0)" title="@firstMenu.text"><i class="icon @firstMenu.icon"></i><span>@firstMenu.text</span></a>
                    <div class="menu_sub">
                        <dl>
                    <div class="menu_sub" style="overflow-y:scroll;">
                        <dl >
                            @foreach (var secondMenu in firstMenu.children)
                            {
                                if (secondMenu.isvisible > 0)
@@ -107,6 +107,9 @@
                $container.find("a.main_item_active").removeClass("main_item_active");
                $container.find("a.sub_item_active").removeClass("sub_item_active");
                $(this).addClass("main_item_active");

                $("#menu").removeAttr('style');

            });

            $container.on("click", "a.sub_item", function () {
@@ -114,7 +117,6 @@
                $container.find("a.sub_item_active").removeClass("sub_item_active");

                $(this).addClass("sub_item_active");

            });



 src/DIXWeb.Web/Views/MotifInfo/RunForm.cshtml

@@ -7,6 +7,7 @@

</div>


<script>
    var rootUrl = '@Url.Content("~/")';
    var formWidth = 500;

 src/WindowsFormsApp1/Form1.cs

@@ -473,7 +473,6 @@
        /// </summary>
        public string Toprie_MotifList(){


            try {

                #region 初始化

 src/WindowsFormsApp1/Helper/MqttconfigHelp.cs

@@ -8,7 +8,7 @@
{
    public static class MqttconfigHelp
    { 
       public const string BrokerAddress = "10.110.4.125";
       public const string BrokerAddress = "172.23.13.31";

        public const int BrokerPort =1883;
        public const string UserName = "MQTT";