Browse Source

修改样式

wangfumin 2 months ago
parent
commit
a2406c8503

+ 26 - 3
src/assets/icon/newfire/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe7db;</span>
+                <div class="name">screen_f</div>
+                <div class="code-name">&amp;#xe7db;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe7da;</span>
                 <div class="name">look_t</div>
                 <div class="code-name">&amp;#xe7da;</div>
@@ -180,9 +186,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1764838829238') format('woff2'),
-       url('iconfont.woff?t=1764838829238') format('woff'),
-       url('iconfont.ttf?t=1764838829238') format('truetype');
+  src: url('iconfont.woff2?t=1765185348668') format('woff2'),
+       url('iconfont.woff?t=1765185348668') format('woff'),
+       url('iconfont.ttf?t=1765185348668') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -209,6 +215,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-screen_f"></span>
+            <div class="name">
+              screen_f
+            </div>
+            <div class="code-name">.icon-screen_f
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-look_t"></span>
             <div class="name">
               look_t
@@ -399,6 +414,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-screen_f"></use>
+                </svg>
+                <div class="name">screen_f</div>
+                <div class="code-name">#icon-screen_f</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-look_t"></use>
                 </svg>
                 <div class="name">look_t</div>

+ 7 - 3
src/assets/icon/newfire/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 5058908 */
-  src: url('iconfont.woff2?t=1764838829238') format('woff2'),
-       url('iconfont.woff?t=1764838829238') format('woff'),
-       url('iconfont.ttf?t=1764838829238') format('truetype');
+  src: url('iconfont.woff2?t=1765185348668') format('woff2'),
+       url('iconfont.woff?t=1765185348668') format('woff'),
+       url('iconfont.ttf?t=1765185348668') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-screen_f:before {
+  content: "\e7db";
+}
+
 .icon-look_t:before {
   content: "\e7da";
 }

File diff suppressed because it is too large
+ 1 - 1
src/assets/icon/newfire/iconfont.js


+ 7 - 0
src/assets/icon/newfire/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "46294922",
+      "name": "screen_f",
+      "font_class": "screen_f",
+      "unicode": "e7db",
+      "unicode_decimal": 59355
+    },
+    {
       "icon_id": "46269927",
       "name": "look_t",
       "font_class": "look_t",

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


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


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


+ 6 - 0
src/assets/style/public.scss

@@ -593,6 +593,12 @@ html .el-input-group__append button.el-button {
   border: 1px solid #e5e5e5;
 }
 
+.el-button--primary.is-plain {
+  background-color: transparent;
+}
+.el-button--primary.is-plain:hover {
+  background-color: var(--el-color-primary);
+}
 // :root {
 //   --el-color-primary: green;
 // }

+ 1 - 1
src/view/newFireCase/newFireDetails/components/mix3d.vue

@@ -523,7 +523,7 @@ onMounted(async () => {
   height: 60px!important;
 }
 .scene-edit-dialog .el-dialog__body {
-  padding: 24px 30px;
+  padding: 40px 48px;
 }
 .el-table th .cell .el-checkbox {
   margin-left: 0!important;

+ 1 - 1
src/view/newFireCase/newFireDetails/components/scene.vue

@@ -41,7 +41,7 @@
                 <span class="act" @click.stop="openDaiKan(item)"><i class="iconfont icon-look_t" /></span>
               </el-tooltip>
               <el-tooltip content="全屏">
-                <span class="act" @click.stop="onFullscreen()"><i class="iconfont icon-window_m" /></span>
+                <span class="act" @click.stop="onFullscreen()"><i class="iconfont icon-screen_f" /></span>
               </el-tooltip>
             </div>
           </el-menu-item>

+ 12 - 18
src/view/newFireCase/newFireDetails/components/sitetext.vue

@@ -5,11 +5,7 @@
     <p><span class="label">勘验地点:</span>{{ safe(d.address) }}</p>
     <p><span class="label">勘验人员姓名、勘验人描述(含技术员职务):</span>{{ safe(d.userInfo) }}</p>
     <p><span class="label">勘验气象条件(天空、风力、温度):</span>{{ safe(d.weather) }}</p>
-
-    <div class="section">
-      <div class="section-title">勘验情况:</div>
-      <div class="section-body">{{ safe(d.situation) }}</div>
-    </div>
+    <p><span class="label">勘验情况:</span>{{ safe(d.situation) }}</p>
 
     <div class="section">
       <div class="section-title">一、环境勘验</div>
@@ -31,21 +27,16 @@
       <div class="section-body">{{ safe(d.specialInquest) }}</div>
     </div>
 
-    <div class="section">
-      <div class="section-title">提取物品描述:</div>
-      <div class="section-body">{{ safe(d.itemDescription) }}</div>
-    </div>
-
-    <div class="section">
-      <div class="section-title">现场拍照制图描述:</div>
-      <div class="section-body">{{ safe(d.imgDescription) }}</div>
-    </div>
+    <p><span class="label">提取物品描述:</span>{{ safe(d.itemDescription) }}</p>
+    <p><span class="label">现场拍照制图描述:</span>{{ safe(d.imgDescription) }}</p>
 
     <div class="section">
       <div class="section-title">勘验信息:</div>
-      <p>勘验负责人:{{ safe(d.leader) }}</p>
-      <p>记录人:{{ safe(d.recorder) }}</p>
-      <p>勘验人:{{ safe(d.inspector) }}</p>
+      <div class="witness-item">
+        <p>勘验负责人:{{ safe(d.leader) }}</p>
+        <p>记录人:{{ safe(d.recorder) }}</p>
+        <p>勘验人:{{ safe(d.inspector) }}</p>
+      </div>
     </div>
 
     <div v-if="Array.isArray(d.witnessInfo) && d.witnessInfo.length" class="section witness-list">
@@ -130,6 +121,8 @@ const safe = (v: any) => (v === undefined || v === null || v === '' ? '-' : Stri
   margin-top: 0;
 }
 .section-title {
+  line-height: 16px;
+  margin-top: 12px;
   color: rgba(0, 0, 0, 0.85);
 }
 .section-body {
@@ -143,6 +136,7 @@ const safe = (v: any) => (v === undefined || v === null || v === '' ? '-' : Stri
   border: 1px solid #f0f0f0;
   border-radius: 4px;
   background: #fafafa;
-  margin-bottom: 8px;
+  margin-top: 12px;
+  margin-bottom: 24px;
 }
 </style>