细节优化修改

src/views/ajbzDetail.vue

@@ -263,7 +263,7 @@
                       :class="aqgjcamplifier">
                 <div class="grid-content bg-purple">
                   <el-card class="box-card"
-                           style="height: 260px">
+                           style="height: 300px">
                     <div class="conTitle">
                       <div class="conTitleLeft">案情关键词</div>
                       <div class="conTitleRight"
@@ -283,7 +283,7 @@
                       v-show="aqgjc">
                 <div class="grid-content bg-purple">
                   <el-card class="box-card"
-                           style="height: 260px">
+                           style="height: 300px">
                     <div class="conTitle">
                       <div class="conTitleLeft">标识号</div>
                       <div class="conTitleRighty">
@@ -307,7 +307,7 @@
                                @click="hanlDelete(data.rcdid)"></i>
                           </span>
                         </li>
-                        <li>嫌疑人：</li>
+                        <li style="margin-left:0">嫌疑人：</li>
                         <li v-for="data in xyrList"
                             :key="data.rcdid">
                           <span><i class="el-icon-phone"></i>{{data.gjc}}</span>
@@ -380,10 +380,12 @@
             <div class="grid-content bg-purple">
               <el-card v-if="!bzFlag"
                        class="box-card">
-                <div class="incidentTitle">
+                <div class="incidentTitle incidentTitle1">
                   <span>案事件标注</span>
+
                 </div>
                 <div class="incidentBtn">
+
                   <div class="btn"
                        v-for="data in tableBar"
                        :key="data.key"
@@ -435,11 +437,19 @@
                     </div>
                   </div>
                 </div>
+                <div class="wcbzButton">
+                  <el-button type="primary"
+                             @click="submitBz">完成标注</el-button>
+                  <el-button type="warning"
+                             @click="bzDetail">查看标注详情</el-button>
+                </div>
               </el-card>
               <el-card v-else
                        class="box-card">
-                <div class="incidentTitle">
+                <div class="incidentTitle incidentTitle1">
                   <span>案事件标注</span>
+                  <span @click="ajbzRrturn"
+                        class="titleSpan">返回</span>
                 </div>
                 <div class="incidentCon">
                   <div class="bztag-wrap">
@@ -452,17 +462,18 @@
                     </div>
                   </div>
                 </div>
+                <div class="wcbzButton">
+                  <el-button type="primary"
+                             @click="submitBz">完成标注</el-button>
+                  <el-button type="warning"
+                             @click="bzDetail">查看标注详情</el-button>
+                </div>
               </el-card>
             </div>
           </el-col>
         </el-row>
       </el-main>
-      <el-footer height="81px">
-        <el-button type="primary"
-                   @click="submitBz">完成标注</el-button>
-        <el-button type="warning"
-                   @click="bzDetail">查看标注详情</el-button>
-      </el-footer>
+
     </el-container>
     <el-dialog title="标识号新增"
                :visible.sync="centerDialogVisibles1"
@@ -566,6 +577,7 @@ export default {
       ajxzlbStr: "",
       ajzlbStr: "",
       bzFlag: false,
+      titleSpan1: false,
       parentLb: {}, //主类类别
       centerDialogVisibles: false,
       formLabelAlign: [],
@@ -717,6 +729,7 @@ export default {
       }).then((res) => {
         self.ajzlbStr = res.data.ajzlbStr;
         self.ajxzlbStr = res.data.ajxzlbStr;
+
         self.$nextTick(() => {
           // treeBox 元素的ref   value 绑定的node-key
           self.$refs.tree1.setCurrentKey(res.data.ajzlb);
@@ -724,10 +737,17 @@ export default {
         });
       });
     },
+    ajbzRrturn () {
+      this.bzFlag = false
+
+
+    },
     bzDetail () {
       var self = this;
       self.getBz()
       self.bzFlag = true;
+      self.titleSpan1 = true
+      console.log(self.titleSpan1)
     },
     cancel () {
       this.centerDialogVisibles1 = false;
@@ -827,9 +847,11 @@ export default {
         getGjcList({
           asjbh: this.asjbh,
         }).then((res) => {
-          this.word = res.data.map((item) => {
+
+          let newData = res.data.map((item) => {
             return item.gjc;
           });
+          this.word = newData.filter(item => item != "")
         });
 
       getFwbzhList({
@@ -1079,7 +1101,7 @@ export default {
 }
 .contioner {
   width: 100%;
-  height: 100%;
+  height: 980px;
   background: #1f212c;
   margin: 0 auto;
 }
@@ -1119,7 +1141,7 @@ export default {
   line-height: 60px;
 }
 .box-card {
-  height: 816px;
+  height: 852px;
   background: #efefef;
   padding: 0;
 }
@@ -1128,7 +1150,7 @@ export default {
   margin-bottom: 10px;
 }
 .topSamllCard {
-  height: 816px !important;
+  height: 852px !important;
   margin-bottom: 0 !important;
 }
 /deep/ .el-card__body {
@@ -1253,7 +1275,7 @@ export default {
   width: 96%;
   height: 191px;
   position: absolute;
-  margin-top: 59px;
+  margin-top: 70px;
   padding-left: 10px;
   padding-top: 10px;
   overflow: hidden;
@@ -1277,17 +1299,22 @@ export default {
   border-radius: 10px;
   background: #ededed;
 }
+.keywordCon ul li:nth-child(1) {
+  margin-left: 0;
+}
 .keywordCon ul li {
-  width: 95%;
+  width: 86%;
   font-size: 14px;
   font-weight: 400;
   height: 50px;
+  margin-left: 40px;
   line-height: 50px;
   display: flex;
   justify-content: space-between;
 }
 .el-tag {
-  margin-left: 10px;
+  margin-left: 15px;
+  margin-bottom: 15px;
 }
 .el-icon-delete {
   cursor: pointer;
@@ -1316,9 +1343,12 @@ export default {
   background: #dcdcdc;
   opacity: 1;
   border-radius: 4px 4px 0px 0px;
-
   line-height: 48px;
 }
+.incidentTitle1 {
+  display: flex;
+  justify-content: space-between;
+}
 .incidentTitle span {
   font-size: 18px;
   color: #1f212c;
@@ -1352,7 +1382,7 @@ export default {
 }
 .incidentCon {
   width: 100%;
-  height: 698px;
+
   position: absolute;
   top: 118px;
   display: flex;
@@ -1360,7 +1390,7 @@ export default {
 .incidentConLeft,
 .incidentConRight {
   width: 48%;
-  height: 652px;
+
   margin: 24px;
 }
 .search {
@@ -1383,7 +1413,7 @@ export default {
 }
 .tree {
   width: 98%;
-  height: 600px;
+  height: 550px;
   overflow: hidden;
   overflow-y: auto;
 }
@@ -1458,4 +1488,21 @@ export default {
   height: 40px;
   line-height: 40px;
 }
+.titleSpan {
+  font-size: 14px;
+  color: #1f212c;
+  padding-left: 24px;
+  font-weight: 200;
+  padding-right: 15px;
+  cursor: pointer;
+  padding-right: 24px;
+}
+.wcbzButton {
+  width: 100%;
+  height: 80px;
+  line-height: 80px;
+  position: absolute;
+  top: 750px;
+  text-align: center;
+}
 </style>

src/views/zdgl.vue

@@ -94,7 +94,7 @@
       </el-dialog>
       <el-dialog title="关联高危地区"
                  :visible.sync="gwdqDialogVisible"
-                 width="650px"
+                 width="800px"
                  center>
         <el-form label-width="100px"
                  :model="formLabelAlign2"
@@ -151,6 +151,7 @@
                            :label="columnTitle.label"
                            :prop="columnTitle.prop"
                            align="center">
+
             <template slot-scope="scope">
               <div v-if="
                   columnIndex == gwdqList.length - 1 && columnTitle.prop == 'cz'
@@ -182,7 +183,7 @@
               <el-button @click.native.prevent="deleteRow(scope.row)"
                          type="text"
                          size="small"
-                         align="center">
+                         style="text-align:center">
                 删除
               </el-button>
             </template>
@@ -521,7 +522,6 @@ export default {
             groupid: item.groupid,
             label: item.name,
           });
-
           res.items.forEach((item, index) => {
             arr.push({
               pid: item.pid,
@@ -542,6 +542,7 @@ export default {
             });
           });
         });
+
         this.setTree[index].children = arr;
       });
       console.log(arr, "arr");
@@ -682,28 +683,37 @@ export default {
 .el-table tr:nth-child(2n) {
   background: #dcdcdc;
 }
-// .gwdqcontent thead {
-//   display: block;
-//   width: 629px;
-// }
-// .gwdqcontent tbody {
-//   height: 300px;
-//   overflow: hidden;
-//   overflow-y: auto;
-//   display: block;
-//   width: 629px;
-// }
-// .gwdqcontent th {
-//   width: 112px;
-// }
-// .gwdqcontent tbody td {
-//   width: 112px;
-// }
-// .gwdqcontent tbody td:nth-child(1),
-// .gwdqcontent thead th:nth-child(1) {
-//   width: 50px;
-// }
-// .gwdqcontent thead th:nth-last-child(2) {
-//   width: 130px;
-// }
+.gwdqcontent {
+  height: 235px;
+  overflow: hidden;
+  overflow-y: auto;
+  display: block;
+  width: 780px;
+}
+.gwdqcontent thead {
+  display: block;
+  width: 780px;
+}
+.gwdqcontent tbody {
+  height: 190px;
+  overflow: hidden;
+  overflow-y: auto;
+  display: block;
+  width: 780px;
+}
+.gwdqcontent th {
+  width: 120px;
+}
+.gwdqcontent tbody td {
+  text-align: center;
+  width: 120px;
+}
+.gwdqcontent tbody td:nth-child(1),
+.gwdqcontent thead th:nth-child(1) {
+  width: 60px;
+}
+
+.el-table_2_column_11 {
+  text-align: center;
+}
 </style>