Merge remote-tracking branch 'origin/master'

src/main/java/com/bowintek/smartsearch/vo/query/WellInfoParams.java

@@ -25,4 +25,6 @@ public class WellInfoParams {
     private String project_id;
     private List<String> orgList;
     private List<String> unitList;
+    private String project_path;
+    private String org_path;
 }

src/main/resources/mapping/cquery/WellInfoCQuery.xml

@@ -30,6 +30,8 @@
             str.azimuth_angle,
             str.well_coordinates_x,
             str.well_coordinates_y,
+            str.geo_offset_east,
+            str.geo_offset_north,
             intr.well_state
         FROM
             by_dwr.fact_dwr_well_basic_information well
@@ -77,7 +79,7 @@
         well_stt.well_coordinates_x x,
         well_stt.well_coordinates_y y,
         well_stt.geo_offset_east,
-        well_stt.geo_offset_nonth,
+        well_stt.geo_offset_north,
         intr.well_state
         FROM
         by_dwr.fact_dwr_well_basic_information well
@@ -146,6 +148,12 @@
                 #{unitId}
             </foreach>
         </if>
+        <if test="project_path!='' and project_path!=null">
+            and well.project_path like Concat('%',#{project_path},'%')
+        </if>
+        <if test="org_path!='' and org_path!=null">
+            and well.org_path like Concat('%',#{org_path},'%')
+        </if>
     </select>
 
     <select id="getWellMapList" parameterType="com.bowintek.smartsearch.vo.query.WellInfoParams"
@@ -188,6 +196,12 @@
         <if test="project_id!='' and project_id!=null">
             and well.project_id =#{project_id}
         </if>
+        <if test="project_path!='' and project_path!=null">
+            and well.project_path like Concat('%',#{project_path},'%')
+        </if>
+        <if test="org_path!='' and org_path!=null">
+            and well.org_path like Concat('%',#{org_path},'%')
+        </if>
         order by well.well_common_name
     </select>
 

vue/src/components/basic/es-result/doc-view.vue

@@ -14,7 +14,7 @@
           <span>
             上传时间：<span class="key-tag">{{ it.date }}</span>
           </span><br>
-          <filePreview :fileName="it.file_name" :filePath="it.storage_path"></filePreview>
+          <filePreview :fileName="it.file_name" :filePath="it.storage_path" :title="it.well_common_name"></filePreview>
         </div>
       </div>
     </div>

vue/src/components/basic/file-preview/index.vue

@@ -3,7 +3,7 @@
     <a-button type="link" size="small" @click="loadFile">预览</a-button>
   </a-spin>
   <a-modal :visible="visible" :ok-button-props="{ style: { display: 'none' } }"
-           wrap-class-name="full-modal" style="text-align: center"
+           wrap-class-name="full-modal" style="text-align: center" :title="title"
            cancel-text="关闭" @cancel="visible = !visible">
     <input type="file" @change="changeHandle"/>
     <a-spin tip="加载中..." size="small" :spinning="spinning">
@@ -40,6 +40,7 @@ export default defineComponent({
     VueOfficeDocx, VueOfficePdf, VueOfficeExcel
   },
   props: {
+    title: {type: String, default: "pdf预览"},
     fileName: {type: String, default: ""},
     filePath: {type: String, default: ""},
     accept: {
@@ -77,6 +78,7 @@ export default defineComponent({
             $message.error("文件加载失败！");
             return;
           }
+          spinning.value = false;
           visible.value = true;
         }
 

vue/src/views/applyform/apply.vue

@@ -51,7 +51,7 @@
           <template #renderItem="{ item,index }">
             <a-list-item>
               <template #actions>
-                <filePreview :fileName="item.file_name" :filePath="item.storage_path"></filePreview>
+                <filePreview :fileName="item.file_name" :filePath="item.storage_path"  :title="item.well_common_name"></filePreview>
                 <a-button type="link" @click="downFile(item)" v-if="item.status==2" danger>下载</a-button>
               </template>
               <a-list-item-meta

vue/src/views/applyform/reviewer.vue

@@ -55,7 +55,7 @@
           <template #renderItem="{ item,index }">
             <a-list-item>
               <template #actions>
-                <filePreview :fileName="item.file_name" :filePath="item.storage_path"></filePreview>
+                <filePreview :fileName="item.file_name" :filePath="item.storage_path" :title="item.well_common_name"></filePreview>
                 <a-button type="link" @click="downFile(item)" danger>下载</a-button>
               </template>
               <a-list-item-meta

vue/src/views/wellinfo/detail.vue

@@ -217,7 +217,7 @@
                           <PlusOutlined v-if="!item.isApply" @click="onAddCart(item)" title="加入购物车"
                                         :style="{fontSize: '16px', color: '#08c'}"/>
                           <a-button type="link" @click="downFile(item)" v-if="item.isDown" danger>下载</a-button>
-                          <filePreview :fileName="item.file_name" :filePath="item.storage_path"></filePreview>
+                          <filePreview :fileName="item.file_name" :filePath="item.storage_path" :title="item.well_common_name"></filePreview>
                         </template>
                         <a-list-item-meta
                           :description="item.file_business_type">

vue/src/views/wellinfo/index.vue

@@ -133,7 +133,8 @@
                   multiple
                   tree-line
                   :tree-data="filterUnitTree(subjectTrees.constructUnitTree)"
-                  tree-node-filter-prop="label" @change="onUnitTreeChange">
+                  tree-node-filter-prop="label"
+                  @change="onUnitTreeChange">
                 </a-tree-select>
               </a-form-item>
             </a-col>
@@ -356,7 +357,7 @@
                 <PlusOutlined v-if="!item.isApply" @click="onAddCart(item)" title="加入购物车"
                               :style="{fontSize: '16px', color: '#08c'}"/>
                 <a-button type="link" @click="downFile(item)" v-if="item.isDown" danger>下载</a-button>
-                <filePreview :fileName="item.file_name" :filePath="item.storage_path"></filePreview>
+                <filePreview :fileName="item.file_name" :filePath="item.storage_path" :title="item.well_common_name"></filePreview>
               </template>
               <a-list-item-meta
                 :description="item.file_business_type">
@@ -712,11 +713,13 @@ export default defineComponent({
     };
     const tabChange = (key) => {
       console.log("tabChange", key);
-      formState.org_id_a1 = '';
-      formState.org_name_a2 = '';
-      formState.project_id = '';
-      formState.orgList = [];
-      formState.unitList = [];
+      // formState.org_id_a1 = '';
+      // formState.org_name_a2 = '';
+      // formState.project_id = '';
+      // formState.orgList = [];
+      // formState.unitList = [];
+      formState.org_path = "";
+      formState.project_path = "";
       if (key == "2") {
         subjectTrees.value.data = Object.assign(subjectTrees.value.constructUnitTree);
       } else {
@@ -826,21 +829,27 @@ export default defineComponent({
       subjectTrees.value.autoExpandParent = false;
     }
     const treeOnSelect = function (selected, selectedNodes, node) {
+      debugger;
       console.log(selected, selectedNodes, node);
-      if (selectedNodes.node.parent != undefined || activeTab.value == "1") {
-        if (activeTab.value == "1") {
-          formState.org_name_a2 = selected.length > 0 ? selectedNodes.node.label : '';
-          // formState.org_id_a1 = selected.length > 0 ? selectedNodes.node.key : '';
-          // formState.orgList = selected.length > 0 ? [formState.org_id_a1] : [];
+      //组织机构
+      if (activeTab.value == "1") {
+        formState.org_path = selected.length > 0 ? selectedNodes.node.label : '';
+        // formState.org_name_a2 = selected.length > 0 ? selectedNodes.node.label : '';
+        // formState.org_id_a1 = selected.length > 0 ? selectedNodes.node.key : '';
+        // formState.orgList = selected.length > 0 ? [formState.org_id_a1] : [];
+
+        onOrgTreeChange();
+      }
 
-          onOrgTreeChange();
-        } else {
-          formState.project_id = selected.length > 0 ? selectedNodes.node.key : '';
-          formState.unitList = selected.length > 0 ? [formState.project_id] : [];
-          onUnitTreeChange();
-        }
-        loadData();
+      //地质单元
+      if (activeTab.value == "2") {
+        formState.project_path = selected.length > 0 ? selectedNodes.node.label : '';
+        // formState.project_id = selected.length > 0 ? selectedNodes.node.key : '';
+        // formState.unitList = selected.length > 0 ? [formState.project_id] : [];
+        onUnitTreeChange();
       }
+
+      loadData();
     }
     const orgUnitList: any = ref([]);
     const unitOrgList: any = ref([]);

vue/src/views/wellinfo/table.ts

@@ -136,6 +136,8 @@ export const formState = reactive({
   orgList: [] as any[],
   unitList: [] as any[],
   org_name_a2: '',
+  org_path: '',
+  project_path: '',
 });
 export const columns: TableColumnsType = [
   {