Parcourir la source

很多的细节小的改动

sujunling il y a 1 an
Parent
commit
005a9b44be

+ 14 - 3
src/views/assembly/library/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable :rowSelection="{ type: 'checkbox' }" @register="registerTable" :clickToRowSelect="false">
+    <BasicTable :rowSelection="{ type: 'checkbox' }" @register="registerTable" :clickToRowSelect="false" class="zjsqkList">
       <template #toolbar>
         <Authority>
           <a-button style="background-color: rgb(252, 139, 1); color: rgb(255, 255, 255);border: none;" type="primary"
@@ -78,9 +78,15 @@
       <template #shr="{ record }">
         <span :id="'shr' + record.id">{{ getUser(record, `shr${record.id}`) }}</span>
       </template>
+      <template #tjsqsj="{ record }">
+        {{ record?.tjsqsj?.replace('.0', '') }}
+      </template>
       <template #shyj="{ record }">
         <span :id="'shyj' + record.id">{{ getYJ(record, `shyj${record.id}`) }}</span>
       </template>
+      <template #index="{ index }">
+        {{ index + 1 }}
+      </template>
       <template #status="{ record }">
         <Tag :style="`color:${record.shzt == '未提交' ? 'red' : '#05B069'};`">
           {{
@@ -134,9 +140,9 @@ export default defineComponent({
       useSearchForm: true,
       showTableSetting: true,
       bordered: true,
-      showIndexColumn: true,
+      showIndexColumn: false,
       actionColumn: {
-        width: 200,
+        width: 170,
         title: '操作',
         dataIndex: 'action',
         slots: { customRender: 'action' },
@@ -361,3 +367,8 @@ export default defineComponent({
   },
 });
 </script>
+<style>
+.zjsqkList .ant-table-fixed-header .ant-table-scroll .ant-table-header{
+    width: 1404px !important;
+}
+</style>

+ 39 - 30
src/views/assembly/library/lib.data.ts

@@ -1,53 +1,57 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { RoleEnum } from '/@/enums/roleEnum';
-import { getServiceTypes, queryServiceTags, queryDicsByName, queryCoors } from '/@/api/resource/map';
+import {
+  getServiceTypes,
+  queryServiceTags,
+  queryDicsByName,
+  queryCoors,
+} from '/@/api/resource/map';
 import moment from 'moment';
 
-const resTag = await queryServiceTags()
-let listTag = []
-resTag.map(item => {
+const resTag = await queryServiceTags();
+let listTag = [];
+resTag.map((item) => {
   listTag.push({
     label: item.name,
-    value: item.code
-  })
-})
+    value: item.code,
+  });
+});
 /**
  * 密级字典
-*/
-export const secrets = await queryDicsByName('密级')
+ */
+export const secrets = await queryDicsByName('密级');
 /**
  * 服务标签
-*/
+ */
 export const serviceTags = listTag;
 /**
  * 坐标系列表
-*/
-export const sysCoors = await queryCoors()
+ */
+export const sysCoors = await queryCoors();
 /**
  * 服务类型
-*/
-export const serviceTypes = await getServiceTypes()
+ */
+export const serviceTypes = await getServiceTypes();
 /**
  * 责任处室
-*/
-export const respDept = await queryDicsByName('责任处室')
+ */
+export const respDept = await queryDicsByName('责任处室');
 /**
  * 保管单位
-*/
-export const collectDept = await queryDicsByName('保管单位')
+ */
+export const collectDept = await queryDicsByName('保管单位');
 /**
  * EPSG code
-*/
-export const EPSGCodes = await queryDicsByName('EPSG code')
-
+ */
+export const EPSGCodes = await queryDicsByName('EPSG code');
 
 const checkStatus = [
   { label: '未提交', value: '未提交' },
   { label: '审核中', value: '审核中' },
   { label: '审核不通过', value: '审核不通过' },
   { label: '审核通过', value: '审核通过' },
-]
+];
 export enum KeysTypeEnum {
   DISABLED = 'disabled',
   ENABLED = 'enabled',
@@ -62,7 +66,7 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }
 
 /**
  * 查询条件
-*/
+ */
 export const searchFormSchema: FormSchema[] = [
   // {
   //   field: 'resTag',
@@ -116,23 +120,28 @@ export const searchFormSchema: FormSchema[] = [
 
 /**
  * 列表显示信息
-*/
+ */
 export const columns: BasicColumn[] = [
+  {
+    title: '序号',
+    slots: { customRender: 'index' },
+    width: 50,
+  },
   {
     title: '资源类型',
     dataIndex: 'resInfo.SOURCE',
-    width: 160,
+    width: 130,
   },
   {
     title: '资源名称',
     dataIndex: 'resInfo.SERVICENAME',
-    width: 120,
+    width: 160,
   },
   {
     title: '应用系统',
     dataIndex: 'systemkey',
     slots: { customRender: 'systemkey' },
-    width: 160,
+    width: 90,
   },
   // {
   //   title: '申请单位',
@@ -154,7 +163,8 @@ export const columns: BasicColumn[] = [
     title: '申请时间',
     // dataIndex: 'applyCarInfo.createtime',
     dataIndex: 'tjsqsj',
-    width: 170
+    slots: { customRender: 'tjsqsj' },
+    width: 170,
   },
   {
     title: '申请人',
@@ -171,13 +181,12 @@ export const columns: BasicColumn[] = [
     title: '审核人',
     dataIndex: 'shr',
     slots: { customRender: 'shr' },
-    width: 110,
+    width: 160,
   },
   {
     title: '审核意见',
     dataIndex: 'shyj',
     slots: { customRender: 'shyj' },
-    width: 110,
   },
 ];
 

+ 1 - 1
src/views/dataAdmin/assembly/map.data.ts

@@ -176,7 +176,7 @@ export const columns: BasicColumn[] = [
   {
     title: '审核时间',
     dataIndex: 'checktime',
-    width: 160,
+    width: 170,
     slots: { customRender: 'checktime' },
   },
 ];

+ 14 - 3
src/views/dataAdmin/dataAdmin/fileResourceUpload/fileUploadData.js

@@ -1,14 +1,25 @@
-import { serviceTags, serviceTypes, checkStatus, EPSGCodes, sysCoors, secrets, respDept, collectDept, ApplProcesses, versionList } from '../sysDic'
+import {
+  serviceTags,
+  serviceTypes,
+  checkStatus,
+  EPSGCodes,
+  sysCoors,
+  secrets,
+  respDept,
+  collectDept,
+  ApplProcesses,
+  versionList,
+} from '../sysDic';
 export const columns = [
   {
     title: '序号',
     slots: { customRender: 'index' },
-    width: 50
+    width: 50,
   },
   {
     title: '文件编号',
     dataIndex: 'serviceid',
-    width: 100,
+    width: 120,
   },
   {
     title: '文件名称',

+ 1 - 9
src/views/dataAdmin/dataAdmin/mapUpload/map.data.ts

@@ -61,19 +61,16 @@ export const columns: BasicColumn[] = [
     title: '资源编号',
     dataIndex: 'serviceid',
     width: 120,
-    align: 'left',
   },
   {
     title: '资源名称',
     dataIndex: 'servicename',
     width: 160,
-    align: 'left',
   },
   {
     title: '坐标系名称',
     dataIndex: 'crs',
     width: 140,
-    align: 'left',
   },
   // {
   //   title: '资源标签',
@@ -90,7 +87,6 @@ export const columns: BasicColumn[] = [
     title: '发布人',
     dataIndex: 'publisher',
     width: 100,
-    align: 'left',
   },
   // {
   //   title: '发布时间',
@@ -103,28 +99,24 @@ export const columns: BasicColumn[] = [
     dataIndex: 'nodename',
     width: 90,
     slots: { customRender: 'nodename' },
-    align: 'left',
   },
   {
     title: '当前处理人',
     dataIndex: 'checkname',
     width: 100,
     slots: { customRender: 'checkname' },
-    align: 'left',
   },
   {
     title: '审核状态',
     dataIndex: 'status',
     width: 110,
     slots: { customRender: 'status' },
-    align: 'left',
   },
   {
     title: '审核时间',
     dataIndex: 'checktime',
-    width: 160,
+    width: 170,
     slots: { customRender: 'checktime' },
-    align: 'left',
   },
 ];
 

+ 2 - 2
src/views/dataAdmin/dataAdmin/sceneResourceUpload/sceneUploadData.js

@@ -14,12 +14,12 @@ export const columns = [
   {
     title: '序号',
     slots: { customRender: 'index' },
-    width: 50
+    width: 50,
   },
   {
     title: '资源编号',
     dataIndex: 'serviceid',
-    width: 100,
+    width: 120,
   },
   {
     title: '资源名称',

+ 22 - 10
src/views/resource/plat/item/child/ResCarModal.data.ts

@@ -1,15 +1,22 @@
 export const columns = [
+  {
+    title: '序号',
+    slots: { customRender: 'index' },
+    width: 50,
+  },
   {
     title: '资源类型',
     align: 'center',
     dataIndex: 'zylx',
-    key: 'zylx'
+    width: 100,
+    key: 'zylx',
   },
   {
     title: '资源名称',
     align: 'center',
+    width: 200,
     dataIndex: 'zymc',
-    key: 'zymc'
+    key: 'zymc',
   },
   // {
   //     title: '操作IP',
@@ -23,7 +30,8 @@ export const columns = [
     title: '应用系统',
     align: 'center',
     dataIndex: 'yyxt',
-    key: 'yyxt'
+    width: 100,
+    key: 'yyxt',
   },
   // {
   //     title: '申请单位',
@@ -36,30 +44,34 @@ export const columns = [
     align: 'center',
     dataIndex: 'tjsqsj',
     key: 'tjsqsj',
-    width: 170
+    slots: { customRender: 'tjsqsj' },
+    width: 170,
   },
   {
     title: '申请人',
     align: 'center',
     dataIndex: 'sqr',
-    key: 'sqr'
+    width: 100,
+    key: 'sqr',
   },
   {
     title: '审核状态',
     align: 'center',
+    width: 100,
     dataIndex: 'shzt',
-    key: 'shzt'
+    key: 'shzt',
   },
   {
     title: '审核人',
     align: 'center',
     dataIndex: 'shr',
-    key: 'shr'
+    width: 160,
+    key: 'shr',
   },
   {
     title: '审核意见',
     align: 'center',
     dataIndex: 'shyj',
-    key: 'shyj'
-  }
-]
+    key: 'shyj',
+  },
+];

+ 18 - 6
src/views/resource/plat/item/child/ResCarModal.vue

@@ -28,11 +28,17 @@
             </div>
 
             <div class="bottom-table">
-                <BasicTable @register="registerTable" class="basic-table">
+                <BasicTable @register="registerTable" class="basic-table sqkList">
                     <template #toolbar>
                         <a-button :disabled="hasSelected" style="background-color: #fc8b01;color: #fff;"
                             @click="handleCreate">提交申请</a-button>
                     </template>
+                    <template #tjsqsj="{ record }">
+                        {{ record?.tjsqsj?.replace('.0', '') }}
+                    </template>
+                    <template #index="{ index }">
+                        {{ index + 1 }}
+                    </template>
                     <template #action="{ record }">
                         <TableAction :actions="[
                             {
@@ -46,7 +52,8 @@
                                 disabled: record.shzt != '未提交' && record.shzt != '审核不通过',
                                 onClick: applyHandleEdit.bind(null, record),
                             },
-                        ]" />
+                        ]">
+                        </TableAction>
                     </template>
                 </BasicTable>
             </div>
@@ -162,12 +169,12 @@ export default defineComponent({
             api: getAllData,		 //数据
             // dataSource: [],
             columns: columns,        //表头配置
-            bordered: false,
-            striped: false,
+            bordered: true,
+            striped: true,
             useSearchForm: false,     //开启搜索区域
             // formConfig: formConfig,  //搜索字段配置
             actionColumn: {
-                width: 120,
+                // width: 100,
                 title: '操作',
                 dataIndex: 'action',
                 slots: { customRender: 'action' },
@@ -197,7 +204,7 @@ export default defineComponent({
             },
             maxHeight: 400,
             minHeight: 400,
-            showIndexColumn: true,
+            showIndexColumn: false,
             indexColumnProps: { fixed: 'left' },
         });
         //判断是否选中数据
@@ -354,6 +361,11 @@ export default defineComponent({
     },
 });
 </script>
+<style>
+.sqkList .ant-table-fixed-header .ant-table-scroll .ant-table-header{
+    width: 1396px !important;
+}
+</style>
 <style lang="less" scoped>
 .modal-wrap {
     .action-content {