qymljy 2 년 전
부모
커밋
6a95c4864e

+ 0 - 1
dist/assets/index-0ac64f5f.css

@@ -1 +0,0 @@
-.y-container[data-v-0b95a5e8]{padding:0 10px 10px}.flex-between[data-v-0b95a5e8]{display:flex;align-items:center;justify-content:space-between}.flex-align-center[data-v-0b95a5e8]{display:flex;align-items:center}.mt-10[data-v-0b95a5e8]{margin-bottom:10px}

+ 0 - 1
dist/assets/index-e84fa361.css

@@ -1 +0,0 @@
-.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.btn-link[data-v-11e43a23]{text-decoration:underline}.ant-table-striped[data-v-11e43a23] td{font-size:12px}.ant-table-striped[data-v-11e43a23] .table-striped td{background-color:#fafafa}.flex[data-v-11e43a23]{display:flex;justify-content:space-between;align-items:center}.pointer[data-v-11e43a23]{cursor:pointer;flex:1;text-align:right}.ant-dropdown-link[data-v-11e43a23]{color:#333}

BIN
dist/dist.zip


+ 0 - 17
dist/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="./vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>班尼戈水务管理</title>
-    <script type="module" crossorigin src="./assets/index-186ffbb3.js"></script>
-    <link rel="modulepreload" crossorigin href="./assets/vue-48d59694.js">
-    <link rel="modulepreload" crossorigin href="./assets/vue-router-499a53c9.js">
-    <link rel="stylesheet" href="./assets/index-06454cca.css">
-  </head>
-  <body>
-    <div id="app"></div>
-    
-  </body>
-</html>

+ 0 - 1
dist/manage/assets/index-1bea67db.css

@@ -1 +0,0 @@
-[data-v-0a2de021] .ant-upload-list-item-error{border-color:#d9d9d9!important}

+ 0 - 1
dist/manage/assets/index-4a7e66b7.css

@@ -1 +0,0 @@
-.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.btn-link[data-v-af319c4c]{text-decoration:underline}.ant-table-small[data-v-af319c4c] td{font-size:12px;min-width:150px}.ant-table-small[data-v-af319c4c] .table-striped td{background-color:#f8f9fd}.ant-table-small[data-v-af319c4c] .table-striped-red td{color:#d9363e}.flex[data-v-af319c4c]{display:flex;justify-content:space-between;align-items:center}.pointer[data-v-af319c4c]{cursor:pointer;flex:1;text-align:right}.ant-dropdown-link[data-v-af319c4c]{color:#333}.flex-between[data-v-af319c4c]{display:flex;align-items:center;justify-content:space-between}

+ 0 - 17
dist/manage/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="./vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>班尼戈水务管理</title>
-    <script type="module" crossorigin src="./assets/index-58777c0a.js"></script>
-    <link rel="modulepreload" crossorigin href="./assets/vue-9608a1a9.js">
-    <link rel="modulepreload" crossorigin href="./assets/vue-router-2c2f7fb8.js">
-    <link rel="stylesheet" href="./assets/index-8790befc.css">
-  </head>
-  <body>
-    <div id="app"></div>
-    
-  </body>
-</html>

+ 18 - 18
node_modules/.vite/deps/_metadata.json

@@ -1,95 +1,95 @@
 {
-  "hash": "91dfbfa1",
-  "browserHash": "7b1e80e3",
+  "hash": "9d6c8bdf",
+  "browserHash": "a98baefe",
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-      "fileHash": "d6028112",
+      "fileHash": "684a6ae9",
       "needsInterop": false
     },
     "@antv/g2plot": {
       "src": "../../@antv/g2plot/esm/index.js",
       "file": "@antv_g2plot.js",
-      "fileHash": "31833239",
+      "fileHash": "a0ea03e4",
       "needsInterop": false
     },
     "@antv/g2plot/lib/utils": {
       "src": "../../@antv/g2plot/lib/utils/index.js",
       "file": "@antv_g2plot_lib_utils.js",
-      "fileHash": "635848d6",
+      "fileHash": "cb829f88",
       "needsInterop": true
     },
     "ant-design-vue": {
       "src": "../../ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-      "fileHash": "d7c6ac22",
+      "fileHash": "b600e84f",
       "needsInterop": false
     },
     "ant-design-vue/es/locale/zh_CN": {
       "src": "../../ant-design-vue/es/locale/zh_CN.js",
       "file": "ant-design-vue_es_locale_zh_CN.js",
-      "fileHash": "03452225",
+      "fileHash": "4d3b205a",
       "needsInterop": false
     },
     "axios": {
       "src": "../../axios/index.js",
       "file": "axios.js",
-      "fileHash": "809209ac",
+      "fileHash": "f54a06a8",
       "needsInterop": false
     },
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "0f3ccfe5",
+      "fileHash": "4ed26838",
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "d5e011e9",
+      "fileHash": "9fca042c",
       "needsInterop": true
     },
     "js-md5": {
       "src": "../../js-md5/src/md5.js",
       "file": "js-md5.js",
-      "fileHash": "24a46746",
+      "fileHash": "ff51ab3b",
       "needsInterop": true
     },
     "less": {
       "src": "../../less/dist/less.js",
       "file": "less.js",
-      "fileHash": "9c3cfab8",
+      "fileHash": "1ce6c69d",
       "needsInterop": true
     },
     "mathjs": {
       "src": "../../mathjs/lib/esm/index.js",
       "file": "mathjs.js",
-      "fileHash": "5d9ef1e0",
+      "fileHash": "b8f5ac98",
       "needsInterop": false
     },
     "pinia": {
       "src": "../../pinia/dist/pinia.mjs",
       "file": "pinia.js",
-      "fileHash": "59399a61",
+      "fileHash": "1de0c148",
       "needsInterop": false
     },
     "pinia-plugin-persist": {
       "src": "../../pinia-plugin-persist/dist/pinia-persist.es.js",
       "file": "pinia-plugin-persist.js",
-      "fileHash": "4cd6c695",
+      "fileHash": "814516d7",
       "needsInterop": false
     },
     "vue": {
       "src": "../../vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "6fe44225",
+      "fileHash": "a2e23772",
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-      "fileHash": "ab4041b0",
+      "fileHash": "2c4f14db",
       "needsInterop": false
     }
   },
@@ -125,4 +125,4 @@
       "file": "chunk-AC2VUBZ6.js"
     }
   }
-}
+}

+ 1 - 5
src/operation/moduleNormal/roleManage/detail/index.vue

@@ -32,11 +32,7 @@ const mainAreaData = ref([])
 const roleData = ref({})
 const mianData = async ()=>{
   const res = await Api.requested({
-<<<<<<< HEAD
     id:20230608102202,
-=======
-   id:20230608102202,
->>>>>>> f615893fe887ffb1c432007df9fc55074355b11d
     "content": {
       "nocache":true,
       "roleid": router.currentRoute.value.query.id
@@ -112,4 +108,4 @@ onMounted (()=>{
 })
 </script>
 <style>
-</style>
+</style>

+ 2 - 6
src/operation/moduleNormal/roleManage/detail/modules/addAuth.vue

@@ -49,11 +49,7 @@
   }
   const authData = async ()=>{
     const res = await Api.requested({
-<<<<<<< HEAD
-      id:20230608102402,
-=======
-      id:20230608100302,
->>>>>>> f615893fe887ffb1c432007df9fc55074355b11d
+      id:20230608100202,
       "content":{
         "pageNumber":1,
         "pageSize":10,
@@ -113,4 +109,4 @@
   })
 </script>
 <style>
-</style>
+</style>