Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/api/ghss/hgxfx.js

@@ -6,7 +6,8 @@ const hgxfxApi = {
     GetPage: '/apply/hgxfx/GetPage',
     GetScx: '/apply/hgxfx/GetScxList',
     UpdateScx: '/apply/hgxfx/UpdateScx',
-    ShapeUpload:'/file/uploadShpZip'
+    ShapeUpload:'/file/uploadShpZip',
+    GetLog: '/apply/hgxfx/GetLog',
 }
 
 /**
@@ -24,6 +25,21 @@ export function ShapeUpload(parameter) {
         }
     })
 }
+/**
+ * 根据任务编号查询任务
+ * @param parameter
+ * @returns {*}
+ */
+export function GetLog(parameter) {
+    return request({
+        method: 'get',
+        url: hgxfxApi.GetLog,
+        params: parameter,
+        headers: {
+            'Content-Type': 'application/json;charset=UTF-8'
+        }
+    })
+}
 /**
  * 登录
  * @param parameter

src/views/complianceAnalysis/components/lsjl.vue

@@ -53,7 +53,7 @@
               type="primary"
               size="mini"
               style="margin-left: 5px"
-              @click="checkDetails(item)"
+              @click.stop="checkDetails(item)"
               >结果</el-button
             >
             <el-button
@@ -92,6 +92,9 @@ export default {
     historyList: {
       type: Array,
     },
+    type: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -112,7 +115,7 @@ export default {
     // this.getData();
     if (this.historyList) {
       this.datalist = this.historyList;
-    }else{
+    } else {
       this.datalist = hgxfx.datalist;
     }
   },
@@ -147,8 +150,8 @@ export default {
       //   if (res.success) {
       // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
       // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
-      this.$emit("updateParent", "activeTabs", "scjg");
-      this.$emit("updateXZJG", "activeTabs", "xzjg");
+      let next = this.$props.type == "hgxfx" ? "scjg" : "xzjg";
+      this.$emit("updateParent", "activeTabs", next);
       console.log(555555, item);
       //   }
       // });

src/views/complianceAnalysis/components/rzDtails.vue

@@ -0,0 +1,120 @@
+<template>
+  <div>
+    <el-dialog
+      :title="rzMc"
+      v-model="dialog"
+      width="600px"
+      :before-close="handleClose"
+    >
+      <el-scrollbar class="logs height-350 max-width">
+        <el-timeline class="max-box box-sizing">
+          <el-timeline-item
+            v-for="item in data"
+            :key="item.bsm"
+            :timestamp="item.rzsj"
+            :type="
+              item.rzlx == 'info'
+                ? 'success'
+                : item.rzlx == 'warning'
+                ? 'warning'
+                : 'danger'
+            "
+          >
+            <div class="" style="white-space: normal">
+              {{ item.rzlr }}
+            </div>
+          </el-timeline-item>
+        </el-timeline>
+      </el-scrollbar>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="handleClose" class="btn-style">确 定</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { GetLog } from "@/api/ghss/hgxfx.js";
+export default {
+  props: {
+    rzBsm: {
+      type: String,
+    },
+    rzMc: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      data: [],
+      dialog: false,
+      timer: "",
+    };
+  },
+  mounted() {
+    clearTimeout(this.timer);
+  },
+  methods: {
+    handleClose() {
+      parent.emit("update:rzBsm", "");
+    },
+    getRzData() {
+      GetLog({ bsm: this.$props.rzBsm }).then((res) => {
+        if (res.success) {
+          this.data = res.data;
+          // if (res.data.rwzt != (2 || 3)) {
+          //   this.timer = setTimeout(() => {
+          //      this.$props.rzBsm != "" && this.getRzData();
+          //   }, 3000);
+          // }
+          if (!res.data[0]) {
+            this.timer = setTimeout(() => {
+              this.$props.rzBsm != "" && this.getRzData();
+            }, 3000);
+          } else if (
+            res.data[0].rzlr == "分析完成" ||
+            res.data[0].rzlx == "error"
+          ) {
+          } else {
+            this.timer = setTimeout(() => {
+              this.$props.rzBsm != "" && this.getRzData();
+            }, 3000);
+          }
+        }
+      });
+    },
+  },
+  watch: {
+    rzBsm(newValue) {
+      if (newValue != "") {
+        this.dialog = true;
+        console.log("-------")
+        this.getRzData();
+      } else {
+        this.dialog = false;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.logs {
+  background: rgb(255, 255, 255);
+  border: 1px solid #d2d2d3;
+  :deep(.el-timeline-item) {
+    padding-bottom: 5px;
+  }
+  ul {
+    padding-left: 35px;
+    li {
+      line-height: 35px;
+    }
+  }
+}
+:deep(.el-dialog__body) {
+  padding: 10px 20px;
+}
+</style>

src/views/complianceAnalysis/index.vue

@@ -3,7 +3,7 @@
   <div class="ghzc complianceAnalysis">
     <div class="innerContainer leftPane">
       <h2 class="vl-notice-title">
-        <span class="lv-title">合规性分析{{ activeTabs }}</span>
+        <span class="lv-title">合规性分析</span>
         <span class="lv-icon-maxmini"> </span>
         <i class="icon-remove"></i>
       </h2>
@@ -12,17 +12,27 @@
           <Hgxsc :activeTabs="activeTabs" @updateParent="changeData"></Hgxsc>
         </el-tab-pane>
         <el-tab-pane label="历史记录" name="lsju">
-          <Lsjl :rzBsm="rzBsm" @updateParent="changeData"></Lsjl>
+          <Lsjl
+            type="hgxfx"
+            :activeTabs="activeTabs"
+            :rzBsm="rzBsm"
+            @updateParent="changeData"
+          ></Lsjl>
         </el-tab-pane>
         <el-tab-pane
           label="检查结果"
-          :disabled="activeTabs != 'scjg'"
           name="scjg"
+          :disabled="activeTabs != 'scjg'"
         >
-          <Scjg :scjgObj="scjgObj" :jgTable="jgTable"></Scjg
+          <Scjg
+            :activeTabs="activeTabs"
+            :scjgObj="scjgObj"
+            :jgTable="jgTable"
+          ></Scjg
         ></el-tab-pane>
       </el-tabs>
     </div>
+    <RzDtails :rzBsm="rzBsm" :rzMc="rzMc"></RzDtails>
   </div>
 </template>
 
@@ -30,6 +40,7 @@
 import Hgxsc from "./components/hgxsc.vue";
 import Lsjl from "./components/lsjl.vue";
 import Scjg from "./components/scjg.vue";
+import RzDtails from "./components/rzDtails.vue";
 // import TabelView from "./components/tabelView.vue";
 export default {
   name: "complianceAnalysis",
@@ -37,6 +48,7 @@ export default {
     Hgxsc,
     Lsjl,
     Scjg,
+    RzDtails,
     // TabelView,
   },
   data() {

src/views/siteselection/index.vue

@@ -22,7 +22,7 @@
             :rzBsm="rzBsm"
             :activeTabs="activeTabs"
             :historyList="historyList"
-            @updateXZJG="changeData"
+            @updateParent="changeData"
           ></Lsjl>
         </el-tab-pane>
         <!-- :disabled="activeTabs != 'scjg'" -->