修改资源加载路径为相对路径

src/consts/urlConsts.js

@@ -93,7 +93,7 @@ export const FscSerUrl = {
   //*******************************************************************************
   // 巡检业务
   //*******************************************************************************
-  fetchCheckDetailById: completePrefix(patrolURI, 'patrol/api/spc/check-detail'), //根据ID查询巡检记录详情
+  fetchCheckDetailById: completePrefix(patrolURI, 'api/spc/check-detail'), //根据ID查询巡检记录详情
   fetchCheckInputById: completePrefix(patrolURI, 'api/spc/check-input'), //根据ID查询巡检记录项
   fetchUserByPd: completePrefix(patrolURI, 'api/spc/check-user'),//巡检人员查询
   fetchCheckInfoByPd: completePrefix(patrolURI, 'api/spc/check-info/list'),//巡检记录查询

src/view/3dview/conf.js

@@ -9,12 +9,12 @@ import { getRegion } from './../../utils/cacheUtils';
 const { getInnerSkybox } = backgroundHelpers;
 
 const customSkybox = backgroundHelpers.createBackground({
-  basePath: '/threeres/bg/bluesky/',
+  basePath: './threeres/bg/bluesky/',
   names: ['posx.jpg', 'negx.jpg', 'posy.jpg', 'negy.jpg', 'posz.jpg', 'negz.jpg']
 });
 
 const getMaterial = () => {
-  const groundTexture = TextureFactory.createTextureByUrl('/threeres/mesh/grid-gray.jpg', {
+  const groundTexture = TextureFactory.createTextureByUrl('./threeres/mesh/grid-gray.jpg', {
     wrapS: THREE.RepeatWrapping,
     wrapT: THREE.RepeatWrapping,
     anisotropy: 16

src/view/3dview/moduleEditConf.js

@@ -9,12 +9,12 @@ import { getRegion } from '../../utils/cacheUtils';
 const { getInnerSkybox } = backgroundHelpers;
 
 const customSkybox = backgroundHelpers.createBackground({
-  basePath: '/threeres/bg/bluesky/',
+  basePath: './threeres/bg/bluesky/',
   names: ['posx.jpg', 'negx.jpg', 'posy.jpg', 'negy.jpg', 'posz.jpg', 'negz.jpg']
 });
 
 const getMaterial = () => {
-  const groundTexture = TextureFactory.createTextureByUrl('/threeres/mesh/grid-gray.jpg', {
+  const groundTexture = TextureFactory.createTextureByUrl('./threeres/mesh/grid-gray.jpg', {
     wrapS: THREE.RepeatWrapping,
     wrapT: THREE.RepeatWrapping,
     anisotropy: 16

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

@@ -4,11 +4,11 @@ import { Input } from 'amos-framework';
 import { TreeSelect } from 'amos-antd';
 import AmosGridTable from './../../common/tableComponent/table/AmosGridTable';
 // import { getFireEquipmentListAction } from './../../../../services/ledgerService';
-import { getFiltersAction,getFireEquipmentListsActionV2 } from './../../../../services/ledgerService';
+import { getFiltersAction, getFireEquipmentListsActionV2 } from './../../../../services/ledgerService';
 import EditableCell from './../../common/editableCell/EditableCell';
 import '../index.scss';
 
-const fireEquipmentTableColumns = self => {
+const fireEquipmentTableColumns = (self) => {
   return [
     {
       title: '序号',
@@ -68,8 +68,8 @@ const fireEquipmentTableColumns = self => {
       dataIndex: 'single',
       key: 'single',
       width: '10%',
-      render: (text, record,index) =>
-        <EditableCell value={text}  num={record.amount}  onChange={(text) => self.onCellChange(record, text,index)} />
+      render: (text, record, index) =>
+        <EditableCell value={text} num={record.amount} onChange={text => self.onCellChange(record, text, index)} />
     }
   ];
 };
@@ -92,18 +92,18 @@ class EquipmentFireEquipmentAdd extends Component {
       pagination: true,
       selectedRows: [],
       selectedRowKeys: [],
-      dataList: [], //表格数据集合
-      size: 'small', //表格大小
+      dataList: [], // 表格数据集合
+      size: 'small', // 表格大小
       searchParam: { equipClassify: '0,1,2,3' },
-      totals: 0, //所有数据总和
+      totals: 0, // 所有数据总和
       requestParam: [],
-      showDetail: true, //是否显示详情
-      truckId: 0, //消防车id
-      enableConfig: false, //是否打开配置监测点页面
-      numberInStation: 1, //添加设备数量
-      unitInStation: '',  //添加设备单位
-      fireEquipmentId: 0, //设备ID
-      filterData: [] //装备9大类
+      showDetail: true, // 是否显示详情
+      truckId: 0, // 消防车id
+      enableConfig: false, // 是否打开配置监测点页面
+      numberInStation: 1, // 添加设备数量
+      unitInStation: '', // 添加设备单位
+      fireEquipmentId: 0, // 设备ID
+      filterData: [] // 装备9大类
     };
   }
 
@@ -121,6 +121,7 @@ class EquipmentFireEquipmentAdd extends Component {
     searchParam.equipmentId = value;
     searchParam.pageNumber = this.pageConfig.pageNumber;
     searchParam.pageSize = this.pageConfig.pageSize;
+    searchParam.type = true; // 此处true表示的是模糊查询功能
     this.setState({
       searchParam
     }, () => this.getFireEquipmentListData(searchParam));
@@ -137,7 +138,7 @@ class EquipmentFireEquipmentAdd extends Component {
     }, () => this.getFireEquipmentListData(searchParam));
   };
 
-  onCellChange = (record, text,index) => {
+  onCellChange = (record, text, index) => {
     // if ( text !== ''){
     //   const { dataList } = this.state;
     //   dataList[index].amount = text;
@@ -157,19 +158,22 @@ class EquipmentFireEquipmentAdd extends Component {
     });
   };
 
-  getFilter =() =>{
-    getFiltersAction().then( filterData =>{
+  getFilter =() => {
+    getFiltersAction().then((filterData) => {
       filterData = this.formatterCategory(filterData);
       this.setState({ filterData });
     });
   }
 
-  getFireEquipmentListData = param => {
+  getFireEquipmentListData = (param) => {
     const { searchParam } = this.state;
     if (param.current != null) {
-      //前端的current 即后端的pageNumber
+      // 前端的current 即后端的pageNumber
       param.pageNumber = param.current;
     }
+    if (param.type) {
+      param.pageNumber = 0;
+    }
     Object.assign(searchParam, { ...param });
     // getFireEquipmentListAction(searchParam, param.pageNumber, param.pageSize).then(data => {
     //   this.setState({
@@ -177,7 +181,7 @@ class EquipmentFireEquipmentAdd extends Component {
     //     totalCount: data.totalElements
     //   });
     // });
-    getFireEquipmentListsActionV2(searchParam, param.equipmentId, param.pageNumber, param.pageSize).then(data => {
+    getFireEquipmentListsActionV2(searchParam, param.equipmentId, param.pageNumber, param.pageSize).then((data) => {
       this.setState({
         dataList: data.content,
         totalCount: data.totalElements
@@ -226,7 +230,7 @@ class EquipmentFireEquipmentAdd extends Component {
   /**
    * 获取表格刷新方法
    */
-  reload = r => {
+  reload = (r) => {
     this.setState(
       {
         reload: () => {
@@ -243,27 +247,27 @@ class EquipmentFireEquipmentAdd extends Component {
     const _true_ = true;
 
     return (
-      <div className="equipment-fire-equipment" style={{ background: '#33333', height: '100%' }}>
-        <div className="equipment-fire-equipment-search">
+      <div className='equipment-fire-equipment' style={{ background: '#33333', height: '100%' }}>
+        <div className='equipment-fire-equipment-search'>
           <div>
             <span>分类：</span>
             <TreeSelect
               dropdownStyle={{ maxHeight: 400, overflow: 'auto', width: 250 }}
               treeData={filterData}
-              placeholder="请选择"
+              placeholder='请选择'
               treeDefaultExpandAll
               allowClear
               showSearch
-              treeNodeFilterProp="title"
+              treeNodeFilterProp='title'
               filterTreeNode={(inputValue, treeNode) => treeNode.props.title.toLocaleLowerCase().includes(inputValue.toLocaleLowerCase())}
-              onChange={(value, b)=> this.onSelectChange(value)}
+              onChange={(value, b) => this.onSelectChange(value)}
             />
             {/* <span>名称：</span> */}
-            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder="按名称搜索" />
+            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder='按名称搜索' />
           </div>
         </div>
         <AmosGridTable
-          rowKey="id"
+          rowKey='id'
           columns={fireEquipmentTableColumns(this)}
           callBack={this.reload}
           dataList={dataList}

src/view/mainframe/BizFrame.js

@@ -58,7 +58,7 @@ class BizFrame extends Component {
   };
 
   componentDidMount() {
-    updateLinkCss(`/themes/${window.CheckDefaultTheme}.css`);
+    updateLinkCss(`./themes/${window.CheckDefaultTheme}.css`);
     const is = window.location.href.indexOf('isShow=');
     if (is !== -1) {
       const header = document.getElementsByClassName('header')[0];

src/view/morphic/index.js

-import React, { Component } from 'react';
-import { Connect, Scrollbars } from 'amos-framework';
-import { utils } from 'amos-tool';
-//import { MorphicPublishView } from './amosmorphic';
-import * as endConf from 'amos-processor/lib/config/endconf';
+// import React, { Component } from 'react';
+// import { Connect, Scrollbars } from 'amos-framework';
+// import { utils } from 'amos-tool';
+// //import { MorphicPublishView } from './amosmorphic';
+// import * as endConf from 'amos-processor/lib/config/endconf';
 
-const AmosConfig = endConf.AmosConfig;
+// const AmosConfig = endConf.AmosConfig;
 
-const appId = AmosConfig.morphic.appId;
-const sceneIndex = AmosConfig.morphic.sceneIndex;
+// const appId = AmosConfig.morphic.appId;
+// const sceneIndex = AmosConfig.morphic.sceneIndex;
 
-class RealTimeMonitor extends Component {
-  constructor(props) {
-    super(props);
-  }
+// class RealTimeMonitor extends Component {
+//   constructor(props) {
+//     super(props);
+//   }
 
-  render() {
-   // return (
-      // <MorphicPublishView
-      //  appId={appId}
-      //  sceneIndex={sceneIndex}
-     // />
-   // );
-  }
-}
+//   render() {
+//    // return (
+//       // <MorphicPublishView
+//       //  appId={appId}
+//       //  sceneIndex={sceneIndex}
+//      // />
+//    // );
+//   }
+// }
 
-export default RealTimeMonitor;
+// export default RealTimeMonitor;

themes/transparent.css

-@import './transparent.scss';
-@import '~amos-framework/lib/styles/mixins/scrollbar.scss';
+
 
 .amos-main-content {
   background: url('../src/assets/indexBcakground.png');
@@ -37,7 +36,7 @@
   border-left: 1px solid #1f5383;
 }
 
-.ant-table-fixed-header .ant-table-body >table {
+.ant-table-fixed-header .ant-table-body > table {
   border-left: 1px solid #1f5383;
 }
 
@@ -1631,3 +1630,6 @@ li.ant-calendar-time-picker-select-option-selected {
 .dutyPage .centerContent .weekHeader .weekItem {
   color: white;
 }
+.ant-table-bordered .ant-table-body > table {
+  border: 1px solid #1f5383 !important;
+}

tpl.html

@@ -6,8 +6,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <script type="application/javascript" src="/amos.config.js"></script>
-  <script src="http://webapi.amap.com/maps?v=1.4.3&key=8afbcd8006fcd36a22136ef20a12456a"></script>
+  <script type="application/javascript" src="./amos.config.js"></script>
+  <!--<script src="http://webapi.amap.com/maps?v=1.4.3&key=8afbcd8006fcd36a22136ef20a12456a"></script>-->
   <title>IFC100消防指挥系统</title>
   <script>
     window.offlineMap = {
@@ -35,7 +35,7 @@
 
 <body>
   <div id="startload" class="startload">
-    <img src="/src/assets/loading/toip-loading.gif" width="100px">
+    <img src="./src/assets/loading/toip-loading.gif" width="100px">
   </div>
   <div id="app"></div>
   <script>

webpack.config.js

@@ -55,13 +55,15 @@ const config = {
 
 const defaultConfig = simpleConfig(config);
 
+defaultConfig.output.publicPath = '';
+
 // 插入第三方脚本
-defaultConfig.plugins.push(
-  new HtmlInlineCodePlugin([
-    { inject: 'body', begin: true, tag: 'script',  attr: { src: '/extra/convertor3d/graphmod.eec79d185151b59c1fda.js' } },
-    { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.c4c6a3fe3a78c939709a.js' } }
- ])
-);
+// defaultConfig.plugins.push(
+//   new HtmlInlineCodePlugin([
+//     { inject: 'body', begin: true, tag: 'script',  attr: { src: '/extra/convertor3d/graphmod.eec79d185151b59c1fda.js' } },
+//     { inject: 'body', begin: false, tag: 'script',  attr: { src: '/extra/convertor3d/worker.c4c6a3fe3a78c939709a.js' } }
+//  ])
+// );
 
 defaultConfig.name = 'amos-tpl';