Merge branch 'dev_upgrade' of http://172.16.10.76/station/amos-convertor-view into dev

amos.config.js

@@ -32,6 +32,7 @@
     },
     // 系统配置信息 主要是为了区分各子系统
     sysConf: {
+      sessionOrgCode: '10*11',
       needHeartBeat: true,
       //是否自动打开业务屏,true是，false否
       isAutoOpenBussiness: true,

src/utils/FileUtils.js

@@ -66,8 +66,8 @@ export const downLoadFilePost = (url,searchParam)=>{
       'Content-Type': 'application/json; charset=utf-8',
       'X-Api-Key': _amosTool.Store.getCookieByName(apiKey),
       'X-Access-Token': ls.read(token),
-      'appKey': 'CONVERTER_STATION',
-      'product': 'CONVERTER_STATION_WEB',
+      'appKey': window.appKey,
+      'product': window.product,
        'token':ls.read(token)
     },
     body: JSON.stringify(searchParam)

src/utils/request.js

@@ -14,8 +14,8 @@ const defaultPageable = {
 };
 
 const defaultHeaders = {
-  appKey: 'CONVERTER_STATION',
-  product: 'CONVERTER_STATION_WEB',
+  appKey: window.appKey ,
+  product: window.product,
   channelType: '3dpage'
 };
 

src/view/bizview/equipmentLedger/Equipment/EquipmentFireEquipmentAdd.js

@@ -23,32 +23,43 @@ const fireEquipmentTableColumns = self => {
       title: '编号',
       dataIndex: 'code',
       key: 'code',
-      width: '15%'
+      width: '10%'
     },
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      width: '15%'
+      width: '10%'
     },
     {
       title: '分类',
       dataIndex: 'type',
       key: 'type',
-      width: '15%'
+      width: '10%'
     },
     {
-      title: '状态',
-      dataIndex: 'isbind',
-      key: 'isbind',
-      width: '10%',
-      render: text => text === 'YES' ? '已绑定设备' : ''
+      title: '所属系统',
+      dataIndex: 'systemName',
+      key: 'systemName',
+      width: '10%'
+    },
+    {
+      title: '物联编码',
+      dataIndex: 'iotCode',
+      key: 'iotCode',
+      width: '10%'
+    },
+    {
+      title: '编码',
+      dataIndex: 'specificCode',
+      key: 'specificCode',
+      width: '10%'
     },
     {
       title: '位置',
       dataIndex: 'address',
       key: 'address',
-      width: '20%'
+      width: '15%'
     },
     {
       title: '数量',

src/view/bizview/equipmentLedger/Equipment/MatchEquipment.js

@@ -26,22 +26,34 @@ const matchEquipmentTableColumns = self => {
       render: (text, record, index) => `${index + 1}`
     },
     {
-      title: '编号',
-      dataIndex: 'code',
-      key: 'code',
-      width: '30%'
+      title: '装备编号',
+      dataIndex: 'specificCode',
+      key: 'specificCode',
+      width: '15%'
     },
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      width: '30%'
+      width: '15%'
+    },
+    {
+      title: 'IOT编码',
+      dataIndex: 'iotCode',
+      key: 'iotCode',
+      width: '15%'
+    },
+    {
+      title: '系统名称',
+      dataIndex: 'systemName',
+      key: 'systemName',
+      width: '15%'
     },
     {
       title: '位置',
       dataIndex: 'address',
       key: 'address',
-      width: '40%'
+      width: '15%'
     }
   ];
 };

src/view/bizview/equipmentLedger/Equipment/index.js

@@ -293,8 +293,8 @@ class Equipment extends Component {
                 'Accept': 'application/json;charset=UTF-8',
                 'X-Api-Key': _amosTool.Store.getCookieByName(apiKey),
                 'X-Access-Token': ls.read(token),
-                'appKey': 'CONVERTER_STATION',
-                'product': 'CONVERTER_STATION_WEB',
+                'appKey': window.appKey ,
+                'product': window.product,
                  'token':ls.read(token)
               },
               body: formData

src/view/bizview/equipmentLedger/FireResources/FireEquipment/FireEquipmentToolBar.js

@@ -69,9 +69,9 @@ class FireEquipmentToolBar extends Component {
       showUploadList: false ,
       headers: {
         'Accept': 'application/json;charset=UTF-8',
-        'X-Access-Token': lsTool.read(SysConsts.token),
-        'appKey': 'CONVERTER_STATION',
-        'product': 'CONVERTER_STATION_WEB',
+        'X-Access-Token': lsTool.read(SysConsts.token), 
+        'appKey': window.appKey ,
+        'product': window.product,
          'token':lsTool.read(SysConsts.token)
       },
       onChange(info) {

src/view/bizview/equipmentLedger/FireResources/FireEquipment/PointToolBar.js

@@ -66,8 +66,8 @@ class PointToolBar extends Component {
       headers: {
         'Accept': 'application/json;charset=UTF-8',
         'X-Access-Token': lsTool.read(SysConsts.token),
-        'appKey': 'CONVERTER_STATION',
-        'product': 'CONVERTER_STATION_WEB',
+        'appKey': window.appKey ,
+        'product': window.product,
          'token':lsTool.read(SysConsts.token)
       },
       onChange(info) {

src/view/bizview/equipmentLedger/FireResources/FireStation/fireStation.js

@@ -30,28 +30,47 @@ const fireStationTableColumns = self => {
       render: (text, record, index) => `${index + 1}`
     },
     {
-      title: '编号',
-      dataIndex: 'code',
-      key: 'code',
+      title: '装备编号',
+      dataIndex: 'specificCode',
+      key: 'specificCode',
       width: '10%'
     },
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      width: '25%'
+      width: '15%'
+    },
+    {
+      title: '状态',
+      dataIndex: 'isbind',
+      key: 'isbind',
+      width: '10%',
+      render: text => text === 'YES' ? '已绑定设备' : ''
+    },
+    {
+      title: 'IOT编码',
+      dataIndex: 'iotCode',
+      key: 'iotCode',
+      width: '10%'
     },
     {
       title: '所属区域',
       dataIndex: 'riskSourceName',
       key: 'riskSourceName',
-      width: '25%'
+      width: '15%'
+    },
+    {
+      title: '系统名称',
+      dataIndex: 'systemName',
+      key: 'systemName',
+      width: '10%'
     },
     {
       title: '位置',
       dataIndex: 'address',
       key: 'address',
-      width: '24%'
+      width: '15%'
     },
     {
       title: '配套设备',

src/view/bizview/equipmentLedger/FireResources/FireTruck/FireTruckDetailInfo.js

@@ -208,9 +208,9 @@ class FireTruckDetailInfo extends Component {
           headers: {
             Accept: 'application/json;charset=UTF-8',
             'X-Api-Key': _amosTool.Store.getCookieByName(apiKey),
-            'X-Access-Token': ls.read(token),
-            'appKey': 'CONVERTER_STATION',
-            'product': 'CONVERTER_STATION_WEB',
+            'X-Access-Token': ls.read(token), 
+            'appKey': window.appKey ,
+            'product': window.product,
              'token':ls.read(token)
           },
           body: formData

src/view/bizview/equipmentLedger/FireResources/water/FireWaterToolBar.js

@@ -49,9 +49,9 @@ class FireWaterToolBar extends Component {
       showUploadList: false ,
       headers: {
         'Accept': 'application/json;charset=UTF-8',
-        'X-Access-Token': lsTool.read(SysConsts.token),
-        'appKey': 'CONVERTER_STATION',
-        'product': 'CONVERTER_STATION_WEB',
+        'X-Access-Token': lsTool.read(SysConsts.token), 
+        'appKey': window.appKey ,
+        'product': window.product,
          'token':lsTool.read(SysConsts.token)
       },
       onChange(info) {

src/view/bizview/equipmentLedger/Monitor/index.js

@@ -286,9 +286,9 @@ class Monitor extends Component {
       showUploadList: false ,
       headers: {
         'Accept': 'application/json;charset=UTF-8',
-        'X-Access-Token': lsTool.read(SysConsts.token),
-        'appKey': 'CONVERTER_STATION',
-        'product': 'CONVERTER_STATION_WEB',
+        'X-Access-Token': lsTool.read(SysConsts.token), 
+        'appKey': window.appKey ,
+        'product': window.product,
          'token':lsTool.read(SysConsts.token)
       },
       onChange(info) {

src/view/bizview/fireRectification/index.js

@@ -392,9 +392,9 @@ class FireRectification extends Component {
         headers: {
           Accept: 'application/json;charset=UTF-8',
           'X-Api-Key': _amosTool.Store.getCookieByName(apiKey),
-          'X-Access-Token': ls.read(token),
-          'appKey': 'CONVERTER_STATION',
-          'product': 'CONVERTER_STATION_WEB',
+          'X-Access-Token': ls.read(token), 
+          'appKey': window.appKey ,
+          'product': window.product,
           'token': ls.read(token)
         },
         body: formData

src/view/planMgmt/cusVizLib/index.js

@@ -76,9 +76,9 @@ class CusVizLib extends Component {
         headers: {
           'Accept': 'application/json;charset=UTF-8',
           'X-Api-Key': _amosTool.Store.getCookieByName(apiKey),
-          'X-Access-Token': ls.read(token),
-          'appKey': 'CONVERTER_STATION',
-          'product': 'CONVERTER_STATION_WEB',
+          'X-Access-Token': ls.read(token), 
+          'appKey': window.appKey ,
+          'product': window.product,
            'token':ls.read(token)
         },
         body: formData