bug 修改

src/api/content.js

@@ -16,7 +16,7 @@ const getContentListByTableName = (params) => {
 
 // 根据modelId获取内容数据
 const getContentListByModelId = (params) => {
-  return post(systemConfig.dataUrl + '/content/selectByModelId?' + splicingParam(params));
+  return post(systemConfig.dataUrl + '/content/selectNoPermisByModelId?' + splicingParam(params));
 }
 
 // 根据id获取内容数据

src/api/general.js

@@ -4,7 +4,7 @@ import {
 
 // 获取menu
 const getLayerList = () => {
-  return get(systemConfig.dataUrl + '/general/getMenuData')
+  return get(systemConfig.dataUrl + '/general/getMenuDataByPerId')
 }
 
 export default {

src/api/menu.js

@@ -8,7 +8,7 @@ import {
 
 // 获取menu
 const getMenu = () => {
-  return get(systemConfig.dataUrl + '/general/getMenuData')
+  return get(systemConfig.dataUrl + '/general/getMenuDataByPerId')
 }
 // 获取一级分类
 const getFirstClassify = () => {
@@ -22,7 +22,7 @@ const getSecondClassify = (params) => {
 // 获取图层数据
 const getLayerData = (params) => {
   let str = splicingParam(params)
-  return post(systemConfig.dataUrl + '/content/selectByModelId?' + str)
+  return post(systemConfig.dataUrl + '/content/selectNoPermisByModelId?' + str)
 }
 // 根据id筛选获取模型
 const getModelByID = (params) => {

src/api/model.js

@@ -22,7 +22,7 @@ const updateModel = (params) => {
 
 // 获取menu
 const getMenu = () => {
-  return get(systemConfig.dataUrl + '/general/getMenuData')
+  return get(systemConfig.dataUrl + '/general/getMenuDataByPerId')
 }
 
 // 查询模型详细信息

src/api/userManagement.js

@@ -2,6 +2,7 @@ import {
     splicingParam,
     postform,
     post,
+    get,
 } from '../utils/request'
 
 // 获取所有用户
@@ -21,6 +22,11 @@ const saveNowUserAuth = (params) => {
     return postform(systemConfig.dataUrl + "/permission/insertlayerAreaCode", params);
 }
 
+// 获取menu
+const getAllLayerNoPermission = () => {
+    return get(systemConfig.dataUrl + '/general/getMenuData')
+}
+
 // // 行政区划
 // const getRegionByCode = (params) => {
 //     let str = splicingParam(params)
@@ -30,5 +36,6 @@ const saveNowUserAuth = (params) => {
 export default {
     getAllUser,
     getSingleUserAuth,
-    saveNowUserAuth
+    saveNowUserAuth,
+    getAllLayerNoPermission
 }

src/components/Currency/DataTable/MetadataListContainer/CenterLocation.vue

@@ -60,7 +60,9 @@ export default {
     },
     centerPoint: {
       type: Array,
-      default: [114.5078337361353, 38.047503089608085],
+      default: function () {
+        return [114.5078337361353, 38.047503089608085];
+      },
     },
     beforeClose: {
       type: Function,

src/components/Currency/DataTable/MetadataListContainer/FileImport.vue

@@ -1,16 +1,34 @@
 <template>
-  <el-dialog :class="'fileImportDialog'" :visible.sync="isShow" width="800px" top="7%" :close-on-click-modal="false"
-    :before-close="dialogBeforeClose">
-    <el-form :model="fromDataRender" class="singledata" ref="single_form" label-width="80px" :rules="rules">
+  <el-dialog
+    :class="'fileImportDialog'"
+    :visible.sync="isShow"
+    width="800px"
+    top="7%"
+    :close-on-click-modal="false"
+    :before-close="dialogBeforeClose"
+  >
+    <el-form
+      :model="fromDataRender"
+      class="singledata"
+      ref="single_form"
+      label-width="80px"
+      :rules="rules"
+    >
       <el-row>
         <el-col :span="12">
           <el-form-item label="名称字段" prop="titlePara">
-            <el-input v-model="fromDataRender.titlePara" show-word-limit></el-input>
+            <el-input
+              v-model="fromDataRender.titlePara"
+              show-word-limit
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="行政区划编码字段" prop="areaCodePara">
-            <el-input v-model="fromDataRender.areaCodePara" show-word-limit></el-input>
+            <el-input
+              v-model="fromDataRender.areaCodePara"
+              show-word-limit
+            ></el-input>
           </el-form-item>
         </el-col>
         <!-- <el-col :span="11">
@@ -34,12 +52,18 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="第三方ID字段" prop="threeIdPara">
-            <el-input v-model="fromDataRender.threeIdPara" show-word-limit></el-input>
+            <el-input
+              v-model="fromDataRender.threeIdPara"
+              show-word-limit
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="第三方表名" prop="tableName">
-            <el-input v-model="fromDataRender.tableName" show-word-limit></el-input>
+            <el-input
+              v-model="fromDataRender.tableName"
+              show-word-limit
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -65,22 +89,39 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="描述字段" prop="contentPara">
-            <el-input v-model="fromDataRender.contentPara" show-word-limit></el-input>
+            <el-input
+              v-model="fromDataRender.contentPara"
+              show-word-limit
+            ></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
-        <el-button type="text" style="float: right" @click="changeAdvancedOptionsStatue()">
+        <el-button
+          type="text"
+          style="float: right"
+          @click="changeAdvancedOptionsStatue()"
+        >
           高级选项
-          <i v-show="!advancedOptionsShow" class="el-icon-caret-bottom el-icon--right"></i>
-          <i v-show="advancedOptionsShow" class="el-icon-caret-top el-icon--right"></i>
+          <i
+            v-show="!advancedOptionsShow"
+            class="el-icon-caret-bottom el-icon--right"
+          ></i>
+          <i
+            v-show="advancedOptionsShow"
+            class="el-icon-caret-top el-icon--right"
+          ></i>
         </el-button>
         <!-- el-icon-caret-bottom -->
         <!-- el-icon-caret-top -->
       </el-row>
       <!-- 高级选项 table -->
       <div class="tableDiv" v-if="advancedOptionsShow">
-        <el-table :data="listData" :class="['advanceOptionsTable']" max-height="250">
+        <el-table
+          :data="listData"
+          :class="['advanceOptionsTable']"
+          max-height="250"
+        >
           <el-table-column label="名称">
             <template slot-scope="scope">
               <el-input v-model="scope.row.name"></el-input>
@@ -104,7 +145,10 @@
               </el-button>
             </template>
             <template slot-scope="scope">
-              <el-button size="mini" @click="deleteAdvancedOptionsRow(scope.$index, scope)">
+              <el-button
+                size="mini"
+                @click="deleteAdvancedOptionsRow(scope.$index, scope)"
+              >
                 <i class="el-icon-minus"></i>
               </el-button>
             </template>
@@ -114,13 +158,13 @@
       <!-- 高级选项 table end -->
     </el-form>
 
-    <CenterLocation 
-    v-bind="{
-      isShow: isShowUpdateCenterDialog,
-      center: centerPoint,
-      beforeClose: beforeCloseUpdateCenterDialog,
-      updateData: updateDataCenterLocation,
-    }"
+    <CenterLocation
+      v-bind="{
+        isShow: isShowUpdateCenterDialog,
+        center: centerPoint,
+        beforeClose: beforeCloseUpdateCenterDialog,
+        updateData: updateDataCenterLocation,
+      }"
     ></CenterLocation>
 
     <span slot="title" class="dialog-title">
@@ -232,7 +276,7 @@ export default {
       let that = this;
       if (this.listData.length > 0) {
         let judge = this.listData.every(function (item) {
-          return item.name != "" && item.paraName // != "" && item.unit;
+          return item.name != "" && item.paraName; // != "" && item.unit;
         });
         if (!judge) {
           this.$message({
@@ -266,7 +310,7 @@ export default {
     uploadData(file) {
       let that = this;
       // 上传loading
-      const loading = this.$createLoading("数据新增中，请勿刷新！")
+      const loading = this.$createLoading("数据新增中，请勿刷新！");
       switch (this.fileType) {
         case "GeoJSON":
           this.uploadGeoJSONFile(this.file, loading);
@@ -293,7 +337,11 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            that.$checkRequestCode(result);
+            // that.$checkRequestCode(result);
+            that.$message({
+              type: "error",
+              message: result.message,
+            });
           }
         })
         .catch((err) => {
@@ -318,7 +366,11 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            that.$checkRequestCode(result);
+            // that.$checkRequestCode(result);
+            that.$message({
+              type: "error",
+              message: result.message,
+            });
           }
         })
         .catch((err) => {
@@ -343,7 +395,11 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            that.$checkRequestCode(result);
+            // that.$checkRequestCode(result);
+            that.$message({
+              type: "error",
+              message: result.message,
+            });
           }
         })
         .catch((err) => {
@@ -484,7 +540,9 @@ export default {
     }
   }
 
-  /deep/ .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
+  /deep/
+    .el-form-item.is-required:not(.is-no-asterisk)
+    > .el-form-item__label:before {
     content: " ";
     width: 0px;
     margin-right: 0px;

src/components/Currency/DataTable/MetadataListContainer/MetadataList.vue

@@ -307,7 +307,9 @@ export default {
     },
     tableData: {
       type: Array,
-      default: [],
+      default: function () {
+        return [];
+      },
     },
     dataTotal: {
       type: Number,

src/components/Currency/DataTable/MetadataListContainer/SingleData.vue

@@ -505,7 +505,11 @@ export default {
             if (that.updateData) that.updateData();
             that.dialogBeforeClose();
           } else {
-            that.$checkRequestCode(result);
+            // that.$checkRequestCode(result);
+            that.$message({
+              type: "error",
+              message: result.message,
+            });
           }
         })
         .catch((err) => {

src/components/Currency/ListContainer.vue

@@ -1,183 +1,197 @@
 <template>
-    <div class="list_container">
-        <div class="title">
-            <el-row>
-                <el-col v-for="(item, index) in listField" :key="index" :span="item.span">
-                    <div v-if="item.name == 'select'">
-                        <el-checkbox></el-checkbox>
-                    </div>
-                    <div v-else>{{ item.alias }}</div>
-                </el-col>
-            </el-row>
-        </div>
-        <div class="list_content">
-            <div class="noHaveData" v-if="listData.length == 0">
-                <el-row>
-                    <el-col :span="24">
-                        <div>
-                            <i class="el-icon-warning"></i>
-                            {{ noDataTip }}
-                        </div>
-                    </el-col>
-                </el-row>
+  <div class="list_container">
+    <div class="title">
+      <el-row>
+        <el-col
+          v-for="(item, index) in listField"
+          :key="index"
+          :span="item.span"
+        >
+          <div v-if="item.name == 'select'">
+            <el-checkbox></el-checkbox>
+          </div>
+          <div v-else>{{ item.alias }}</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="list_content">
+      <div class="noHaveData" v-if="listData.length == 0">
+        <el-row>
+          <el-col :span="24">
+            <div>
+              <i class="el-icon-warning"></i>
+              {{ noDataTip }}
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="haveData" v-else>
+        <el-row v-for="(item, index) in listData" :key="index">
+          <el-col
+            v-for="(item_, index_) in listField"
+            :key="index_"
+            :span="item_.span"
+          >
+            <div
+              v-if="item_.name.toLowerCase().indexOf('time') >= 0"
+              :title="transDateFormat(item[item_.name], 'yyyy-MM-DD HH:mm:ss')"
+            >
+              {{ transDateFormat(item[item_.name], "yyyy-MM-DD HH:mm:ss") }}
             </div>
-            <div class="haveData" v-else>
-                <el-row v-for="(item, index) in listData" :key="index">
-                    <el-col v-for="(item_, index_) in listField" :key="index_" :span="item_.span">
-                        <div
-                            v-if="item_.name.toLowerCase().indexOf('time') >= 0"
-                            :title="transDateFormat(item[item_.name], 'yyyy-MM-DD HH:mm:ss')"
-                        >{{ transDateFormat(item[item_.name], 'yyyy-MM-DD HH:mm:ss') }}</div>
-                        <!-- <div
+            <!-- <div
                             v-else-if="item_.name.toLowerCase().indexOf('request') >= 0"
                             :title="item[item_.name]"
                         >{{ JSON.parse(item[item_.name]).request }}</div>-->
-                        <div :title="item[item_.name]" v-else>{{ item[item_.name] || '—' }}</div>
-                    </el-col>
-                </el-row>
+            <div :title="item[item_.name]" v-else>
+              {{ item[item_.name] || "—" }}
             </div>
-        </div>
-        <div class="page_content">
-            <el-pagination
-                background
-                :page-size="pageSize"
-                :pager-count="11"
-                :current-page="currentPage"
-                layout="prev, pager, next"
-                :total="total"
-                @current-change="changeCurrentPage($event)"
-            ></el-pagination>
-        </div>
+          </el-col>
+        </el-row>
+      </div>
     </div>
+    <div class="page_content">
+      <el-pagination
+        background
+        :page-size="pageSize"
+        :pager-count="11"
+        :current-page="currentPage"
+        layout="prev, pager, next"
+        :total="total"
+        @current-change="changeCurrentPage($event)"
+      ></el-pagination>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-    props: {
-        listField: {
-            type: Array,
-        },
-        listData: {
-            type: Array,
-            default: [],
-        },
-        noDataTip: {
-            type: String,
-            default: "暂无数据"
-        },
-        total: {
-            type: Number,
-            default: 0
-        },
-        pageSize: {
-            type: Number,
-            default: 10
-        },
-        currentPage: {
-            type: Number,
-            default: 1
-        },
-        searchData: {
-            type: Function
-        },
-        functionObj: {
-            type: Object
-        }
+  props: {
+    listField: {
+      type: Array,
     },
-    methods: {
-        changeCurrentPage(currentPage) {
-            this.searchData(currentPage);
-        }
-    }
-}
+    listData: {
+      type: Array,
+      default: function () {
+        return [];
+      },
+    },
+    noDataTip: {
+      type: String,
+      default: "暂无数据",
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+    pageSize: {
+      type: Number,
+      default: 10,
+    },
+    currentPage: {
+      type: Number,
+      default: 1,
+    },
+    searchData: {
+      type: Function,
+    },
+    functionObj: {
+      type: Object,
+    },
+  },
+  methods: {
+    changeCurrentPage(currentPage) {
+      this.searchData(currentPage);
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
 .list_container {
+  width: 100%;
+  height: 100%;
+  .el-row {
+    height: 32px;
+    line-height: 32px;
+    font-size: 16px;
+    text-align: center;
+    margin: 4px;
+    border-radius: 4px;
     width: 100%;
-    height: 100%;
-    .el-row {
-        height: 32px;
-        line-height: 32px;
-        font-size: 16px;
-        text-align: center;
-        margin: 4px;
-        border-radius: 4px;
-        width: 100%;
-        display: inline-block;
-        .el-col {
-            > div {
-                position: relative;
-                padding: 0 10px;
-                box-sizing: border-box;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                cursor: default;
-                &::before,
-                &::after {
-                    content: "";
-                    position: absolute;
-                    width: 4px;
-                    height: 100%;
-                    border-radius: 4px;
-                    background: #3f67c366;
-                }
-                &::before {
-                    top: 0;
-                    left: -2px;
-                }
-                &::after {
-                    top: 0;
-                    right: -2px;
-                }
-            }
-            &:last-child div::after {
-                background: transparent;
-            }
-            &:first-child div::before {
-                background: transparent;
-            }
-        }
-    }
-    .title {
-        box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4);
-        border-radius: 5px;
-        background: #ffffff;
+    display: inline-block;
+    .el-col {
+      > div {
+        position: relative;
+        padding: 0 10px;
+        box-sizing: border-box;
         overflow: hidden;
-        height: 40px;
-        .el-row {
-            margin-left: 0px;
-            margin-right: 0px;
-        }
-    }
-    .list_content {
-        margin-top: 10px;
-        box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4);
-        border-radius: 5px;
-        background: #ffffff;
-        height: calc(100% - 86px);
-        > div {
-            height: 100%;
-            overflow: hidden;
-            overflow-y: auto;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        cursor: default;
+        &::before,
+        &::after {
+          content: "";
+          position: absolute;
+          width: 4px;
+          height: 100%;
+          border-radius: 4px;
+          background: #3f67c366;
         }
-        .noHaveData {
-            color: #d8d8d8;
+        &::before {
+          top: 0;
+          left: -2px;
         }
-        .haveData {
-            .el-row:hover {
-                background: #efefef;
-                cursor: pointer;
-            }
+        &::after {
+          top: 0;
+          right: -2px;
         }
+      }
+      &:last-child div::after {
+        background: transparent;
+      }
+      &:first-child div::before {
+        background: transparent;
+      }
     }
-}
-.page_content {
-    margin-top: 10px;
+  }
+  .title {
+    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4);
+    border-radius: 5px;
+    background: #ffffff;
     overflow: hidden;
-    .el-pagination {
-        float: right;
+    height: 40px;
+    .el-row {
+      margin-left: 0px;
+      margin-right: 0px;
+    }
+  }
+  .list_content {
+    margin-top: 10px;
+    box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.4);
+    border-radius: 5px;
+    background: #ffffff;
+    height: calc(100% - 86px);
+    > div {
+      height: 100%;
+      overflow: hidden;
+      overflow-y: auto;
+    }
+    .noHaveData {
+      color: #d8d8d8;
     }
+    .haveData {
+      .el-row:hover {
+        background: #efefef;
+        cursor: pointer;
+      }
+    }
+  }
+}
+.page_content {
+  margin-top: 10px;
+  overflow: hidden;
+  .el-pagination {
+    float: right;
+  }
 }
 </style>

src/components/DataQualityInspection/Rules/LayerQualityInspectionRules.vue

@@ -18,8 +18,8 @@ export default {
       srcList: [showImg],
       textArr: [
         "第三方表名（TABLE_NAME）不能为空，长度100字符。",
-        "标题（TITLE）不能为空，长度20个字符。",
-        "描述（CONTENT）不能为空，长度100个字符。",
+        "标题（TITLE）不能为空，长度20字符。",
+        "描述（CONTENT）不能为空，长度100字符。",
         "内容描述（JSON_STR）可以为空，长度64字符。",
         "几何类型不能为空。",
       ],

src/components/SecondaryDevelopment/GraphicsDrawingTool.vue

@@ -89,7 +89,7 @@ export default {
       content: {
         // 集成方式和步骤
         way: [
-          { text: "在html页面中使用iframe标签加载插件" },
+          { text: "在html页面中使用iframe标签加载插件。" },
           // {
           //   text: "在填写iframe的src属性时，url不拼接参数时，不触发任何绘制事件；",
           //   children: [
@@ -100,10 +100,10 @@ export default {
         ],
         // 方法说明
         methods: {
-          text: '插件对外暴露三个接口，分别为showCoordinates，clear，getCoordinates。 接口调用示例：document.querySelector("iframe").contentWindow.clear()',
+          text: '插件对外暴露三个接口，分别为showCoordinates，clear，getCoordinates。 接口调用示例：document.querySelector("iframe").contentWindow.clear()。',
           methods: [
             {
-              text: "通过showCoordinates接口，可以将需要展示的图形传入插件页面中",
+              text: "通过showCoordinates接口，可以将需要展示的图形传入插件页面中。",
               param: [
                 {
                   name: "type",
@@ -132,10 +132,10 @@ export default {
               },
             },
             {
-              text: "通过clear接口，可以将插件页面中当前展示的所有图形清空",
+              text: "通过clear接口，可以将插件页面中当前展示的所有图形清空。",
             },
             {
-              text: "通过getCoordinates，可以获取当前插件页面中所有图形坐标",
+              text: "通过getCoordinates，可以获取当前插件页面中所有图形坐标。",
               example: {
                 title: "返回值示例：",
                 arr: [
@@ -149,11 +149,11 @@ export default {
         effect: "",
         // 注意事项
         attention: [
-          "请当iframe加载后再调用各类方法",
-          "触发编辑功能时，绘制和选择功能会被强制退出",
-          "绘制时，无法选择和编辑",
-          "在绘制和编辑功能都退出时，可选择图形，点击图形单独选中，按住shift键后再点击图形可进行多选操作",
-          "删除功能规则：当前已有选择的图形时，仅删除已选择的图形；若当前没有选择图形，则删除地图中所有图形",
+          "请当iframe加载后再调用各类方法；",
+          "触发编辑功能时，绘制和选择功能会被强制退出；",
+          "绘制时，无法选择和编辑；",
+          "在绘制和编辑功能都退出时，可选择图形，点击图形单独选中，按住shift键后再点击图形可进行多选操作；",
+          "删除功能规则：当前已有选择的图形时，仅删除已选择的图形；若当前没有选择图形，则删除地图中所有图形。",
         ],
       },
     };

src/components/SecondaryDevelopment/ManualDrawingTool.vue

@@ -34,7 +34,7 @@
         </el-table>
       </el-row>
       <el-row v-if="item.example != undefined">
-        <el-row class="text">{{item.example.title}}</el-row>
+        <el-row class="text">{{ item.example.title }}</el-row>
         <el-row
           class="text second_text"
           v-for="(str1, index1) in item.example.arr"
@@ -85,21 +85,21 @@ export default {
       content: {
         // 集成方式和步骤
         way: [
-          { text: "在html页面中使用iframe标签加载插件" },
+          { text: "在html页面中使用iframe标签加载插件。" },
           {
-            text: "在填写iframe的src属性时，url不拼接参数时，不触发任何绘制事件；",
+            text: "在填写iframe的src属性时，url不拼接参数时，不触发任何绘制事件。",
             children: [
               "当拼接参数type=1，开启绘制单点；",
-              "当拼接参数type=2，开启绘制线（注：绘制线段时，支持 鼠标左键双击 / 鼠标右键单击 结束当前线段绘制）",
+              "当拼接参数type=2，开启绘制线（注：绘制线段时，支持 鼠标左键双击 / 鼠标右键单击 结束当前线段绘制）。",
             ],
           },
         ],
         // 方法说明
         methods: {
-          text: '插件对外暴露三个接口，分别为showCoordinates，clear，getCoordinates。 接口调用示例：document.querySelector("iframe").contentWindow.clear()',
+          text: '插件对外暴露三个接口，分别为showCoordinates，clear，getCoordinates。 接口调用示例：document.querySelector("iframe").contentWindow.clear()。',
           methods: [
             {
-              text: "通过showCoordinates接口，可以将需要展示的图形传入插件页面中",
+              text: "通过showCoordinates接口，可以将需要展示的图形传入插件页面中。",
               param: [
                 {
                   name: "type",
@@ -124,10 +124,10 @@ export default {
               },
             },
             {
-              text: "通过clear接口，可以将插件页面中当前展示的所有图形清空",
+              text: "通过clear接口，可以将插件页面中当前展示的所有图形清空。",
             },
             {
-              text: "通过getCoordinates，可以获取当前插件页面中所有图形坐标",
+              text: "通过getCoordinates，可以获取当前插件页面中所有图形坐标。",
               example: {
                 title: "返回值示例：",
                 arr: [
@@ -137,7 +137,7 @@ export default {
               },
             },
             {
-              text: "url可额外增加参数lon，lat，zoom",
+              text: "url可额外增加参数lon，lat，zoom。",
               table: [
                 {
                   name: "lon",
@@ -156,7 +156,7 @@ export default {
                 },
               ],
               attention:
-                "注：lon，lat需要同时填写，否则插件则使用默认经纬度定位；​zoom不填写是使用默认缩放级别定位，填写是按照填写的缩放级别定位；",
+                "注：lon，lat需要同时填写，否则插件则使用默认经纬度定位；​zoom不填写是使用默认缩放级别定位，填写是按照填写的缩放级别定位。",
             },
           ],
         },
@@ -179,7 +179,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
- .el-container {
+.el-container {
   display: block;
   width: 100%;
   padding: 10px 20px;

src/components/SecondaryDevelopment/MeasureTool.vue

@@ -48,7 +48,7 @@ export default {
         // 方法说明
         methods: [
           "实例化一个测量对象 let measureToolObj = new measureTool(map)，其中map为openlayer地图引擎创建的地图对象；",
-          'measureToolObj.start(type)，通过调用实例化的测量对象当中的start方法，启动测量功能。其中参数type有两个值，当type="lineString"时，开启的是测距功能；当type="area"时，开启的是测面功能。',
+          'measureToolObj.start(type)，通过调用实例化的测量对象当中的start方法，启动测量功能。其中参数type有两个值，当type="lineString"时，开启的是测距功能；当type="area"时，开启的是测面功能；',
           "measureToolObj.stop()，通过调用实例化的测量对象当中的stop方法，关闭测量功能。",
         ],
         // 注意事项

src/components/SystemManagement/UserManagement.vue

@@ -23,28 +23,30 @@
             >{{ str }}
           </el-breadcrumb-item>
         </el-breadcrumb>
-        <el-tree
-          ref="layerTree"
-          :data="layerList"
-          show-checkbox
-          node-key="id"
-          :default-expanded-keys="[0, 1, 2, 3, 4, 5, 6]"
-          @check="layerCheck"
-          :props="defaultLayerListProps"
-          :expand-on-click-node="false"
-        >
-          <span class="custom-tree-node" slot-scope="{ node, data }">
-            <span>{{ node.label }}</span>
-            <span v-if="node.level != 1">
-              <el-button
-                type="text"
-                size="mini"
-                @click="() => openSetRegion(data, node)"
-                >设置行政区划权限
-              </el-button>
+        <div v-if="layerList != undefined">
+          <el-tree
+            ref="layerTree"
+            :data="layerList"
+            show-checkbox
+            node-key="id"
+            :default-expanded-keys="[0, 1, 2, 3, 4, 5, 6]"
+            @check="layerCheck"
+            :props="defaultLayerListProps"
+            :expand-on-click-node="false"
+          >
+            <span class="custom-tree-node" slot-scope="{ node, data }">
+              <span>{{ node.label }}</span>
+              <span v-if="node.level != 1">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="() => openSetRegion(data, node)"
+                  >设置行政区划权限
+                </el-button>
+              </span>
             </span>
-          </span>
-        </el-tree>
+          </el-tree>
+        </div>
       </div>
       <div class="list_container regionList" v-show="isShowRegionList">
         <el-breadcrumb separator-class="el-icon-arrow-right" :class="'title'">
@@ -125,6 +127,8 @@ export default {
 
       haveChange: false, // 是否做了修改
       exampleWord: systemConfig.exampleWord,
+
+      layerList: undefined,
     };
   },
   created() {
@@ -133,6 +137,7 @@ export default {
       that.regionList = result;
     });
     this.getAllUserList();
+    this.getAllLayerNoPermission();
   },
   mounted() {},
   methods: {
@@ -177,6 +182,31 @@ export default {
         });
     },
 
+    getAllLayerNoPermission() {
+      let that = this;
+      return new Promise((resolve, reject) => {
+        api
+          .getAllLayerNoPermission()
+          .then(function (result) {
+            if (result.code == 200) {
+              that.layerList = result.content.map(function (item) {
+                item.title = item.name;
+                return item;
+              });
+              // that.$store.commit("setLayerList", result.content);
+            } else {
+              // that.$checkRequestCode(result);
+            }
+          })
+          .catch((err) => {
+            that.$message({
+              type: "error",
+              message: err,
+            });
+          });
+      });
+    },
+
     // 获取单个用户的当前权限
     getSingleUserAuthInfo(userId) {
       let that = this;
@@ -483,12 +513,12 @@ export default {
     },
   },
   computed: {
-    layerList() {
-      return this.$store.state.layerList.map(function (item) {
-        item.title = item.name;
-        return item;
-      });
-    },
+    // layerList() {
+    //   return this.$store.state.layerList.map(function (item) {
+    //     item.title = item.name;
+    //     return item;
+    //   });
+    // },
   },
   watch: {
     isShowRegionList(newVal, oldVal) {

src/views/Home.vue

@@ -183,8 +183,8 @@ export default {
         .catch((err) => {});
     } else {
       this.permissionFilteringUnlogin();
-      this.getMenu();
-      this.getIcon();
+      // this.getMenu();
+      // this.getIcon();
     }
   },
   mounted() {},