Procházet zdrojové kódy

[Style 0000] 样式优化

houzekong před 1 týdnem
rodič
revize
1b2b3da9b0

+ 1 - 1
src/layouts/default/content/index.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <div :class="[prefixCls, getLayoutContentMode]" v-loading="getOpenPageLoading && getPageLoading">
+  <div :class="[prefixCls, getLayoutContentMode]" v-loading.fullscreen="getOpenPageLoading && getPageLoading">
     <PageLayout />
     <PageLayout />
   </div>
   </div>
 </template>
 </template>

+ 9 - 9
src/layouts/default/feature/SimpleMap.vue

@@ -36,7 +36,7 @@
   import { useMap2D } from '/@/views/system/cadFile/app';
   import { useMap2D } from '/@/views/system/cadFile/app';
 
 
   const props = defineProps<{
   const props = defineProps<{
-    slience: boolean;
+    silence: boolean;
   }>();
   }>();
 
 
   const { initMap2d, renderGoafMarkers } = useMap2D();
   const { initMap2d, renderGoafMarkers } = useMap2D();
@@ -148,7 +148,7 @@
       const node = get(e, 'features[0].properties', DEFAULT_NODE);
       const node = get(e, 'features[0].properties', DEFAULT_NODE);
       // 用户从地图点到矿节点需要显示详情框,不需要走set-watch的路线重新初始化地图
       // 用户从地图点到矿节点需要显示详情框,不需要走set-watch的路线重新初始化地图
       if (node.isLeaf) {
       if (node.isLeaf) {
-        laefNodeClickHandler(node);
+        leafNodeClickHandler(node);
       } else {
       } else {
         mineStore.setDepartById(node.id);
         mineStore.setDepartById(node.id);
       }
       }
@@ -196,7 +196,7 @@
   }
   }
 
 
   /** 叶节点标记点击事件处理,叶节点需要显示该节点的详情框 */
   /** 叶节点标记点击事件处理,叶节点需要显示该节点的详情框 */
-  function laefNodeClickHandler(node: any) {
+  function leafNodeClickHandler(node: any) {
     if (!map) return;
     if (!map) return;
     if (!node) return;
     if (!node) return;
     if (!node.isLeaf) return;
     if (!node.isLeaf) return;
@@ -240,11 +240,11 @@
   }
   }
 
 
   /** 切换CAD底图和瓦片地图底图的显示,通过重新初始化进行切换,避免出现动画异常和多个DOM节点 */
   /** 切换CAD底图和瓦片地图底图的显示,通过重新初始化进行切换,避免出现动画异常和多个DOM节点 */
-  async function toggleCADMap(visiable: boolean) {
+  async function toggleCADMap(visible: boolean) {
     // CAD底图不显示的时候无需再次初始化地图,显示时需要根据data来切换不同图纸
     // CAD底图不显示的时候无需再次初始化地图,显示时需要根据data来切换不同图纸
-    if (cadOpened === visiable && visiable === false) return;
+    if (cadOpened === visible && visible === false) return;
 
 
-    cadOpened = visiable;
+    cadOpened = visible;
     mapLoading.value = true;
     mapLoading.value = true;
     map?.destory();
     map?.destory();
     map = null;
     map = null;
@@ -253,7 +253,7 @@
       let markers;
       let markers;
 
 
       // 当不是静默状态时,需要标记点位信息来计算历史栈
       // 当不是静默状态时,需要标记点位信息来计算历史栈
-      if (!props.slience) {
+      if (!props.silence) {
         const [records, mks] = await getMarkerCollection({
         const [records, mks] = await getMarkerCollection({
           deptId: mineStore.getRootId,
           deptId: mineStore.getRootId,
           pageSize: 9999,
           pageSize: 9999,
@@ -265,7 +265,7 @@
       if (cadOpened) {
       if (cadOpened) {
         const [__, res] = await Promise.all([
         const [__, res] = await Promise.all([
           initMap2d(mapContainer.value!, { wjId: fileId.value, style: { backcolor: 0xe6f3ff } }),
           initMap2d(mapContainer.value!, { wjId: fileId.value, style: { backcolor: 0xe6f3ff } }),
-          props.slience
+          props.silence
             ? Promise.resolve([])
             ? Promise.resolve([])
             : getGoafList({
             : getGoafList({
                 mineCode: mineStore.getDepartId,
                 mineCode: mineStore.getDepartId,
@@ -301,7 +301,7 @@
       if (!mapContainer.value) return;
       if (!mapContainer.value) return;
 
 
       // 如果是静默模式就简单展示默认地图/图纸即可
       // 如果是静默模式就简单展示默认地图/图纸即可
-      if (props.slience) return toggleCADMap(mineStore.getRoot?.isLeaf || false);
+      if (props.silence) return toggleCADMap(mineStore.getRoot?.isLeaf || false);
 
 
       // 先判断显示什么图纸,若是矿端显示CAD图纸
       // 先判断显示什么图纸,若是矿端显示CAD图纸
       if (mineStore.getDepart?.isLeaf) {
       if (mineStore.getDepart?.isLeaf) {

+ 1 - 1
src/layouts/default/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <!-- <div style="position: fixed; width: 100%; height: 100%; top: 0; left: 0; background-color: yellow"></div> -->
   <!-- <div style="position: fixed; width: 100%; height: 100%; top: 0; left: 0; background-color: yellow"></div> -->
   <Layout :class="prefixCls" v-bind="lockEvents">
   <Layout :class="prefixCls" v-bind="lockEvents">
-    <SimpleMap :slience="true" />
+    <SimpleMap :silence="true" />
     <AdaptiveContainer :class="`${prefixCls}__adaptive`">
     <AdaptiveContainer :class="`${prefixCls}__adaptive`">
       <LayoutFeatures />
       <LayoutFeatures />
       <LayoutHeader />
       <LayoutHeader />

+ 1 - 1
src/layouts/default/plain.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <!-- <div style="position: fixed; width: 100%; height: 100%; top: 0; left: 0; background-color: yellow"></div> -->
   <!-- <div style="position: fixed; width: 100%; height: 100%; top: 0; left: 0; background-color: yellow"></div> -->
   <Layout :class="prefixCls" v-bind="lockEvents">
   <Layout :class="prefixCls" v-bind="lockEvents">
-    <SimpleMap :slience="false" />
+    <SimpleMap :silence="false" />
     <AdaptiveContainer :class="`${prefixCls}__adaptive`">
     <AdaptiveContainer :class="`${prefixCls}__adaptive`">
       <LayoutFeatures />
       <LayoutFeatures />
       <LayoutHeader />
       <LayoutHeader />

+ 4 - 2
src/views/dashboard/Overhaul/overhaul.data.ts

@@ -1,4 +1,3 @@
-
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { h } from 'vue';
 import { h } from 'vue';
 import { StatusColorEnum } from '/@/enums/jeecgEnum';
 import { StatusColorEnum } from '/@/enums/jeecgEnum';
@@ -30,16 +29,19 @@ export const columns: BasicColumn[] = [
     title: '矿井名称',
     title: '矿井名称',
     dataIndex: 'mineName',
     dataIndex: 'mineName',
     width: 200,
     width: 200,
+    fixed: true,
   },
   },
   {
   {
     title: '老空区永久密闭名称',
     title: '老空区永久密闭名称',
     dataIndex: 'devicePos',
     dataIndex: 'devicePos',
     width: 200,
     width: 200,
+    fixed: true,
   },
   },
   {
   {
     title: '所属煤层',
     title: '所属煤层',
     dataIndex: 'coalSeamName',
     dataIndex: 'coalSeamName',
     width: 100,
     width: 100,
+    fixed: true,
   },
   },
   {
   {
     title: '自燃倾向性',
     title: '自燃倾向性',
@@ -294,4 +296,4 @@ export function alarmCellRender(
   const val = valFn(record);
   const val = valFn(record);
   const lv = lvFn(record);
   const lv = lvFn(record);
   return h('span', { style: { color: getTagColor(lv) } }, val);
   return h('span', { style: { color: getTagColor(lv) } }, val);
-}
+}