Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
yf_nkx
/
agmp_iot_jetlinks_ui
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Browse Source

fix: merge

wzyyy 3 years atrás
parent
01634006d7
commit
e83a1e0ca3
5 changed files with 21 additions and 44 deletions
Split View Show Diff Stats
  1. 5 0
      src/global.less
  2. 5 1
      src/pages/device/Instance/Detail/Info/index.tsx
  3. 6 2
      src/pages/device/Product/Detail/BaseInfo/index.tsx
  4. 4 3
      src/pages/device/components/Metadata/Cat/index.tsx
  5. 1 38
      src/pages/home/device/index.tsx

+ 5 - 0
src/global.less
Ver Ficheiro 

@@ -139,3 +139,8 @@ input[type='number'],
 
 input[type='tel'] {
 
   box-shadow: inset 0 0 0 100vw white !important;
 
 }
 
+
 
+//引导遮罩
 
+#driver-page-overlay{
 
+  opacity: 0.35 !important;
 
+}

+ 5 - 1
src/pages/device/Instance/Detail/Info/index.tsx
Ver Ficheiro 

@@ -66,7 +66,11 @@ const Info = observer(() => {
 
             </Tooltip>
 
           </Descriptions.Item>
 
           <Descriptions.Item label={'产品分类'}>
 
-            {InstanceModel.detail?.classifiedName}
 
+          <Tooltip placement="topLeft" title= {InstanceModel.detail?.classifiedName}>
 
+              <div className="ellipsis" style={{ maxWidth: 250 }}>
 
+              {InstanceModel.detail?.classifiedName}
 
+              </div>
 
+            </Tooltip>
 
           </Descriptions.Item>
 
           <Descriptions.Item
 
             label={intl.formatMessage({

+ 6 - 2
src/pages/device/Product/Detail/BaseInfo/index.tsx
Ver Ficheiro 

@@ -181,10 +181,14 @@ const BaseInfo = (props: BaseInfoProps) => {
 
         <Descriptions.Item
 
           label={intl.formatMessage({
 
             id: 'pages.device.productDetail.classifiedName',
 
-            defaultMessage: '所属品类',
 
+            defaultMessage: '产品分类',
 
           })}
 
         >
 
-          {productModel.current?.classifiedName}
 
+          <Tooltip placement="topLeft" title={productModel.current?.classifiedName}>
 
+            <div className="ellipsis-70" style={{ width: 300 }}>
 
+            {productModel.current?.classifiedName}
 
+            </div>
 
+          </Tooltip>
 
         </Descriptions.Item>
 
         <Descriptions.Item
 
           label={intl.formatMessage({

+ 4 - 3
src/pages/device/components/Metadata/Cat/index.tsx
Ver Ficheiro 

@@ -62,6 +62,7 @@ const Cat = observer((props: Props) => {
 
     <Drawer
 
       maskClosable={false}
 
       title="查看物模型"
 
+      width={'40%'}
 
       onClose={() => props.close()}
 
       visible={props.visible}
 
       extra={
 
@@ -81,8 +82,8 @@ const Cat = observer((props: Props) => {
 
         </Space>
 
       }
 
     >
 
-      <div style={{ background: 'rgb(236, 237, 238)' }}>
 
-        <p style={{ padding: 10 }}>
 
+      <div style={{ background: '#F6F6F6' }}>
 
+        <p style={{ padding: 10 ,color:'rgba(0, 0, 0, 0.55)'}}>
 
           物模型是对设备在云端的功能描述，包括设备的属性、服务和事件。物联网平台通过定义一种物的描述语言来描述物模型，称之为
 
           TSL（即 Thing Specification Language），采用 JSON 格式，您可以根据 TSL
 
           组装上报设备的数据。您可以导出完整物模型，用于云端应用开发。
 
@@ -93,7 +94,7 @@ const Cat = observer((props: Props) => {
 
           <Tabs.TabPane tab={item.name} tabKey={item.id} key={item.id}>
 
             <div style={{ border: '1px solid #eee' }}>
 
               <MonacoEditor
 
-                height={350}
 
+                height={670}
 
                 theme="vs"
 
                 language="json"
 
                 value={value}

+ 1 - 38
src/pages/home/device/index.tsx
Ver Ficheiro 

@@ -206,44 +206,7 @@ const Device = () => {
 
           ]}
 
         />
 
       </Col>
 
-      <Col span={6}>
 
-        <Statistics
 
-          style={{ gridTemplateColumns: 'repeat(1, 1fr)' }}
 
-          // height={448}
 
-          data={[
 
-            {
 
-              name: '产品数量',
 
-              value: productCount,
 
-              children: '',
 
-            },
 
-            {
 
-              name: '设备数量',
 
-              value: deviceCount,
 
-              children: '',
 
-            },
 
-          ]}
 
-          title="设备统计"
 
-          extra={
 
-            <div style={{ fontSize: 14, fontWeight: 400 }}>
 
-              <a
 
-                onClick={() => {
 
-                  const url = getMenuPathByCode(MENUS_CODE['device/DashBoard']);
 
-                  if (!!url) {
 
-                    history.push(`${url}`);
 
-                  } else {
 
-                    message.warning('暂无权限，请联系管理员');
 
-                  }
 
-                }}
 
-              >
 
-                详情
 
-              </a>
 
-            </div>
 
-          }
 
-        />
 
-      </Col>
 
-      <Col span={24} style={{ marginTop: 24 }}>
 
-        <Body title={'平台架构图'} english={'PLATFORM ARCHITECTURE DIAGRAM'} />
 
-      </Col>
 
+
 
 
       <ProductChoose
 
         visible={productVisible}