私宅报建的事项名称、事项内容、行政区筛选

src/components/Combinations/toolBar/toolBar.vue

@@ -246,8 +246,12 @@ export default {
           const list = res.data[0].children.filter((item) => {
             return item.label == "三亚市";
           });
-          if (list.length > 0) this.xzqTreeData = list[0];
+          if (list.length > 0) {
+            list[0].value = '4602'
+            this.xzqTreeData = list[0];
+          }
           else this.xzqTreeData = res.data;
+          store.setRegionTree(this.xzqTreeData)
         }
       });
     },

src/store/store.js

@@ -41,6 +41,7 @@ var store2 = {
         flattenNames: [],//存储压平的名称数组
         cockpit_date: null,
         cockpit_region: {id:'4602',name :'三亚市'},//行政区划
+        region_tree:[],//行政区划树
         viewer_flag: true,
         xzqh_flag: true,
         query_pick_pane: [],
@@ -271,6 +272,9 @@ var store2 = {
     setCockpitRegion(newValue) {
         this.state.cockpit_region = newValue;
     }, 
+    setRegionTree(newValue) {
+        this.state.region_tree = newValue;
+    }, 
     setViewerFlagb(newValue) {
         this.state.viewer_flag = newValue;
     },

src/views/cockpit/bjxm.vue

@@ -284,9 +284,20 @@ export default {
       store.setToolBarShow(false);
       store.setXzqh_flag(false);
       store.setCockpit_vector({
-        word: this.left_value == 'csbj' ? '事项内容' : '报建项目名称',
+        // word: this.left_value == 'csbj' ? '事项内容' : '报建项目名称',
         title: this.left_value == 'csbj' ? '城市报建完成项目' : '私宅报建完成项目',
         tableData: [],
+        searchs: [
+          { type: "input", label: "事项名称", key: "val0" },
+          { type: "input", label: "事项内容", key: "val1" },
+          {
+            type: "cascader",
+            label: "行政区",
+            key: "id",
+            options: store.state.region_tree,
+          },
+        ],
+        searchform: { val0: "", val1: "", id: store.state.cockpit_region.id },
         tablejscType: `jsc_bjxm_${this.left_value}_zbmx`,
         columns: this.left_value == 'csbj' ? csbjcolumns : szbjcolumns,
       })

src/views/cockpit/common/VectorSpace/BoxCommonVector.vue

@@ -27,7 +27,7 @@
             v-else-if="sitem.type == 'select'"
             clearable
             v-model="searchform[sitem.key]"
-            :placeholder="`请选择${sitem.label}`"
+            :placeholder="sitem.label"
             @change="change_witch"
           >
             <el-option
@@ -37,6 +37,20 @@
               :value="item.value"
             ></el-option>
           </el-select>
+          <!-- clearable -->
+          <el-cascader
+            v-else-if="sitem.type == 'cascader'"
+            v-model="searchform[sitem.key]"
+            :show-all-levels="false"
+            :options="sitem.options"
+            :placeholder="sitem.label"
+            :props="{
+              checkStrictly: true,
+              expandTrigger: 'hover',
+              emitPath: false,
+            }"
+            @change="change_witch"
+          ></el-cascader>
         </div>
       </div>
       <el-table
@@ -98,6 +112,7 @@ export default {
       tempdataLayerId: null,
       searchs: [],
       searchform: {},
+      xzqTreeData: [],
     };
   },
   methods: {
@@ -451,7 +466,7 @@ export default {
         beginTime: store.state.cockpit_date[0],
         endTime: store.state.cockpit_date[1],
         id: store.state.cockpit_region.id,
-        ...params
+        ...params,
       };
       if (this.title == "土地供应完成项目" || this.title == "山水工程项目") {
         obj.beginTime = undefined;
@@ -468,26 +483,6 @@ export default {
         obj.beginTime = undefined;
         obj.endTime = undefined;
       }
-      if (this.title == "私宅报建完成项目") {
-        let dateString_beginTime = store.state.cockpit_date[0];
-        let formattedDate =
-          dateString_beginTime.slice(0, 4) +
-          "-" +
-          dateString_beginTime.slice(4, 6) +
-          "-" +
-          dateString_beginTime.slice(6);
-
-        let dateString_endTime = store.state.cockpit_date[1];
-        let formattedDate_endTime =
-          dateString_endTime.slice(0, 4) +
-          "-" +
-          dateString_endTime.slice(4, 6) +
-          "-" +
-          dateString_endTime.slice(6);
-
-        obj.beginTime = formattedDate;
-        obj.endTime = formattedDate_endTime;
-      }
       let data = await QueryList(obj);
       data.data.map((res) => {
         if (res.geom) {
@@ -594,7 +589,7 @@ export default {
     justify-content: space-between;
     margin-right: 10px;
     .sidiv {
-    //   min-width: calc(50% - 10px);
+      //   min-width: calc(50% - 10px);
       height: 40px;
       margin-bottom: 5px;
       margin-right: 5px;