merge: fix

src/pages/log/omsLog/index.less

@@ -6,7 +6,7 @@
         min-width: 1030px;
     }
     .chart{
-        padding: 16px;
+        padding: 10px;
         background: white;
     }
     .table{
@@ -17,7 +17,7 @@
             color:rgba(0,0,0,0.85);
         }
         .ant-table-content{
-            height:calc(100vh - 500px);
+            height:calc(100vh - 520px);
             border-right: white;
             overflow: auto !important;
         }

src/pages/platformCenter/dictionary/WebDic.js

@@ -240,7 +240,9 @@ const WebDic = () => {
       .then(res => {
         if (res.success) {
           getData(select.parentID);
-          setSubData([]);
+          if (select.parentID === '-1') {
+            setSubData([]);
+          }
           notification.success({
             message: '删除成功',
           });

src/pages/platformCenter/dictionary/index.js

@@ -14,7 +14,7 @@ const dictionary = () => {
           <TabPane tab="通用数据字典" key="1">
             <WebDic />
           </TabPane>
-          <TabPane tab="app数据字典" key="2" type="card">
+          <TabPane tab="App数据字典" key="2" type="card">
             <AppDic />
           </TabPane>
         </Tabs>

src/routes/config.js

@@ -76,12 +76,6 @@ export default {
           component: BlankLayout,
           authority: adminAuthority,
           routes: [
-            // {
-            //   path: '/dbm/solution',
-            //   name: '数据库解决方案',
-            //   authority: superAuthority,
-            //   component: CurrentSolution,
-            // },
             {
               path: '/dbm/dbInit',
               name: '数据库连接',
@@ -156,6 +150,28 @@ export default {
                 },
               ],
             },
+            {
+              path: '/platformCenter/iot',
+              name: '物联网平台',
+              component: BaseFrameContainer,
+              tabs: [
+                {
+                  tabName: '模型类型',
+                  url:
+                    '/web4/?widget=configuration/ConfigurationsOperationV1/ModelTypeManage/ModelTypeManage|hideMap=true',
+                },
+                {
+                  tabName: '模型文件',
+                  url:
+                    '/web4/?widget=configuration/ConfigurationsOperationV1/ModelFileManage/ModelFileManage|hideMap=true',
+                },
+                {
+                  tabName: '画板管理',
+                  url:
+                    '/web4/?widget=configuration/ConfigurationsOperationV1/DrawBoardManage/DrawBoardManage|hideMap=true',
+                },
+              ],
+            },
             // {
             //   path: '/platformCenter/order',
             //   name: '工单平台',
@@ -194,7 +210,7 @@ export default {
             },
             {
               path: '/platformCenter/dictionary',
-              name: '数据字典',
+              name: '数据中心',
               component: Dictionary,
             },
           ],
@@ -208,7 +224,7 @@ export default {
           routes: [
             {
               path: '/productCenter/web',
-              name: 'web配置',
+              name: 'Web配置',
               component: WebConfigPage,
             },
             {