maxiaoxiao hace 11 meses
padre
commit
bd2d53b7eb

+ 6 - 5
src/views/complianceAnalysis/components/hgxsc.vue

@@ -52,7 +52,7 @@
       </el-tree>
     </div>
     <div class="bottomBtns">
-      <span class="clearBtn"  @click="reset">取消</span>
+      <span class="clearBtn" @click="reset">取消</span>
       <span class="sureBtn" @click="submitData">确定</span>
     </div>
   </div>
@@ -209,11 +209,12 @@ export default {
           }).then(() => {
             this.$emit("updateParent", "loading", true);
             setTimeout(() => {
-              this.$emit("updateParent", "rzMc", this.ruleForm.xmmc);
-              this.$emit("updateParent", "rzBsm", '401148617e5c41bdbde176f7e45d791e');
+              let bsm = "767d0754a41f43fb86982678134ff768";
+              hgxfx.addList({ ...this.ruleForm, bsm });
+              this.$emit("updateParent", "nowObj", this.ruleForm);
+              this.$emit("updateParent", "rzBsm", bsm);
               this.$emit("updateParent", "loading", false);
-              this.reset()
-              
+              this.reset();
             }, 500);
             // Add({ ...this.ruleForm }).then((res) => {
             //   if (res.success) {

+ 1 - 1
src/views/complianceAnalysis/components/lsjl.vue

@@ -39,7 +39,7 @@
         :key="item.bsm"
         @click="zoomItem(item)"
       >
-        <div>{{ dindex + 1 }}. 项目名称:{{ item.xmlx }}</div>
+        <div>{{ dindex + 1 }}. 项目名称:{{ item.xmmc }}</div>
         <div>建设单位:{{ item.jsdw }}</div>
         <div class="item_bottom">
           <el-tag type="warning" size="mini" v-if="item.rwzt == 0">创建</el-tag>

+ 6 - 3
src/views/complianceAnalysis/components/rzDtails.vue

@@ -7,7 +7,7 @@
       width="600px"
       :before-close="handleClose"
     >
-      <el-scrollbar class="logs height-350 max-width">
+      <div class="logs">
         <el-timeline class="max-box box-sizing">
           <el-timeline-item
             v-for="item in logsdata"
@@ -26,7 +26,7 @@
             </div>
           </el-timeline-item>
         </el-timeline>
-      </el-scrollbar>
+      </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="handleClose" class="btn-style">确 定</el-button>
@@ -93,7 +93,7 @@ export default {
     rzBsm(newValue) {
       if (newValue != "") {
         this.dialog = true;
-        // this.getRzData();
+        this.getRzData();
       } else {
         this.dialog = false;
       }
@@ -104,6 +104,9 @@ export default {
 
 <style lang="scss" scoped>
 .logs {
+  height: 600px;
+  overflow-y: auto;
+  overflow-x: hidden;
   background: rgb(255, 255, 255);
   border: 1px solid #d2d2d3;
   :deep(.el-timeline-item) {

+ 1 - 0
src/views/siteselection/index.vue

@@ -69,6 +69,7 @@ export default {
         {
           xmlx: "规划选址",
           jsdw: "国土空间总体规划",
+          bsm:'8979e8f6a9364828a9d6b2e459c8fd76',
           rwzt: 2,
           fxbg: "@/../static/data/ghss/合规性分析报告.docx",
         },

+ 9 - 2
static/data/ghss/data.js

@@ -2,7 +2,7 @@
 var data = {
     datalist: [{
         xmmc: '合规性测试', xzmj: 62.1, xmlx: '合规性分析', jsdw: "建设单位", rwzt: 2,
-        bsm: '401148617e5c41bdbde176f7e45d791e',
+        bsm: '767d0754a41f43fb86982678134ff768',
         geojson: '/static/data/ghss/导入.geojson',
         fxbg: "@/../static/data/ghss/合规性分析报告.docx",
     }],
@@ -73,4 +73,11 @@ var data = {
         { name: "陆地水域", value: 2.91 },
     ]
 };
-export default data;
+data.addList = function (adata) {
+    if (!adata.bsm) adata.bsm = '767d0754a41f43fb86982678134ff768'
+    if (!adata.geojson) adata.geojson = '/static/data/ghss/导入.geojson'
+    if (!adata.fxbg) adata.fxbg = '@/../static/data/ghss/合规性分析报告.docx'
+    if (!adata.rwzt) adata.rwzt = 2
+    data.datalist.unshift(adata)
+}
+export default data;