bill 1 gadu atpakaļ
vecāks
revīzija
7cdfcbaf4b

+ 2 - 2
src/app/fire/routeConfig.ts

@@ -8,8 +8,6 @@ export const FireRouteName = {
 } as const;
 
 export const menuRouteNames = [
-  FireRouteName.statistics,
-  FireRouteName.downloadLog,
   FireRouteName.vrmodel,
   FireRouteName.camera,
   FireRouteName.dispatch,
@@ -17,6 +15,8 @@ export const menuRouteNames = [
   FireRouteName.organization,
   FireRouteName.role,
   FireRouteName.user,
+  FireRouteName.statistics,
+  FireRouteName.downloadLog,
 ];
 
 export const routes: Routes = [

+ 72 - 3
src/assets/icon/fuse/demo_index.html

@@ -55,6 +55,24 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe74d;</span>
+                <div class="name">fire_statistics</div>
+                <div class="code-name">&amp;#xe74d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe74b;</span>
+                <div class="name">query_home</div>
+                <div class="code-name">&amp;#xe74b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe740;</span>
+                <div class="name">list-detail</div>
+                <div class="code-name">&amp;#xe740;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe70e;</span>
                 <div class="name">without</div>
                 <div class="code-name">&amp;#xe70e;</div>
@@ -474,9 +492,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1692171577992') format('woff2'),
-       url('iconfont.woff?t=1692171577992') format('woff'),
-       url('iconfont.ttf?t=1692171577992') format('truetype');
+  src: url('iconfont.woff2?t=1706348932330') format('woff2'),
+       url('iconfont.woff?t=1706348932330') format('woff'),
+       url('iconfont.ttf?t=1706348932330') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -503,6 +521,33 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-fire_statistics"></span>
+            <div class="name">
+              fire_statistics
+            </div>
+            <div class="code-name">.icon-fire_statistics
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-query_home"></span>
+            <div class="name">
+              query_home
+            </div>
+            <div class="code-name">.icon-query_home
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-list-detail"></span>
+            <div class="name">
+              list-detail
+            </div>
+            <div class="code-name">.icon-list-detail
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-without"></span>
             <div class="name">
               without
@@ -1134,6 +1179,30 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fire_statistics"></use>
+                </svg>
+                <div class="name">fire_statistics</div>
+                <div class="code-name">#icon-fire_statistics</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-query_home"></use>
+                </svg>
+                <div class="name">query_home</div>
+                <div class="code-name">#icon-query_home</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-list-detail"></use>
+                </svg>
+                <div class="name">list-detail</div>
+                <div class="code-name">#icon-list-detail</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-without"></use>
                 </svg>
                 <div class="name">without</div>

+ 15 - 3
src/assets/icon/fuse/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3549513 */
-  src: url('iconfont.woff2?t=1692171577992') format('woff2'),
-       url('iconfont.woff?t=1692171577992') format('woff'),
-       url('iconfont.ttf?t=1692171577992') format('truetype');
+  src: url('iconfont.woff2?t=1706348932330') format('woff2'),
+       url('iconfont.woff?t=1706348932330') format('woff'),
+       url('iconfont.ttf?t=1706348932330') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-fire_statistics:before {
+  content: "\e74d";
+}
+
+.icon-query_home:before {
+  content: "\e74b";
+}
+
+.icon-list-detail:before {
+  content: "\e740";
+}
+
 .icon-without:before {
   content: "\e70e";
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/assets/icon/fuse/iconfont.js


+ 21 - 0
src/assets/icon/fuse/iconfont.json

@@ -6,6 +6,27 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "39135106",
+      "name": "fire_statistics",
+      "font_class": "fire_statistics",
+      "unicode": "e74d",
+      "unicode_decimal": 59213
+    },
+    {
+      "icon_id": "38948724",
+      "name": "query_home",
+      "font_class": "query_home",
+      "unicode": "e74b",
+      "unicode_decimal": 59211
+    },
+    {
+      "icon_id": "37076167",
+      "name": "list-detail",
+      "font_class": "list-detail",
+      "unicode": "e740",
+      "unicode_decimal": 59200
+    },
+    {
       "icon_id": "33692561",
       "name": "without",
       "font_class": "without",

BIN
src/assets/icon/fuse/iconfont.ttf


BIN
src/assets/icon/fuse/iconfont.woff


BIN
src/assets/icon/fuse/iconfont.woff2


+ 4 - 1
src/assets/style/public.scss

@@ -16,10 +16,13 @@ body {
   height: 100%;
 }
 
-body {
+:root {
   --primaryColor: var(--el-color-primary);
   --colorColor  : #303133;
   --bgColor     : #f0f2f5;
+}
+
+body {
 
   font-family: "Microsoft YaHei";
   color      : var(--colorColor);

+ 13 - 13
src/router/config.ts

@@ -43,20 +43,8 @@ export const routes: Routes = [
     children: [
       ...system,
       {
-        name: RouteName.statistics,
-        path: "home",
-        component: () => import("@/view/statistics/index.vue"),
-        meta: { title: "首页", icon: "iconfire_home" },
-      },
-      {
-        name: RouteName.downloadLog,
-        path: "download-log",
-        component: () => import("@/view/vrmodel/downloadLog.vue"),
-        meta: { title: "下载记录查询", icon: "iconfire_home" },
-      },
-      {
         name: RouteName.vrmodel,
-        path: "vrmodel",
+        path: "home",
         component: () => import("@/view/vrmodel/index.vue"),
         meta: { title: "场景管理", icon: "iconfire_scenes" },
       },
@@ -91,6 +79,18 @@ export const routes: Routes = [
         component: () => import("@/view/case/caseFile.vue"),
         meta: { title: "卷宗管理" },
       },
+      {
+        name: RouteName.statistics,
+        path: "/statistics",
+        component: () => import("@/view/statistics/index.vue"),
+        meta: { title: "数据统计", icon: "icon-fire_statistics" },
+      },
+      {
+        name: RouteName.downloadLog,
+        path: "download-log",
+        component: () => import("@/view/vrmodel/downloadLog.vue"),
+        meta: { title: "下载记录", icon: "icon-query_home" },
+      },
     ],
   },
   {

+ 0 - 13
src/view/case/draw/edit-shape/compass.vue

@@ -1,17 +1,4 @@
 <template>
-  <!-- <el-form-item label="方向:">
-    <el-button
-      type="primary"
-      @click="
-        () => {
-          setRotate((value + 90) % 360);
-          emit('blur');
-        }
-      "
-    >
-      旋转
-    </el-button>
-  </el-form-item> -->
   <el-form-item label="方向:">
     <el-slider
       style="width: 100px"

+ 2 - 2
src/view/case/draw/edit-shape/index.ts

@@ -1,5 +1,5 @@
 import { markRaw, reactive } from "vue";
-import { images, customImage,  } from "../board/useBoard";
+import { images, customImage } from "../board/useBoard";
 
 const componentLoads = import.meta.glob("./*.vue");
 
@@ -7,7 +7,7 @@ export const components: { [key in string]: any } = reactive({});
 
 const map = {
   label: ["Circle", "Rectangle", "Wall", "Arrow"],
-  image: [...images, customImage, 'BgImage'],
+  image: [...images, customImage],
   delete: ["Icon"],
 };
 

+ 7 - 1
src/view/case/draw/edit-shape/label.vue

@@ -1,6 +1,11 @@
 <template>
   <el-form-item label="颜色:">
-    <el-color-picker v-model="value" color-format="rgba" show-alpha />
+    <el-color-picker
+      v-model="value"
+      color-format="rgba"
+      show-alpha
+      :predefine="predefineColors"
+    />
   </el-form-item>
   <slot />
   <Del @delete="$emit('delete')" />
@@ -10,6 +15,7 @@ import { ref, watchEffect } from "vue";
 import { BoardShape } from "../board";
 import { ElColorPicker } from "element-plus";
 import Del from "./delete.vue";
+import { predefineColors } from "./preset";
 
 const props = defineProps<{ shape: BoardShape }>();
 const emit = defineEmits<{ (e: "blur"): void; (e: "delete"): void }>();

+ 8 - 0
src/view/case/draw/edit-shape/preset.ts

@@ -0,0 +1,8 @@
+export const predefineColors = [
+  "#ff0f00",
+  "#ffbe00",
+  "#1a9bff",
+  "#1aad19",
+  "#000000",
+  "#ffffff",
+];

+ 3 - 3
src/view/statistics/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <com-head :options="[{ name: '首页', value: '1' }]" class="frame-head">
+  <com-head :options="[{ name: '数据统计', value: '1' }]" class="frame-head">
     <el-form label-width="84px">
       <el-form-item label="统计区间:" style="grid-area: 1/1/2/2">
         <p style="margin-top: -6px">{{ range }}</p>
@@ -122,7 +122,7 @@ onUnmounted(() => window.removeEventListener("resize", resize));
   margin-bottom: 16px;
 
   .statistics-content {
-  background-color: #fff;
+    background-color: #fff;
     position: absolute;
     left: 0;
     top: 0;
@@ -146,7 +146,7 @@ onUnmounted(() => window.removeEventListener("resize", resize));
     flex: 0 0 auto;
     line-height: 1;
     padding: 16px;
-    border-bottom: 1px solid rgba(0,0,0,0.06);;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.06);
     font-size: 16px;
   }
 

+ 1 - 1
src/view/statistics/statisticsInject.ts

@@ -99,7 +99,7 @@ export const statisticsConfigs: ConfigItem[] = reactive([
           name: "火调项目统计",
           type: "pie",
           label: {
-            formatter: "{d}%",
+            formatter: "{c}个",
             rich: {
               time: {
                 fontSize: 10,

+ 1 - 1
src/view/vrmodel/downloadLog.vue

@@ -1,5 +1,5 @@
 <template>
-  <com-head :options="[{ name: '下载记录查询', value: '2' }]" showCtrl>
+  <com-head :options="[{ name: '下载记录', value: '2' }]" showCtrl>
     <el-form label-width="84px">
       <el-form-item label="所属架构:">
         <com-company v-model="state.query.deptId" />