几个小问题修改

website/src/components/ghss/fzxmxz/xzjg.vue

@@ -32,8 +32,18 @@
                     }
                   "
                 >
-                 <el-icon class="pointer font-18 margin-right-10" title="定位" @click="mapview(item1)"><location /></el-icon>
-                 <el-icon class="pointer font-18 " title="删除" @click="deleteprogramme($event, item1)"><delete /></el-icon>
+                  <el-icon
+                    class="pointer font-18 margin-right-10"
+                    title="定位"
+                    @click="mapview(item1)"
+                    ><location
+                  /></el-icon>
+                  <el-icon
+                    class="pointer font-18"
+                    title="删除"
+                    @click="deleteprogramme($event, item1)"
+                    ><delete
+                  /></el-icon>
                 </span>
               </div>
             </template>
@@ -90,8 +100,18 @@
                     }
                   "
                 >
-                 <el-icon class="pointer font-18 margin-right-10" title="定位" @click="mapview(item)"><location /></el-icon>
-                 <el-icon class="pointer font-18 " title="添加到已选方案" @click="addprogramme($event, item)"><plus /></el-icon>
+                  <el-icon
+                    class="pointer font-18 margin-right-10"
+                    title="定位"
+                    @click="mapview(item)"
+                    ><location
+                  /></el-icon>
+                  <el-icon
+                    class="pointer font-18"
+                    title="添加到已选方案"
+                    @click="addprogramme($event, item)"
+                    ><plus
+                  /></el-icon>
                 </span>
               </div>
             </template>
@@ -207,8 +227,8 @@ export default {
           JSON.stringify(
             prop.tempObj.items.filter((item1) => {
               return item1.bsm == item.bsm;
-            })
-          )
+            }),
+          ),
         );
         prop.xzjgObj.items.push(temp[0]);
       },
@@ -230,7 +250,7 @@ export default {
       },
       submit() {
         if (xzjg.reportText == "查看报告") {
-          window.open(xzjg.model.fxbg.replace('.docx','.pdf'), "_blank");
+          window.open(xzjg.model.fxbg.replace(".docx", ".pdf"), "_blank");
           return;
         }
         if (xzjg.bgList.length == 0) {
@@ -249,26 +269,28 @@ export default {
               SaveWordFile({
                 bsm: prop.rwBsm,
                 xzbsm: json,
-              }).then((res) => {
-                parent.emit("update:loading", false);
-                if (res.success && res.data != null) {
-                  ElMessage.success("报告生成成功！");
-                  xzjg.model = res.data;
-                  xzjg.reportText = "查看报告";
-                }else{
+              })
+                .then((res) => {
+                  parent.emit("update:loading", false);
+                  if (res.success && res.data != null) {
+                    ElMessage.success("报告生成成功！");
+                    xzjg.model = res.data;
+                    xzjg.reportText = "查看报告";
+                  } else {
+                    parent.emit("update:loading", false);
+                    ElMessage.success("报告生成失败！");
+                  }
+                })
+                .catch(() => {
                   parent.emit("update:loading", false);
                   ElMessage.success("报告生成失败！");
-                }
-              }).catch(() => {
-                parent.emit("update:loading", false);
-                ElMessage.success("报告生成失败！");
-              });
+                });
             }
           },
         });
       },
-      downReport(){
-          window.open(xzjg.model.zip, "_blank");
+      downReport() {
+        window.open(xzjg.model.zipfile, "_blank");
       },
       loadJgMap() {
         if (xzjg.layer == null) {
@@ -299,7 +321,7 @@ export default {
               });
             },
             function (feature, popup) {
-              console.log(feature)
+              console.log(feature);
               //获取选址结果
               GetXzJgByBsm({
                 jgbsm: feature.get("BSM"),
@@ -334,14 +356,14 @@ export default {
                       html += `<li><span>${
                         jg.yxyzmc
                       }：</span><span>压占面积${Number(jg.fxjg).toFixed(
-                        0
+                        0,
                       )}m²</span></li>`;
                     });
                   }
                   popup({}, html);
                 }
               });
-            }
+            },
           );
           arcMap.addLayer(xzjg.layer);
         }
@@ -351,10 +373,10 @@ export default {
           `RWBSM='${prop.rwBsm}'`,
           function (fs) {
             xzjg.layer.getSource().addFeatures(fs);
-          }
+          },
         );
       },
-      loadJg(bsm){
+      loadJg(bsm) {
         prop.rwBsm = bsm;
         if (xzjg.layer) {
           xzjg.layer.getSource().clear();
@@ -367,15 +389,15 @@ export default {
           xzjg.reportText = "查看报告";
         }
       },
-      initData(){
+      initData() {
         xzjg.model = prop.rwObj;
         xzjg.bgList = prop.tempObj.items.filter(
-          (item) => !prop.xzjgObj.items.some((ele) => ele.bsm === item.bsm)
+          (item) => !prop.xzjgObj.items.some((ele) => ele.bsm === item.bsm),
         );
         xzjg.bgList.sort(function (a, b) {
           return parseInt(a.yxfa) - parseInt(b.yxfa);
         });
-      }
+      },
     });
     watch(
       () => prop.activeTabs,
@@ -383,7 +405,7 @@ export default {
         if (newValue == "scjg") {
           xzjg.initData();
         }
-      }
+      },
     );
     return { ...toRefs(xzjg) };
   },

website/src/views/ghcgscygl/ghcgsb/Qxxb.vue

@@ -3,9 +3,15 @@
     <div class="header flex-box align-center box-sizing">
       <div class="header-left">
         <el-form :inline="true" :model="formInline">
-          <el-form-item label="标题:">
+          <el-form-item label="成果名称:">
             <el-input v-model="formInline.subject"></el-input>
           </el-form-item>
+          <el-form-item label="记录主键:">
+            <el-input v-model="formInline.id"></el-input>
+          </el-form-item>
+          <el-form-item label="流程主键:">
+            <el-input v-model="formInline.instid"></el-input>
+          </el-form-item>
           <el-form-item label="规划类型:" style="display: none">
             <el-select v-model="formInline.planType" placeholder="请选择">
               <el-option label="总体规划" value="1"></el-option>
@@ -232,6 +238,8 @@ export default {
     const parent = { ...context };
     const qxyh = reactive({
       formInline: {
+        id: "",
+        instid: "",
         planType: "1",
         current: 1,
         size: 20,

website/src/views/ghcgscygl/ghcgsb/xxgh/Czgh/Qxyh.vue

@@ -1,102 +1,6 @@
 <template>
   <div class="qxyh max-box flex-box column">
     <el-tabs type="border-card" class="xz_box" v-model="activeTabs">
-      <el-tab-pane label="上报统计" name="sbtj">
-        <el-table
-          :data="treeTableData"
-          :expand-row-keys="defaultExpandedKeys"
-          border
-          row-key="id"
-          :tree-props="{ children: 'children' }"
-          style="width: 100%"
-          highlight-current-row
-          height="calc(100vh - 100px )"
-          v-loading="loading"
-          element-loading-text="正在加载中..."
-          :element-loading-spinner="svg"
-          element-loading-svg-view-box="-10, -10, 50, 50"
-          element-loading-background="rgba(122, 122, 122, 0.8)"
-        >
-          <el-table-column
-            prop="xzqh"
-            label="行政区划"
-            width="240"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            prop="xzczs"
-            label="行政村总数"
-            width="120"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="qxysbczs"
-            label="旗县已上报的村庄数"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="sbdstczs"
-            label="上报到省厅村庄数"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="wbscjd"
-            label="文本审查节点(补正)"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="slsjbz"
-            label="矢量数据审查节点(机审)"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="ybas"
-            label="已备案数(用地审查节点)"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="bal"
-            label="备案率(%)(已备案数行政村总数)"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column label="旗县未上报的村庄数" align="center">
-            <template #default="scope">
-              <el-popover
-                placement="right"
-                :width="200"
-                trigger="click"
-                v-if="scope.row.wsbczs.length > 0"
-              >
-                <template #reference>
-                  <span style="cursor: pointer; color: #409eff">
-                    {{ scope.row.qxwsbczs }}</span
-                  >
-                  <!-- <i style="cursor: pointer" @click="getLayerId(scope.row)">
-                  </i> -->
-                </template>
-                <ul class="moreList">
-                  <li
-                    v-for="(item, i) in scope.row.wsbczs"
-                    :key="i"
-                    @click="clickMore(item, i)"
-                  >
-                    {{ i + 1 + "." + item }}
-                  </li>
-                </ul>
-              </el-popover>
-              <span v-else> {{ scope.row.qxwsbczs }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
       <el-tab-pane label="上报列表" name="sblb">
         <div class="header flex-box align-center box-sizing">
           <div class="header-left">
@@ -373,8 +277,110 @@
           </div>
         </div>
       </el-tab-pane>
+      <el-tab-pane
+        label="上报统计"
+        name="sbtj"
+        v-if="
+          $store.getters.roles.indexOf('admin') > -1 ||
+          $store.getters.roles.indexOf('shiji') > -1
+        "
+      >
+        <el-table
+          :data="treeTableData"
+          :expand-row-keys="defaultExpandedKeys"
+          border
+          row-key="id"
+          :tree-props="{ children: 'children' }"
+          style="width: 100%"
+          highlight-current-row
+          height="calc(100vh - 100px )"
+          v-loading="loading"
+          element-loading-text="正在加载中..."
+          :element-loading-spinner="svg"
+          element-loading-svg-view-box="-10, -10, 50, 50"
+          element-loading-background="rgba(122, 122, 122, 0.8)"
+        >
+          <el-table-column
+            prop="xzqh"
+            label="行政区划"
+            width="240"
+            show-overflow-tooltip
+          >
+          </el-table-column>
+          <el-table-column
+            prop="xzczs"
+            label="行政村总数"
+            width="120"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="qxysbczs"
+            label="旗县已上报的村庄数"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="sbdstczs"
+            label="上报到省厅村庄数"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="wbscjd"
+            label="文本审查节点(补正)"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="slsjbz"
+            label="矢量数据审查节点(机审)"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="ybas"
+            label="已备案数(用地审查节点)"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="bal"
+            label="备案率(%)(已备案数行政村总数)"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column label="旗县未上报的村庄数" align="center">
+            <template #default="scope">
+              <el-popover
+                placement="right"
+                :width="200"
+                trigger="click"
+                v-if="scope.row.wsbczs.length > 0"
+              >
+                <template #reference>
+                  <span style="cursor: pointer; color: #409eff">
+                    {{ scope.row.qxwsbczs }}</span
+                  >
+                  <!-- <i style="cursor: pointer" @click="getLayerId(scope.row)">
+                  </i> -->
+                </template>
+                <ul class="moreList">
+                  <li
+                    v-for="(item, i) in scope.row.wsbczs"
+                    :key="i"
+                    @click="clickMore(item, i)"
+                  >
+                    {{ i + 1 + "." + item }}
+                  </li>
+                </ul>
+              </el-popover>
+              <span v-else> {{ scope.row.qxwsbczs }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
-
     <el-dialog
       v-model="editDialogVisible"
       :title="dialogTitle"
@@ -558,7 +564,7 @@ export default {
       index: "",
       uuidList: [],
       uuidList1: "",
-      activeTabs: "sbtj",
+      activeTabs: "sblb",
       treeTableData: [],
       defaultExpandedKeys: [],
       loading: true, //加载状态
@@ -771,7 +777,7 @@ export default {
         proxy.download(
           "/apply/xzczghcgsb/downloadZip",
           params,
-          getFileName(qxyh.tableData[index].filePath)
+          getFileName(qxyh.tableData[index].filePath),
         );
       },
       // 获取列表数据
@@ -809,7 +815,7 @@ export default {
         } else {
           qxyh.getlist();
         }
-      }
+      },
     );
     return { ...toRefs(qxyh) };
   },