资源管理，图层管理修改

Surpriseplus

2023-08-16 87572c2af4c6b927b55cd9efda438087d36d0f3d

资源管理，图层管理修改

 src/views/AuthorizationManagement/roleResAuthorization.vue

@@ -206,9 +206,7 @@
import {
  queryDepTree,
  select_Role_ByPageAndCount,

  roleResInserts,

  roleLayer_selectResByRole,
  roleLayer_inserts,
  roleLayer_deletes
@@ -310,9 +308,7 @@
      if (std.length == 0) {
        return
      }

      const data = await roleLayer_inserts(std);

      if (data.code != 200) {
        this.$message.error('授权失败');
      } else {
@@ -441,6 +437,11 @@
      return cloneData.filter((father) => {
        // 循环所有项
        let branchArr = cloneData.filter((child) => father.layerid == child.pid); // 对比ID，分别上下级菜单，并返回数据

        branchArr.sort(function (a, b) {
          return a.orderNum - b.orderNum
        })

        branchArr.length > 0 ? (father.children = branchArr) : ""; // 给父级添加一个children属性，并赋值
        // 属于同一对象问题，例如：令 a=b、c=1 ，然后再令 b.c=c ， 那么 a.c=b.c=c=1 ；同理，后续令 c.d=2 ,那么 a.c.d 也是=2；
        // 由此循环多次后，就能形成相应的树形数据结构
@@ -512,7 +513,6 @@
    async getuserList() {
      this.Layertree = [];
      this.layeroption = [];

      const data = await roleLayer_selectResByRole({ roleid: this.userlistData.roleid });
      if (data.code !== 200) {
        return this.$message.error('根据ID查询资源失败');
@@ -525,8 +525,9 @@
        }
      }
      var val = this.setTreeData(data.result);


      val.sort(function (a, b) {
        return a.orderNum - b.orderNum
      })
      this.Layertree = val
      this.$refs.layerFrom.setCheckedKeys(std);
    },

 src/views/datamanage/layerManagement.vue

@@ -160,7 +160,27 @@
                v-model="formInline.enName"
              ></el-input>
            </el-form-item> -->

            <!-- 数据类型 -->
            <el-form-item
              v-show="formInline.isLayer == 1"
              :label="$t('dataManage.layerObj.dataType')"
            >
              <el-select
                style="width: 60%;"
                v-model="formInline.data"
                :placeholder="$t('dataManage.layerObj.prompt3')"
                :disabled="serviceActive"
                @change="setFromDataTypeClick"
              >
                <el-option
                  v-for="item in serveType"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
            <!-- 数据类型 -->
            <el-form-item
              v-show="formInline.isLayer == 1"
@@ -182,26 +202,6 @@
              </el-select>
            </el-form-item>

            <!-- 数据类型 -->
            <el-form-item
              v-show="formInline.isLayer == 1"
              :label="$t('dataManage.layerObj.dataType')"
            >
              <el-select
                style="width: 60%;"
                v-model="formInline.data"
                :placeholder="$t('dataManage.layerObj.prompt3')"
                :disabled="serviceActive"
              >
                <el-option
                  v-for="item in serveType"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
            <!-- 服务地址 -->
            <el-form-item
              v-show="formInline.isLayer == 1"
@@ -323,23 +323,34 @@
          <!-- 菜单名称 -->
          <el-form-item :label="$t('dataManage.layerObj.layerName')">
            <el-input
              :disabled="insertServiceActive"
              :placeholder="$t('dataManage.layerObj.prompt1')"
              style="width: 60%;"
              v-model="insertData.cnName"
            ></el-input>
          </el-form-item>
          <!-- 英文名称 -->
          <!-- <el-form-item :label="$t('dataManage.layerObj.englishName')">
            <el-input
              :disabled="insertServiceActive"
              :placeholder="$t('dataManage.layerObj.prompt6')"
              style="width: 60%;"
              v-model="insertData.enName"
            ></el-input>
          </el-form-item> -->

          <!-- 数据类型 -->
          <el-form-item
            v-show="insertData.isLayer == 1"
            :label="$t('dataManage.layerObj.dataType')"
          >
            <el-select
              style="width: 60%;"
              v-model="insertData.data"
              :placeholder="$t('dataManage.layerObj.prompt3')"
              :disabled="insertServiceActive"
              @change="setInsertDataTypeClick"
            >
              <el-option
                v-for="item in serveType"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- 服务类类型 -->
          <el-form-item
            v-show="insertData.isLayer == 1"
            :label="$t('dataManage.layerObj.serviceType')"
@@ -352,26 +363,6 @@
            >
              <el-option
                v-for="item in dataType"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
          <!-- 数据类型 -->
          <el-form-item
            v-show="insertData.isLayer == 1"
            :label="$t('dataManage.layerObj.dataType')"
          >
            <el-select
              style="width: 60%;"
              v-model="insertData.data"
              :placeholder="$t('dataManage.layerObj.prompt3')"
              :disabled="serviceActive"
            >
              <el-option
                v-for="item in serveType"
                :key="item.value"
                :label="item.label"
                :value="item.value"
@@ -576,7 +567,10 @@
      checkData: null,
      backUpData: null,
      dialogVisible: false,
      insertData: {},
      insertData: {
        type: null,
        data: null,
      },
      currentData: null,
      newNode: null,
      newData: [],
@@ -601,6 +595,35 @@
    },
  },
  methods: {
    setFromDataTypeClick(res) {
      this.setInsertDataTypeChange(res)
      this.formInline.type = this.dataType[0].value
    },
    setInsertDataTypeClick(res) {
      this.setInsertDataTypeChange(res)
      this.insertData.type = this.dataType[0].value
    },
    setInsertDataTypeChange(res) {
      var filter = this.serveType.filter(rs => {
        if (rs.value == res) {
          return rs
        }
      })
      if (filter.length <= 0) return
      var std = [];
      var data = filter[0].children;
      for (var i in data) {
        for (var j in serve_type) {
          if (serve_type[j].value == data[i]) {
            std.push({
              value: serve_type[j].value,
              label: serve_type[j].name,
            })
          }
        }
      }
      this.dataType = std
    },
    setServiceConfirm() {
      if (this.multipleSelection.length <= 0) {
        return this.$message("未选择资源数据");
@@ -611,10 +634,16 @@
        url = this.multipleSelection.url;
      } else if (this.multipleSelection.status == 2) {
        var token = getToken()
        if (this.multipleSelection.proxy && this.multipleSelection.proxy.indexOf('{token}') > -1) {
        serviceUrl = BASE_URL + this.multipleSelection.proxy.replaceAll('{token}', token);
        } else {
          serviceUrl = this.multipleSelection.url
        }

        url = this.multipleSelection.proxy;
      }
      if (this.dialogVisible) {
        this.setInsertDataTypeChange(this.multipleSelection.data);
        this.insertData.cnName = this.multipleSelection.cnName;
        this.insertData.enName = this.multipleSelection.enName;
        this.insertData.type = this.multipleSelection.type;
@@ -623,7 +652,6 @@
        this.insertData.url = url;
        this.insertData.data = this.multipleSelection.data;
        this.insertServiceActive = true
        // this.insertData.status = this.multipleSelection.status;
      } else {
        this.formInline.cnName = this.multipleSelection.cnName;
        this.formInline.enName = this.multipleSelection.enName;
@@ -638,6 +666,8 @@
      }
      this.dialogService = false
    },


    setServiceRest() {
      this.listData = {
        pageIndex: 1,
@@ -894,6 +924,7 @@
      this.insertData.pid = id;
      this.insertData.level = lever;
      this.insertData.orderNum = orderNum;

      this.dialogVisible = true;
    },
    getMaxOrderNum(res) {
@@ -907,6 +938,9 @@
      return val;
    },
    insertStart() {
      var data = this.serveType[0].value;
      this.setInsertDataTypeChange(this.serveType[0].value)
      var type = this.dataType[0].value
      this.insertData = {
        cnName: null,
        type: null,
@@ -921,7 +955,9 @@
        category: null,
        status: null,
        service: '0',
        status: '1'
        status: '1',
        type: type,
        data: data,
      }
    },
    //修改数据
@@ -962,6 +998,10 @@
      this.oriData = data.result;
      this.newData = data.result;
      var val = this.setTreeData(data.result);
      val.sort(function (a, b) {
        return a.orderNum - b.orderNum
      })

      this.treeData = val;
      var cdata;
      if (this.currentData) {
@@ -996,10 +1036,15 @@
        url = result.url;
      } else if (this.serviceActive) {
        var token = getToken()
        if (result.url.indexOf('{token}') > -1) {
        url = BASE_URL + result.url.replaceAll('{token}', token);
        } else {
          url = result.url;
        }

      }
      this.formInline.serviceUrl = url;

      this.setInsertDataTypeChange(this.formInline.data)
      // this.formInline.isProject = result.isProject.toString();
    },
    //图层列表点击事件
@@ -1018,7 +1063,6 @@
            return a.orderNum - b.orderNum
          })
        }

        branchArr.length > 0 ? (father.children = branchArr) : ""; // 给父级添加一个children属性，并赋值
        // 属于同一对象问题，例如：令 a=b、c=1 ，然后再令 b.c=c ， 那么 a.c=b.c=c=1 ；同理，后续令 c.d=2 ,那么 a.c.d 也是=2；
        // 由此循环多次后，就能形成相应的树形数据结构
@@ -1045,6 +1089,7 @@
        std.push({
          value: data_type[i].value,
          label: data_type[i].name,
          children: data_type[i].children
        })
      }
      this.dataType = ste;