ZaiZai il y a 1 an
Parent
commit
192a9242de
4 fichiers modifiés avec 48 ajouts et 23 suppressions
  1. 4 4
      package.json
  2. 26 1
      src/layout/modules/mainBody.vue
  3. 2 2
      src/views/certificate/admin.vue
  4. 16 16
      yarn.lock

+ 4 - 4
package.json

@@ -20,8 +20,8 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
-        "element-plus": "2.5.6",
-        "hc-vue3-ui": "^3.2.1",
+        "element-plus": "2.6.0",
+        "hc-vue3-ui": "^3.2.3",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.4.6",
         "js-md5": "^0.8.3",
@@ -32,7 +32,7 @@
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-        "@iconify-json/iconoir": "^1.1.41",
+        "@iconify-json/iconoir": "^1.1.42",
         "@iconify-json/ri": "^1.1.20",
         "@unocss/eslint-config": "^0.58.5",
         "@vitejs/plugin-vue": "^5.0.4",
@@ -45,6 +45,6 @@
         "unocss": "^0.58.5",
         "unocss-preset-extra": "^0.5.3",
         "unocss-preset-scrollbar": "^0.3.1",
-        "vite": "^5.1.4"
+        "vite": "^5.1.5"
     }
 }

+ 26 - 1
src/layout/modules/mainBody.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-body padding="12px">
+    <hc-body :padding="isPadding ? '12px' : '0px'">
         <router-view v-slot="{ Component }">
             <transition name="fade-transform">
                 <keep-alive :max="10">
@@ -9,3 +9,28 @@
         </router-view>
     </hc-body>
 </template>
+
+<script setup>
+import { onMounted, ref, watch } from 'vue'
+import { useRoute } from 'vue-router'
+
+//初始组合式
+const useRoutes = useRoute()
+
+//渲染完成
+onMounted(() => {
+    setBarRoutesData(useRoutes?.name)
+})
+
+//监听
+watch(() => useRoutes?.name, (name) => {
+    setBarRoutesData(name)
+})
+
+//判断数据
+const routes = ['/certificate/management']
+const isPadding = ref(true)
+const setBarRoutesData = (name) => {
+    isPadding.value = routes.indexOf(name) === -1
+}
+</script>

+ 2 - 2
src/views/certificate/admin.vue

@@ -1,5 +1,5 @@
 <template>
-    <hc-new-card>
+    <hc-new-card id-ref="hc-certificate-management" div-p="12px">
         <template #header>
             <div class="w-100">
                 <el-select v-model="searchForm.projectId" filterable clearable block placeholder="选择项目" @change="searchClick">
@@ -16,7 +16,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 查看 -->
-        <hc-new-drawer v-model="isRowDrawer" is-close to-id="hc-main-box">
+        <hc-new-drawer v-model="isRowDrawer" is-close to-id="hc-certificate-management">
             <HcAdminSee v-if="isRowDrawer" :cid="tableRowItem.contractId" />
         </hc-new-drawer>
     </hc-new-card>

+ 16 - 16
yarn.lock

@@ -504,10 +504,10 @@
   resolved "http://39.108.216.210:9000/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
   integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
-"@iconify-json/iconoir@^1.1.41":
-  version "1.1.41"
-  resolved "http://39.108.216.210:9000/@iconify-json/iconoir/-/iconoir-1.1.41.tgz#77f9f57b9c6d75c67e9bb505cfeb8644e0b2014e"
-  integrity sha512-0M8L0EyYVqNfOvnIu6W2Y4EdYiRkQ4dWg7P42/S73LgNCseWqY/ZaZQvwedMALPux5l0EZa9kRkw0WW8IComhA==
+"@iconify-json/iconoir@^1.1.42":
+  version "1.1.42"
+  resolved "http://39.108.216.210:9000/@iconify-json/iconoir/-/iconoir-1.1.42.tgz#a7f1cb85013e36bd686717b6e8bdd1d706924915"
+  integrity sha512-5FQfS+dSAvHWCBtsp/E+4AKK6jYVCxw98R4LLsY5s8mSUm9BFstjCA5bmTcIl+iYDgc+vUmtW26jYmBEf4gLIA==
   dependencies:
     "@iconify/types" "*"
 
@@ -1579,10 +1579,10 @@ electron-to-chromium@^1.4.668:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.685.tgz#3ce988e4dfbb3aa984840394b1d7064c01ad74c1"
   integrity sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw==
 
-element-plus@2.5.6:
-  version "2.5.6"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.5.6.tgz#d63dabc6330c0e2abe6f97cf99013a30140940d1"
-  integrity sha512-zctKTiyIDmcnMp3K5WG1hglgraW9EbiCLiIDVtaMCS5mPMl2fRKdS0vOFGnECIq9taFoxnyoDwxHD81nv0B4RA==
+element-plus@2.6.0:
+  version "2.6.0"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.6.0.tgz#bba8707780ee4612f8fc05f397e2b8b71510ec62"
+  integrity sha512-MP+N48P+diyndR+GjY+0VOrUmFnajD4U0CkrXIMzmeRmq4+dwi0bdzVo587v4wDo9Hs+ggviyacqm3NS8JYVqw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -2001,10 +2001,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.2.1:
-  version "3.2.1"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.2.1.tgz#121c2f17daf82fee61ce1c4109d3b89930298975"
-  integrity sha512-BEKN+AnXm21K9yY/xCHtBGV32MxpgSxhdhOWNytXCtTF/F/lQS+grERHwnItWUi0aHdhj+VInqvZtwXy/Nzcug==
+hc-vue3-ui@^3.2.3:
+  version "3.2.3"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.2.3.tgz#b3e5139ebbf3bab0cd15c41f3693a078146e4283"
+  integrity sha512-TWWYd1PbEkvHqDmL+TRoknbX6hRekHqe5TbHYiYg52FPLE2RrSKXUDB0IVMGztAekPgpqqPZ46Yr6Pgo0ps8Eg==
 
 human-signals@^2.1.0:
   version "2.1.0"
@@ -2964,10 +2964,10 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "http://39.108.216.210:9000/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-vite@^5.1.4:
-  version "5.1.4"
-  resolved "http://39.108.216.210:9000/vite/-/vite-5.1.4.tgz#14e9d3e7a6e488f36284ef13cebe149f060bcfb6"
-  integrity sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==
+vite@^5.1.5:
+  version "5.1.5"
+  resolved "http://39.108.216.210:9000/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb"
+  integrity sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==
   dependencies:
     esbuild "^0.19.3"
     postcss "^8.4.35"