zs il y a 9 mois
Parent
commit
dbd7cf18b2

+ 107 - 34
package-lock.json

@@ -8,8 +8,8 @@
       "name": "web",
       "version": "0.0.0",
       "dependencies": {
-        "@dataview/datav-vue3": "^0.0.0-test.1672506674342",
         "@element-plus/icons-vue": "^2.3.1",
+        "@kjgl77/datav-vue3": "^1.7.3",
         "@vueuse/core": "^10.7.2",
         "@vueuse/integrations": "^10.9.0",
         "@wangeditor/editor": "^5.1.23",
@@ -137,19 +137,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@dataview/datav-vue3": {
-      "version": "0.0.0-test.1672506674342",
-      "resolved": "https://registry.npmmirror.com/@dataview/datav-vue3/-/datav-vue3-0.0.0-test.1672506674342.tgz",
-      "integrity": "sha512-d0oT/msAi592CTvWmQl0umkLpHgMwtTN2+peyo0L2GHNG7b4cKeO9meEF5o28DgFzRwOLeNQW73vKCF4JC+ihw==",
-      "dependencies": {
-        "@jiaminghi/color": "^0.1.1",
-        "classnames": "^2.3.2",
-        "lodash-es": "^4.17.21"
-      },
-      "peerDependencies": {
-        "vue": ">=3.2.0"
-      }
-    },
     "node_modules/@element-plus/icons-vue": {
       "version": "2.3.1",
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
@@ -822,6 +809,34 @@
         "url": "https://github.com/sponsors/kazupon"
       }
     },
+    "node_modules/@jiaminghi/bezier-curve": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz",
+      "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "node_modules/@jiaminghi/c-render": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz",
+      "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/bezier-curve": "*",
+        "@jiaminghi/color": "*",
+        "@jiaminghi/transition": "*"
+      }
+    },
+    "node_modules/@jiaminghi/charts": {
+      "version": "0.2.18",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz",
+      "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/c-render": "^0.4.3"
+      }
+    },
     "node_modules/@jiaminghi/color": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-0.1.1.tgz",
@@ -830,11 +845,35 @@
         "@babel/runtime": "^7.5.5"
       }
     },
+    "node_modules/@jiaminghi/transition": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz",
+      "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
+    "node_modules/@kjgl77/datav-vue3": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmmirror.com/@kjgl77/datav-vue3/-/datav-vue3-1.7.3.tgz",
+      "integrity": "sha512-8zNu2zDXylDS6aL8SNDR7/h4ccO2LnBg/KbTwOeF7p9hqiRW9TR7Zd/e8baYnJPb9tAwYOubzWTQnjUTdtE8dA==",
+      "dependencies": {
+        "@jiaminghi/c-render": "^0.4.3",
+        "@jiaminghi/charts": "^0.2.18",
+        "@jiaminghi/color": "^1.1.3",
+        "@vueuse/core": "^10.9.0"
+      }
+    },
+    "node_modules/@kjgl77/datav-vue3/node_modules/@jiaminghi/color": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz",
+      "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg=="
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2119,11 +2158,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/classnames": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmmirror.com/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
-    },
     "node_modules/claygl": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz",
@@ -7550,16 +7584,6 @@
       "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
       "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA=="
     },
-    "@dataview/datav-vue3": {
-      "version": "0.0.0-test.1672506674342",
-      "resolved": "https://registry.npmmirror.com/@dataview/datav-vue3/-/datav-vue3-0.0.0-test.1672506674342.tgz",
-      "integrity": "sha512-d0oT/msAi592CTvWmQl0umkLpHgMwtTN2+peyo0L2GHNG7b4cKeO9meEF5o28DgFzRwOLeNQW73vKCF4JC+ihw==",
-      "requires": {
-        "@jiaminghi/color": "^0.1.1",
-        "classnames": "^2.3.2",
-        "lodash-es": "^4.17.21"
-      }
-    },
     "@element-plus/icons-vue": {
       "version": "2.3.1",
       "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
@@ -7947,6 +7971,34 @@
       "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.10.2.tgz",
       "integrity": "sha512-ttHCAJkRy7R5W2S9RVnN9KYQYPIpV2+GiS79T4EE37nrPyH6/1SrOh3bmdCRC1T3ocL8qCDx7x2lBJ0xaITU7Q=="
     },
+    "@jiaminghi/bezier-curve": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz",
+      "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
+    "@jiaminghi/c-render": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz",
+      "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/bezier-curve": "*",
+        "@jiaminghi/color": "*",
+        "@jiaminghi/transition": "*"
+      }
+    },
+    "@jiaminghi/charts": {
+      "version": "0.2.18",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz",
+      "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "@jiaminghi/c-render": "^0.4.3"
+      }
+    },
     "@jiaminghi/color": {
       "version": "0.1.1",
       "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-0.1.1.tgz",
@@ -7955,11 +8007,37 @@
         "@babel/runtime": "^7.5.5"
       }
     },
+    "@jiaminghi/transition": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz",
+      "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==",
+      "requires": {
+        "@babel/runtime": "^7.5.5"
+      }
+    },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
+    "@kjgl77/datav-vue3": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmmirror.com/@kjgl77/datav-vue3/-/datav-vue3-1.7.3.tgz",
+      "integrity": "sha512-8zNu2zDXylDS6aL8SNDR7/h4ccO2LnBg/KbTwOeF7p9hqiRW9TR7Zd/e8baYnJPb9tAwYOubzWTQnjUTdtE8dA==",
+      "requires": {
+        "@jiaminghi/c-render": "^0.4.3",
+        "@jiaminghi/charts": "^0.2.18",
+        "@jiaminghi/color": "^1.1.3",
+        "@vueuse/core": "^10.9.0"
+      },
+      "dependencies": {
+        "@jiaminghi/color": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz",
+          "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg=="
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -8828,11 +8906,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmmirror.com/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
-    },
     "claygl": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz",

+ 2 - 2
package.json

@@ -11,8 +11,8 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@dataview/datav-vue3": "^0.0.0-test.1672506674342",
     "@element-plus/icons-vue": "^2.3.1",
+    "@kjgl77/datav-vue3": "^1.7.3",
     "@vueuse/core": "^10.7.2",
     "@vueuse/integrations": "^10.9.0",
     "@wangeditor/editor": "^5.1.23",
@@ -54,4 +54,4 @@
     "vite-plugin-inspect": "^0.8.3",
     "vite-plugin-svg-icons": "^2.0.1"
   }
-}
+}

+ 2 - 5
src/views/brain/five.vue

@@ -136,7 +136,7 @@
 </template>
 
 <script setup>
-import { BorderBox13 } from '@dataview/datav-vue3'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 组件
 import echarts1 from './five/echarts1.vue'
@@ -196,10 +196,7 @@ onMounted(async () => {
 })
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">

+ 2 - 5
src/views/brain/four.vue

@@ -190,7 +190,7 @@
 </template>
 
 <script setup>
-import { BorderBox13 } from '@dataview/datav-vue3'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 组件
 import echarts1 from './four/echarts1.vue'
@@ -275,10 +275,7 @@ onMounted(async () => {
 })
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">

+ 50 - 4
src/views/brain/index.vue

@@ -14,6 +14,12 @@
       <div class="menu_2" v-else @click="is_show = true">
         <el-icon color="#595959"><ArrowRightBold /></el-icon>
       </div>
+      <div class="one" @click="toView({ route: '/brain/one' })"></div>
+      <div class="two" @click="toView({ route: '/brain/two' })"></div>
+      <div class="thr" @click="toView({ route: '/brain/thr' })"></div>
+      <div class="four" @click="toView({ route: '/brain/four' })"></div>
+      <div class="five" @click="toView({ route: '/brain/five' })"></div>
+      <div class="six" @click="toView({ route: '/brain/six' })"></div>
     </div>
   </myMain>
 </template>
@@ -40,10 +46,7 @@ const list = ref([
 ])
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">
@@ -54,6 +57,7 @@ const toView = (item) => {
   min-height: 100vh;
   padding: 0px;
   margin: 0px;
+  color: #fff;
   font-family: '微软雅黑';
   cursor: default; /* 将鼠标样式更改为箭头 */
   .menu_1 {
@@ -111,5 +115,47 @@ const toView = (item) => {
     border-radius: 0 1.5rem 1.5rem 0;
     z-index: 10000;
   }
+  .one {
+    position: absolute;
+    top: 6%;
+    left: 16%;
+    width: 22rem;
+    height: 3rem;
+  }
+  .two {
+    position: absolute;
+    top: 3%;
+    right: 8%;
+    width: 22rem;
+    height: 3rem;
+  }
+  .thr {
+    position: absolute;
+    top: 36%;
+    left: 5%;
+    width: 22rem;
+    height: 3rem;
+  }
+  .four {
+    position: absolute;
+    top: 67%;
+    left: 13.5%;
+    width: 22rem;
+    height: 3rem;
+  }
+  .five {
+    position: absolute;
+    bottom: 25%;
+    right: 13%;
+    width: 22rem;
+    height: 3rem;
+  }
+  .six {
+    position: absolute;
+    bottom: 57%;
+    right: 12.5%;
+    width: 22rem;
+    height: 3rem;
+  }
 }
 </style>

+ 2 - 5
src/views/brain/one.vue

@@ -157,7 +157,7 @@
 </template>
 
 <script setup>
-import { BorderBox13, BorderBox10 } from '@dataview/datav-vue3'
+import { BorderBox13, BorderBox10 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 组件
 import echarts1 from './one/echarts1.vue'
@@ -262,10 +262,7 @@ onMounted(async () => {
 })
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">

+ 2 - 5
src/views/brain/six.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script setup>
-import { BorderBox13 } from '@dataview/datav-vue3'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 图片引入
 // 组件
@@ -178,10 +178,7 @@ onMounted(async () => {
 const search = async (query = { skip: 0, limit }) => {}
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 const currentPage = ref(1)
 // 分页

+ 2 - 5
src/views/brain/thr.vue

@@ -221,7 +221,7 @@
 </template>
 
 <script setup>
-import { BorderBox13 } from '@dataview/datav-vue3'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 组件
 import echarts1 from './thr/echarts1.vue'
@@ -305,10 +305,7 @@ onMounted(async () => {
 })
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">

+ 2 - 5
src/views/brain/two.vue

@@ -213,7 +213,7 @@
 </template>
 
 <script setup>
-import { BorderBox13 } from '@dataview/datav-vue3'
+import { BorderBox13 } from '@kjgl77/datav-vue3'
 import myMain from '@/components/dataV/myMain.vue'
 // 组件
 import echarts1 from './two/echarts1.vue'
@@ -271,10 +271,7 @@ onMounted(async () => {
 })
 // 查看
 const toView = (item) => {
-  router.push({ path: item.route }).then(() => {
-    // 重新刷新页面
-    location.reload()
-  })
+  router.push(item.route)
 }
 </script>
 <style scoped lang="scss">