Ver código fonte

所有图层接口

Bella 2 anos atrás
pai
commit
7cf5aaf948

+ 2 - 0
src/api/url.js

@@ -20,4 +20,6 @@ export default {
   updateConllection: "/conllection/conllection/updateConllection",
   //   类别数据请求
   selectByCNameAType: "/dms/category/selectByCNameAType",
+  // 获取分级栏目列表
+  getColumnList:"/dms/column/getColumnList"
 };

+ 5 - 19
src/components/common/BottomForm/CustomModelDialog.vue

@@ -20,13 +20,14 @@
         <el-button type="primary" @click="confirm()">确认</el-button>
       </span>
     </el-dialog>
-    <el-checkbox-group v-model="checkedList">
+    <div style="width:100%;height:100%;background:red;">1234</div>
+   <!--  <el-checkbox-group v-model="checkedList">
       <el-checkbox
         v-for="item in checkArr"
         :key="item"
         :label="item"
       ></el-checkbox>
-    </el-checkbox-group>
+    </el-checkbox-group> -->
     <div
       v-if="overlayBtnShow"
       class="overlay-container"
@@ -71,17 +72,7 @@ export default {
       modelTitle: null,
       inputName: "自定义模型1",
       checkedList: [],
-      checkArr: [
-        "永久基本农田",
-        "建设用地减量化",
-        "一般耕地种林",
-        "一般耕地",
-        "基本农田被违规占用",
-        "一般耕地抛荒",
-        "高标准农田",
-        "一般耕地被违规占用",
-        "减量化复垦地块后种林",
-      ],
+      checkArr: [],
     };
   },
   watch: {
@@ -89,12 +80,7 @@ export default {
       console.log(val, "checkedList");
     },
   },
-  created() {
-    this.checkArr = [];
-    treeIdMap.forEach((v, i) => {
-      this.checkArr.push(i);
-    });
-  },
+  created() {},
   mounted() {
     // 监听自定义模型
     this.$bus.$on("customModelEvent", () => {

+ 5 - 3
src/components/common/NewSelect.vue

@@ -5,6 +5,8 @@
     v-model="imgValue"
     :placeholder="placeholder"
     @change="currentSel"
+    clearable
+    filterable
   >
     <!-- popper-append-to-body:是否将弹出菜单插入至 body 元素。在菜单的定位出现问题时,可尝试修改该属性-->
     <el-option
@@ -30,9 +32,9 @@ export default {
         return [];
       },
     },
-    placeholder:{
-      type:String,
-      default:"请选择"
+    placeholder: {
+      type: String,
+      default: "请选择",
     },
     value: [String, Number],
     popper: {

+ 2 - 3
src/components/popup/LawDetailsPopup.vue

@@ -61,7 +61,7 @@ export default {
     height: 90%;
     .law-inner-title {
       width: 100%;
-      height: 20%;
+      height: 15%;
       & > div {
         width: 80%;
         height: 40%;
@@ -79,10 +79,9 @@ export default {
     }
     .law-inner-content {
       width: 100%;
-      height: 80%;
+      height: 85%;
       overflow: auto;
       color: rgb(192, 196, 204, 0.8);
-      //   background: red;
     }
   }
 }

+ 7 - 4
src/components/popup/LawPopup.vue

@@ -155,16 +155,17 @@ export default {
 
       this.$Post(this.urlsCollection.selectContentList, params).then(
         (res) => {
-          console.log(res, "当前的法律法规");
+          // console.log(res, "当前的法律法规");
           if (res.code === 200 && res.content.data.length > 0) {
-            console.log(res.content, "查询到的法律法规相关的数据");
+            // console.log(res.content, "查询到的法律法规相关的数据");
             this.paginationData.currentPage = val;
             this.paginationData.total = res.content.count;
             this.tableData = res.content.data.map((v) => {
               return {
                 id: v.id || "",
                 title: v.c_name || "--",
-                date: v.c_date || "--",
+                date: v.c_new_date || "--",
+                // date: v.c_date || "--",
                 address: v.c_pdf || "",
               };
             });
@@ -282,7 +283,8 @@ export default {
       }
       /deep/.el-input-group__append,
       .el-input-group__prepend {
-        background-color: #00aaff54;
+        background: transparent;
+        // background-color: #00aaff54;
         color: #fff;
         border-left: none;
         // border: none;
@@ -294,6 +296,7 @@ export default {
       }
       /deep/.el-input__inner {
         height: 35px;
+        border-right: none;
       }
 
       /deep/ .el-input__inner {

+ 120 - 54
src/views/ComprehensiveAnalysis.vue

@@ -100,13 +100,16 @@
               :filter-node-method="filterNode"
             >
               <span class="custom-tree-node" slot-scope="{ node }">
-                <template
-                  v-if="
-                    node.level === 3 ||
-                    node.parent.label === '所有图层' ||
-                    node.parent.label === '我的模型'
-                  "
-                >
+                <template v-if="node.level < 4">
+                  <div
+                    :class="{
+                      'tree-arrow': !node.expanded,
+                      'tree-arrow-expanded': node.expanded,
+                    }"
+                  ></div>
+                  <span>{{ node.label }}</span>
+                </template>
+                <template v-else-if="node.level === 4">
                   <el-checkbox v-model="node.checked" style="position: relative"
                     >{{ node.label
                     }}<span
@@ -136,7 +139,7 @@
                     </span>
                   </el-checkbox>
                 </template>
-                <template v-else>
+                <!-- <template v-else>
                   <div
                     :class="{
                       'tree-arrow': !node.expanded,
@@ -144,7 +147,7 @@
                     }"
                   ></div>
                   <span>{{ node.label }}</span>
-                </template>
+                </template> -->
               </span>
             </el-tree>
           </div>
@@ -250,6 +253,7 @@ export default {
   },
   data() {
     return {
+      classTextToIndex: {},
       addressInput: "",
       legendShow: false,
       tableType: "normal",
@@ -344,26 +348,26 @@ export default {
     },
     getCustomModel: {
       handler(val) {
-        console.log(val, "目前存在的自定义模型");
-        let myModelRef = this.$refs.tree.data[2];
-        if (myModelRef.label === "我的模型") {
-          this.$refs.tree.data[2].children = val.map((ele) => {
-            let firstId = publicFun.buildGuid();
-            treeIdMap.set(ele.name, firstId);
-            return {
-              id: firstId,
-              label: ele.name,
-              data: ele.data,
-            };
-          });
-          console.log(myModelRef.children, "最新的数据");
-        }
+        // console.log(val, "目前存在的自定义模型");
+        // let myModelRef = this.$refs.tree.data[2];
+        // if (myModelRef.label === "我的模型") {
+        //   this.$refs.tree.data[2].children = val.map((ele) => {
+        //     let firstId = publicFun.buildGuid();
+        //     treeIdMap.set(ele.name, firstId);
+        //     return {
+        //       id: firstId,
+        //       label: ele.name,
+        //       data: ele.data,
+        //     };
+        //   });
+        //   console.log(myModelRef.children, "最新的数据");
+        // }
       },
       deep: true,
     },
     getMyLabelData: {
       handler(val) {
-        console.log("标记点保存事件成功,允许开始定位");
+        // console.log("标记点保存事件成功,允许开始定位");
         this.rightLabelData = [];
         if (val.length > 0) {
           this.rightLabelData = val.map((v, i) => {
@@ -387,35 +391,9 @@ export default {
     },
   },
   created() {
-    this.modelData = [];
-    // 分别对应1、2、3级节点
-    this.modelData = treeModel.map((item1) => {
-      if (item1.type === "我的模型") {
-        this.myModel = item1;
-      }
-      treeIdMap.set(item1.type, item1.id);
-      return {
-        id: item1.id,
-        label: item1.type,
-        children: item1.children.map((item2) => {
-          treeIdMap.set(item2.type, item2.id);
-          return {
-            id: item2.id,
-            label: item2.type,
-            children: item2.children.map((item3) => {
-              treeIdMap.set(item3.type, item3.id);
-              this.rightPanelDataMap.set(item3.type, item3.children);
-              return {
-                id: item3.id,
-                label: item3.type,
-                children: [],
-                checked: false,
-              };
-            }),
-          };
-        }),
-      };
-    });
+    this.getColumnList();
+    this.classDictQuery("0", "c_task_type", "任务类型");
+    this.classDictQuery("0", "浦东新区行政区划", "浦东新区行政区划");
 
     //获取我的标记数据
     this.getUserMarkers();
@@ -455,6 +433,94 @@ export default {
     this.updateCasePopupShow = false;
   },
   methods: {
+    // 数据字典查询 -- 根据内容获取对应的index
+    // this.classTextToIndex["任务类型"]
+    classDictQuery(type, cName, keyName) {
+      let params = new FormData();
+      params = {
+        type: type,
+        cName: cName,
+      };
+      this.$Post(this.urlsCollection.selectByCNameAType, params).then((res) => {
+        if (res.code === 200 && res.content.length > 0) {
+          this.classTextToIndex[keyName] = new Map();
+          res.content.forEach((v) => {
+            this.classTextToIndex[keyName].set(v.name, v.index + "");
+          });
+          // console.log(this.classTextToIndex[keyName], keyName);
+        }
+      });
+    },
+    // 获取分级栏目列表
+    getColumnList() {
+      this.modelData = [];
+      this.$Post(this.urlsCollection.getColumnList).then((res) => {
+        if (res.code === 200 && res.content.length > 0) {
+          let data = res.content.map((item1) => {
+            if (item1.title === "所有图层" && item1.columnList.length > 0) {
+              treeIdMap.set(item1.title, `${item1.title}_${item1.id}`);
+              return {
+                id: `${item1.title}_${item1.id}`,
+                label: item1.title,
+                // 镇
+                children:
+                  item1.columnList.length === 0
+                    ? []
+                    : item1.columnList.map((item2) => {
+                        treeIdMap.set(
+                          item2.title,
+                          `${item2.title}_${item2.id}`
+                        );
+                        return {
+                          id: `${item2.title}_${item2.id}`,
+                          label: item2.title,
+                          // 水资源,土地资源,林地资源
+                          children:
+                            item2.columnList.length === 0
+                              ? []
+                              : item2.columnList.map((item3) => {
+                                  treeIdMap.set(
+                                    item3.title,
+                                    `${item3.title}_${item3.id}`
+                                  );
+                                  return {
+                                    id: `${item3.title}_${item3.id}`,
+                                    label: item3.title,
+                                    tag: item3.tag,
+                                    children:
+                                      item3.columnList.length === 0
+                                        ? []
+                                        : item3.columnList.map((item4) => {
+                                            treeIdMap.set(
+                                              item4.title,
+                                              `${item4.title}_${item4.id}`
+                                            );
+                                            this.rightPanelDataMap.set(
+                                              item4.title,
+                                              item4.children
+                                            );
+
+                                            return {
+                                              id: `${item4.title}_${item4.id}`,
+                                              label: item4.title,
+                                              children: [],
+                                              modelName: item4.modelName,
+                                              modelId: item4.modelId,
+                                              tag: item4.tag,
+                                            };
+                                          }),
+                                  };
+                                }),
+                        };
+                      }),
+              };
+            }
+          });
+
+          this.modelData = [data[0]];
+        }
+      });
+    },
     // 调用我的标记接口
     getUserMarkers() {
       if (localStorage.getItem("USER_ID")) {
@@ -466,7 +532,7 @@ export default {
         };
         this.$Post(this.urlsCollection.selectByUser, paramData).then((res) => {
           if (res.code === 200 && res.content.length >= 1) {
-            console.log(res);
+            // console.log(res);
             this.$store.state.myLabelPointsArr = [];
             this.$store.state.myLabelPointsArr = res.content.map((v) => {
               return {

+ 8 - 11
src/views/FrequencyView.vue

@@ -43,7 +43,8 @@
       </div>
       <div class="center">
         <el-table :data="tableData" style="width: 100%" max-height="600">
-          <el-table-column type="index" width="70"> </el-table-column>
+          <el-table-column type="index" width="70" align="center">
+          </el-table-column>
           <el-table-column
             prop="createYear"
             label="立项年度"
@@ -97,8 +98,9 @@ export default {
       timeOptions: [],
       tableData: [],
       currentPage: 1,
+      currentPageSize:10,
       paginationData: {
-        pageSize: 0,
+        pageSize: 10,
         pagerCount: 5,
         currentPage: 1,
         pageSizes: [5, 10, 20, 30],
@@ -116,13 +118,7 @@ export default {
     this.townOptions = [];
     this.timeOptions = [];
     this.typeOptions = [];
-    // 街道下拉框
-    // for (let key in town) {
-    //   this.townOptions.push({
-    //     value: town[key],
-    //     label: town[key],
-    //   });
-    // }
+
     // 时间选择
     for (let i = 1980; i < 2023; i++) {
       this.timeOptions.unshift({
@@ -214,7 +210,7 @@ export default {
       // 立项年度
       if (this.timeSelectVal) {
         let paramTime = {
-          field: "c_years",
+          field: "c_new_date",
           // 等值查询
           searchType: "1",
           content: {
@@ -239,7 +235,8 @@ export default {
           this.tableData = res.content.data.map((v) => {
             return {
               id: v.id || "--",
-              createYear: v.c_years || "--",
+              createYear: v.c_new_date || "--",
+              // createYear: this.$dayjs(v.c_year).format("YYYY")|| "--",
               auditTown:
                 this.classDictMap["浦东新区行政区划"].get(v.bsjz) || "--",
               type: this.classDictMap["审计类别"].get(v.sj_select) || "--",

+ 32 - 13
src/views/LawView.vue

@@ -5,8 +5,7 @@
         ref="lawRef"
         class="law-container-inner-details"
         @lawDetailsClose="lawDetailsClose"
-        ><FilePreview ref="lawFilePreview"
-      /></LawDetailsPopup>
+        ><FilePreview ref="lawFilePreview" style="width: 100%; height: 100%;"/></LawDetailsPopup>
       <div class="header">
         <div class="header-title">法律法规</div>
         <div class="header-select">
@@ -33,6 +32,11 @@
             />
           </div>
           <div style="position: relative">
+            <el-input class="search-input" v-model="searchInput" clearable>
+              <i class="el-icon-search" slot="append"></i>
+            </el-input>
+          </div>
+          <!-- <div style="position: relative">
             <el-button
               size="big"
               type="text"
@@ -45,8 +49,8 @@
                 color: #fff;
               "
             ></el-button>
-            <el-input class="search-input" v-model="searchInput"> </el-input>
-          </div>
+            <el-input class="search-input" v-model="searchInput" clearable> </el-input>
+          </div> -->
         </div>
         <div class="query-btn" @click="getTableData(1)">查询</div>
         <div class="reset-btn" @click="resetEvent">重置</div>
@@ -107,11 +111,11 @@ export default {
       timeSelectVal: "",
       timeOptions: [],
       tableData: [],
-      currentPageSize: 5,
+      currentPageSize: 10,
       currentPage: 1,
       lawBaseUrl: "/dms",
       paginationData: {
-        pageSize: 0,
+        pageSize: 10,
         pagerCount: 5,
         currentPage: 1,
         pageSizes: [5, 10, 20, 30],
@@ -136,9 +140,6 @@ export default {
       });
     }
 
-    console.log(this.typeSelectVal, "type");
-    console.log(this.timeSelectVal, "time");
-
     // 审计等级
     this.classDictQuery("0", "sj_class", "审计等级");
     // 审计类别
@@ -185,8 +186,6 @@ export default {
       this.$refs.lawTypeRef.imgValue = "";
       this.$refs.lawYearRef.imgValue = "";
       this.getTableData(this.currentPage);
-      console.log(this.typeSelectVal, "type");
-      console.log(this.timeSelectVal, "time");
     },
     // 切换页
     getTableData(val) {
@@ -210,7 +209,8 @@ export default {
       // 年份查询
       if (this.timeSelectVal) {
         let paramTime = {
-          field: "c_date",
+          field: "c_new_date",
+          // field: "c_date_time",
           // 模糊查询
           searchType: "2",
           content: {
@@ -253,7 +253,8 @@ export default {
                 title: v.c_name || "--",
                 type: this.classDictMap["审计法律类别"].get(v.type) || "--",
                 class: this.classDictMap["审计等级"].get(v.class) || "--",
-                date: v.c_date || "--",
+                date: v.c_new_date || "--",
+                // date: this.$dayjs(v.c_date_time).format("YYYY-MM-DD") || "--",
                 address: v.c_pdf || "",
               };
             });
@@ -353,6 +354,24 @@ export default {
             // right: -50px;
             bottom: 5px;
             width: 280px;
+            /deep/.el-input-group__append,
+            .el-input-group__prepend {
+              background: transparent;
+              // background-color: #00aaff54;
+              color: #fff;
+              border-left: none;
+              // border: none;
+              // border-radius: 1px;
+            }
+            /deep/.el-input-group--append .el-input__inner,
+            .el-input-group__prepend {
+              border-right: none;
+            }
+            /deep/ .el-input__inner {
+              border-color: #fff !important;
+              color: #fff;
+              border-right:none ;
+            }
           }
         }
       }