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

ahai

2023-06-01 cfb994c89bda94f5d0b2fba4dbc537edc653f877

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.Web/DIXWeb.Web.csproj

@@ -1652,6 +1652,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/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";