jinx 2 роки тому
батько
коміт
e987836e41
3 змінених файлів з 45 додано та 17 видалено
  1. 22 16
      src/views/tables/ask.vue
  2. 3 1
      src/views/tables/explorate.vue
  3. 20 0
      yarn.lock

+ 22 - 16
src/views/tables/ask.vue

@@ -2,7 +2,7 @@
 <template>
   <!-- <iframe style="width:100%;height: 100%;" src="./static/html/FG.html" frameborder="0"></iframe> -->
   <div class="ask-content">
-    <h4 class="title">询问笔录</h4>
+    <h2 class="title">询问/<span class="through">讯问</span>笔录</h2>
     <div class="container">
       <div class="line">
         <span>时间</span>
@@ -15,7 +15,7 @@
         <div class="write-line left" contenteditable></div>
       </div>
       <div class="line">
-        <span>询问/讯问人</span>
+        <span>询问/<span class="through">讯问</span>人</span>
         <div class="write-line" contenteditable></div>
         <span>工作单位</span>
         <div class="write-line" contenteditable></div>
@@ -27,7 +27,7 @@
         <div class="write-line" contenteditable></div>
       </div>
       <div class="line">
-        <span>被询问/讯问人</span>
+        <span>被询问/<span class="through">讯问</span>人</span>
         <div style="flex: 0.5" class="write-line" contenteditable></div>
         <span>性别</span>
         <div style="flex: 0.3" class="write-line" contenteditable></div>
@@ -52,7 +52,7 @@
         <div class="write-line left" contenteditable></div>
       </div>
       <div class="line worap">
-        <span style="line-height: 40px"> (口头传唤/被扭送/自动投案的被询问/讯问人于</span>
+        <span style="line-height: 40px"> (口头传唤/被扭送/自动投案的被询问/<span class="through">讯问</span>人于</span>
         <div class="write-line" style="width: 40%" contenteditable></div>
         <span style="line-height: 40px"> 到达,</span>
         <div class="write-line" style="" contenteditable></div>
@@ -70,12 +70,12 @@
           <div class="item"></div>
           <div class="item"></div>
           <div class="item"></div>
+          <div class="item"></div>
         </div>
       </div>
     </div>
-    <div class="bottom-name" @click="getRows">
+    <div class="bottom-name">
       <span>被询问人:</span>
-      <span>被讯问人:</span>
     </div>
   </div>
 </template>
@@ -88,29 +88,35 @@ const getRows = () => {
 };
 </script>
 <style lang="scss" scoped>
+.through {
+  text-decoration: line-through;
+}
 .ask-content {
   color: #000;
-  font-size: 20px;
-  padding: 10px 30px;
+  font-size: 24px;
+  font-weight: 400;
   width: 100%;
   height: 100%;
+  // display: grid;
   overflow: auto;
-  font-family: sr, st;
+  font-family: SimSun-Regular, SimSun;
+  box-sizing: border-box;
+
   .title {
     text-align: center;
+    margin-bottom: 78px;
   }
   .bottom-name {
-    width: 80%;
+    width: 100%;
     height: 40px;
     line-height: 40px;
-    margin: 0 auto;
+    margin: 28px auto 0;
   }
   .container {
     text-align: center;
-    width: 80%;
     margin: 0 auto;
-    padding: 0 0 40px 0;
-    border-bottom: 2px solid #000;
+    // padding: 0 0 40px 0;
+    // border-bottom: 2px solid #000;
     .line {
       width: 100%;
       display: flex;
@@ -145,7 +151,7 @@ const getRows = () => {
     }
     .more-line {
       width: 100%;
-      height: 200px;
+      height: 240px;
       line-height: 40px;
       position: relative;
       overflow-y: hidden;
@@ -180,7 +186,7 @@ const getRows = () => {
         // z-index: 1;
         .item {
           width: 100%;
-          height: 20%;
+          height: 16.6%;
           border-bottom: 1px solid #000;
         }
       }

+ 3 - 1
src/views/tables/explorate.vue

@@ -45,9 +45,11 @@ import extract from './extract.vue';
 
 //遗留物品
 import legacy from './legacy.vue';
+//询问、讯问
+import ask from './ask.vue';
 // const eleList = ref([one, two, three, four]);
 // const eleList = ref([authorOne, authorTwo]);
-const eleList = ref([legacy]);
+const eleList = ref([ask]);
 
 const downMode = ref(false);
 const getLayoutImage = async () => {

+ 20 - 0
yarn.lock

@@ -649,6 +649,13 @@ destroy@1.2.0:
   resolved "http://192.168.0.47:4873/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+dom7@^4.0.4:
+  version "4.0.6"
+  resolved "http://192.168.0.47:4873/dom7/-/dom7-4.0.6.tgz#091a51621d7a19ce0fb86045cafb3c10035e97ed"
+  integrity sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==
+  dependencies:
+    ssr-window "^4.0.0"
+
 dompurify@^2.2.0:
   version "2.4.5"
   resolved "http://192.168.0.47:4873/dompurify/-/dompurify-2.4.5.tgz#0e89a27601f0bad978f9a924e7a05d5d2cccdd87"
@@ -1262,6 +1269,11 @@ sourcemap-codec@^1.4.8:
   resolved "http://192.168.0.47:4873/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+ssr-window@^4.0.0, ssr-window@^4.0.2:
+  version "4.0.2"
+  resolved "http://192.168.0.47:4873/ssr-window/-/ssr-window-4.0.2.tgz#dc6b3ee37be86ac0e3ddc60030f7b3bc9b8553be"
+  integrity sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==
+
 stackblur-canvas@^2.0.0:
   version "2.5.0"
   resolved "http://192.168.0.47:4873/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
@@ -1292,6 +1304,14 @@ svg-pathdata@^6.0.3:
   resolved "http://192.168.0.47:4873/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
   integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
 
+swiper@^8.3.0:
+  version "8.4.7"
+  resolved "http://192.168.0.47:4873/swiper/-/swiper-8.4.7.tgz#0301d385c3efc8efe8b66a64187edcb30e3067ee"
+  integrity sha512-VwO/KU3i9IV2Sf+W2NqyzwWob4yX9Qdedq6vBtS0rFqJ6Fa5iLUJwxQkuD4I38w0WDJwmFl8ojkdcRFPHWD+2g==
+  dependencies:
+    dom7 "^4.0.4"
+    ssr-window "^4.0.2"
+
 text-segmentation@^1.0.3:
   version "1.0.3"
   resolved "http://192.168.0.47:4873/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"