页面布局默认样式修改

Signed-off-by: TanYibin <5491541@qq.com>

页面布局默认样式修改
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent f6233d0f
Showing 5 changed files with 21 additions and 43 deletions
ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
ant-design-vue-jeecg/src/defaultSettings.js
ant-design-vue-jeecg/src/views/system/UserList.vue
ant-design-vue-jeecg/src/views/system/inventory/subTables/InventoryDetailSubTable.vue
ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue
@@ -403,7 +403,7 @@ body {
  
           .logo.top-nav-header {
             text-align: center;
-            width: 56px;
+            width: 58px;
             line-height: 58px;
           }
         }
@@ -470,10 +470,10 @@ body {
         display: flex;
  
         .logo.top-nav-header {
-          width: 165px;
-          height: 64px;
+          width: 160px;
+          height: 58px;
           position: relative;
-          line-height: 64px;
+          line-height: 58px;
           transition: all .3s;
           overflow: hidden;
  
@@ -15,11 +15,11 @@
  
 export default {
   primaryColor: '#1890FF', // primary color of ant design
-  navTheme: 'light', // theme for nav menu
+  navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: false, // sticky header
-  fixSiderbar: false, // sticky siderbar
+  fixSiderbar: true, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
   multipage: true, //默认多页签模式
@@ -290,7 +290,7 @@ export default {
           title: '所属仓库',
           align: "center",
           dataIndex: 'selectedWarehouses',
-          width: 300,
+          width: 240,
           key: 'selectedWarehouses',
           scopedSlots: {customRender: 'selectedWarehouses'}
         },
@@ -298,7 +298,7 @@ export default {
           title: '所属库区',
           align: "center",
           dataIndex: 'zoneCodes',
-          width: 300,
+          width: 240,
           key: 'zoneCodes',
           scopedSlots: {customRender: 'zoneCodes'}
         },
@@ -18,7 +18,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
  
         <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
@@ -92,9 +91,9 @@ export default {
       columns: [
         {
           title: '库存详情ID',
-
           align: 'center',
-          dataIndex: 'id'
+          dataIndex: 'id',
+          fixed: 'left',
         },
         {
           title: '货主',
@@ -124,6 +123,11 @@ export default {
           dataIndex: 'containerCode'
         },
         {
+          title: '序列号',
+          align: 'center',
+          dataIndex: 'sn'
+        },
+        {
           title: '物料编码',
           align: 'center',
           dataIndex: 'materialCode'
@@ -165,11 +169,6 @@ export default {
           dataIndex: 'batch'
         },
         {
-          title: '序列号',
-          align: 'center',
-          dataIndex: 'sn'
-        },
-        {
           title: '入库日期',
           align: "center",
           dataIndex: 'receiptDate'
@@ -198,10 +197,12 @@ export default {
           title: '更新日期',
           align: 'center',
           dataIndex: 'updateTime'
-        },
+        }
       ],
       url: {
-        importUrl: "/inventory/inventoryHeader/importInventoryDetail",
+        list: '/InventoryMaterialSummary/inventoryMaterialSummary/inventoryMaterialSummaryChild',
+        exportXlsUrl: '/InventoryMaterialSummary/inventoryMaterialSummary/exportXls',
+        importExcelUrl: 'InventoryMaterialSummary/inventoryMaterialSummary/importExcel'
       },
       dictOptions: {
         containerStatus: []
@@ -89,35 +89,12 @@
             </a-tag>
         </span>
  
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">下载
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
           <a v-if="record.status == 1" v-has="'agvTask:executeTask'" @click="executeAgvTask(record)">
             <a-button type="primary">执行</a-button><a-divider type="vertical"/></a>
-
-          <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'"
-                        @confirm="() => handleDelete(record.id)">
-            <a><a-button type="danger">取消</a-button> <a-divider type="vertical"/></a>
+          <a-popconfirm v-if="record.status < 100" title="确定删除吗?" v-has="'agvTask:delete'" @confirm="() => handleDelete(record.id)">
+            <a><a-button type="danger">取消</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">