问题修复

史敦盼
Commit 18af1b76 authored Apr 17, 2024 by 史敦盼
Showing with 127 additions and 56 deletions
src/api/index.js
src/router/index.js
src/views/archi-ele-list/index.vue
src/views/archiEleRela/index.vue
src/views/archiViewConfig/index.vue
src/views/busi-assets-list/index.vue
src/views/meta-model-list/index.vue
src/views/organizationManagement/Add.vue
src/views/projectInfoManage/index.vue
src/views/systemInfoManage/index.vue
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -829,6 +829,14 @@ export function batchDeleteOrgTreeItem(params) {
 export function editOrgTreeItem(params) {
  return post(EADC_SHARED_ABILITY + `/org/cOrg`, params)
 }
+// 获取组织下拉
+export function getOrgOption(params) {
+  return post(EADC_SHARED_ABILITY + `/org/getOrgOption`, params)
+}
+// 获取部门下拉
+export function getDeptOption(params) {
+  return post(EADC_SHARED_ABILITY + `/org/getDeptOption`, params)
+}
 export function postRequest(url, params) {
  return post(EADC_ARRCHITECTURE + url, params)
 }

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -211,7 +211,7 @@ export const routes = [
        name: 'archiAssetManage',
        component: () => import('@/views/archi-asset-manage/index.vue'),
        meta: {
-          title: '总体架构资产管理',
+          title: '系统架构资产管理',
        },
      },
      {

--- a/src/views/archi-ele-list/index.vue
+++ b/src/views/archi-ele-list/index.vue
@@ -29,6 +29,7 @@
              ></el-option>
            </el-select>
          </div>
          <div class="search_menu_item">
            <span class="search_title">状态</span>
            <el-select
@@ -48,6 +49,21 @@
              <el-option label="暂存" value="2"></el-option> -->
            </el-select>
          </div>
+          <div class="search_menu_item">
+            <span class="search_title">适用范围</span>
+            <el-select
+                clearable
+                placeholder="请选择"
+                v-model="queryParamsScope"
+              >
+                <el-option
+                  :label="item.label"
+                  :value="item.value"
+                  v-for="item in scopeApplicationOptions"
+                  :key="item.value"
+                ></el-option>
+              </el-select>
+          </div>
        </div>
        <div class="search_menu_btn_container">
          <div class="query_btn" @click="search_table">
@@ -638,7 +654,7 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button class="greenButton" @click="save_dicy">保存</el-button>
+        <el-button class="greenButton"  v-debounce:click="save_dicy">保存</el-button>
        <el-button @click="dicy_dialog = false">取消</el-button>
      </span>
    </el-dialog>
@@ -870,6 +886,7 @@ export default {
      query_item1: null,
      query_item3: null,
      query_item4: null,
+      queryParamsScope: null,
      add_select_item: null,
      add_select_item2: null,
      search_select1: [],
@@ -1167,32 +1184,32 @@ export default {
        this.selectGraphShape = this.graphList[this.graphIndex].graphName
      }
      // 给图形添加文字
-      const item_icon = this.selectGraphSrc.split('base64,')[1]
+      // const item_icon = this.selectGraphSrc.split('base64,')[1]
-      const decode_item_icon = window.atob(item_icon) //svg解码，为字符串
+      // const decode_item_icon = window.atob(item_icon) //svg解码，为字符串
-      const svgDocument = new DOMParser().parseFromString(
+      // const svgDocument = new DOMParser().parseFromString(
-        decode_item_icon,
+      //   decode_item_icon,
-        'text/xml',
+      //   'text/xml',
-      ) //svg字符串转标签
+      // ) //svg字符串转标签
-      const svgTag = svgDocument.getElementsByTagName('svg')[0]
+      // const svgTag = svgDocument.getElementsByTagName('svg')[0]
-      // 图形添加文字
+      // // 图形添加文字
-      var svgNS = 'http://www.w3.org/2000/svg'
+      // var svgNS = 'http://www.w3.org/2000/svg'
-      var text = document.createElementNS(svgNS, 'text')
+      // var text = document.createElementNS(svgNS, 'text')
-      text.textContent = this.ruleForm.let1
+      // text.textContent = this.ruleForm.let1
-      // 设置text元素的属性，例如字体大小和颜色
+      // // 设置text元素的属性，例如字体大小和颜色
-      text.setAttribute('font-size', '12')
+      // text.setAttribute('font-size', '12')
-      text.setAttribute('fill', '#000000')
+      // text.setAttribute('fill', '#000000')
-      // 设置text元素的位置（居中展示）
+      // // 设置text元素的位置（居中展示）
-      text.setAttribute('text-anchor', 'middle')
+      // text.setAttribute('text-anchor', 'middle')
-      text.setAttribute('dominant-baseline', 'middle')
+      // text.setAttribute('dominant-baseline', 'middle')
-      const svgWidth = Number(svgTag.getAttribute('width').split('px')[0]) / 2
+      // const svgWidth = Number(svgTag.getAttribute('width').split('px')[0]) / 2
-      const svgHeight = Number(svgTag.getAttribute('height').split('px')[0]) / 2
+      // const svgHeight = Number(svgTag.getAttribute('height').split('px')[0]) / 2
-      text.setAttribute('x', svgWidth) // 距离左边界
+      // text.setAttribute('x', svgWidth) // 距离左边界
-      text.setAttribute('y', svgHeight) // 距离上边界
+      // text.setAttribute('y', svgHeight) // 距离上边界
-      // 将text元素添加到SVG容器中
+      // // 将text元素添加到SVG容器中
-      svgTag.appendChild(text)
+      // svgTag.appendChild(text)
-      const svgToString = new XMLSerializer().serializeToString(svgDocument) //svg标签转化为字符串
+      // const svgToString = new XMLSerializer().serializeToString(svgDocument) //svg标签转化为字符串
-      // console.log('svgToString', svgToString)
+      // // console.log('svgToString', svgToString)
-      this.selectGraphSrc = svgToBase64(svgToString) // 'data:image/svg+xml;base64,' + encode_item_icon
+      // this.selectGraphSrc = svgToBase64(svgToString) // 'data:image/svg+xml;base64,' + encode_item_icon
    },
    closeGraphDialog() {
      //图形选择窗口的取消
@@ -1598,6 +1615,7 @@ export default {
        elementName: this.query_item3,
        pageSize: this.pager.size,
        state: this.query_item4,
+        scope: this.queryParamsScope
      }
      this.loading = true
      query_jia_gou_yuan_su_guan_xi_table(params).then((result) => {
@@ -1867,7 +1885,7 @@ export default {
 .search_menu_item {
  display: flex;
  align-items: center;
-  width: 344px;
+  width: 25%;
 }
 .search_title {
  /* width: 20%; */

--- a/src/views/archiEleRela/index.vue
+++ b/src/views/archiEleRela/index.vue
@@ -532,7 +532,7 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button class="greenButton" @click="save_dicy">保存</el-button>
+        <el-button class="greenButton" v-debounce:click="save_dicy">保存</el-button>
        <el-button @click="dicy_dialog = false">取消</el-button>
      </span>
    </el-dialog>

--- a/src/views/archiViewConfig/index.vue
+++ b/src/views/archiViewConfig/index.vue
@@ -77,7 +77,7 @@
          </div>
        </div>
        <div class="search_menu_btn_container">
-          <div class="query_btn" @click="getList">
+          <div class="query_btn" @click="getTable">
            <img
              class="btn_icon"
              src="@/assets/archi-ele-list/search.png"
@@ -560,7 +560,7 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button class="greenButton" @click="save_dicy">保存</el-button>
+        <el-button class="greenButton" v-debounce:click="save_dicy">保存</el-button>
        <el-button @click="dicy_dialog = false">取消</el-button>
      </span>
    </el-dialog>
@@ -1004,7 +1004,10 @@ export default {
        }
      })
    },
+    getTable() {
+      this.params.current = 1
+      this.getList()
+    },
    // 查询列表
    getList() {
      getJGSTPZlist(this.params).then((res) => {

--- a/src/views/busi-assets-list/index.vue
+++ b/src/views/busi-assets-list/index.vue
@@ -728,7 +728,7 @@ export default {
  },
  methods: {
    formatParentElement(row, column, cellValue, index) {
-      return cellValue?.replace(/\]|\[|\/?]/g, '')
+      return cellValue?.replace(/\]|\[|\/?]/g, '').replace('null', '')
    },
    // 所属元素下拉
    getArchiEleList(){
@@ -1246,12 +1246,13 @@ export default {
      } else {
        selectedObject = null;
      }
+      console.log('value', value, selectedObject)
      this.selectValue2 = selectedObject.assetId
      this.selectLabel2 = selectedObject.assetName
-      this.ruleForm.let1 = selectedObject.assetName
+      this.ruleForm2.let1 = selectedObject.assetName
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
-        this.$refs.form2.resetFields()
+      //   this.$refs.form2.resetFields()
-      })
+      // })
    },
    handleCheckChange2(data, tree) {
      //模版下载的上级节点的下拉树的勾选
@@ -1477,7 +1478,7 @@ export default {
      })
      inpEle.click()
    },
-    saveTemplateDialog() {
+    saveTemplateDialog() {console.log('this', this.ruleForm2)
      //下载模版
      this.$refs.form2.validate((valid) => {
        if (valid) {

--- a/src/views/meta-model-list/index.vue
+++ b/src/views/meta-model-list/index.vue
@@ -95,6 +95,7 @@
 			title="新建元模型视图"
 			:visible.sync="add_dialog"
 			:center="false"
+      @close="handleClose()"
 			width="40%">
 			<div class="add_dialog_content">
 				<el-form :model="ruleForm" :rules="rules" ref="ruleForm">
@@ -170,6 +171,9 @@ export default {
    // })
 	},
 	methods: {
+    handleClose() {
+      this.ruleForm.name = ''
+    },
 		tabs_click_func(data) {
 		},

--- a/src/views/organizationManagement/Add.vue
+++ b/src/views/organizationManagement/Add.vue
@@ -14,7 +14,7 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="handleClose()">取 消</el-button>
-        <el-button type="primary" no-backslash @click="handleSave()"
+        <el-button type="primary" v-preventReClick @click="handleSave()"
          >保 存</el-button
        >
      </span></el-dialog
@@ -97,6 +97,7 @@ export default {
            value: 'orgId',
          },
          filterable: true,
+          changeOnSelect: true,
          events: {
            change(data) {
              console.log(data)

--- a/src/views/projectInfoManage/index.vue
+++ b/src/views/projectInfoManage/index.vue
@@ -4,7 +4,7 @@
      <div class="search_menu">
        <div class="search_menu_item_container">
          <div class="search_menu_item">
-            <span class="search_title">单位</span>
+            <span class="search_title">组织单位</span>
            <!-- <el-input
              v-no-backslash
              v-model="searchParams.let1"
@@ -16,6 +16,7 @@
              v-model="searchParams.let1"
              placeholder="请选择"
              class="search_item"
+              filterable
            >
              <el-option
                v-for="item in sysOrgOptions"
@@ -26,7 +27,7 @@
            </el-select>
          </div>
          <div class="search_menu_item">
-            <span class="search_title">部门</span>
+            <span class="search_title">业务部门</span>
            <!-- <el-input
              v-no-backslash
              v-model="searchParams.let2"
@@ -35,6 +36,7 @@
              class="search_item"
            ></el-input> -->
            <el-select
+              filterable
              v-model="searchParams.let2"
              placeholder="请选择"
              class="search_item"
@@ -119,7 +121,7 @@
        ></el-table-column>
        <el-table-column
          prop="manageOrgId"
-          label="单位"
+          label="建设单位"
          align="center"
          width="160"
          :formatter="
@@ -129,7 +131,7 @@
        ></el-table-column>
        <el-table-column
          prop="manageDeptId"
-          label="部门"
+          label="业务部门"
          align="center"
          :formatter="
            (row, column, cellValue, index) =>
@@ -699,6 +701,8 @@ import {
  querysystemInfoManageTable,
  addProjectManageTable,
  getPrjInfoDetail,
+  getDeptOption,
+  getOrgOption
 } from '@/api/index.js'
 import { MessageBox, Message } from 'element-ui'
 import $ from 'jquery'
@@ -819,11 +823,25 @@ export default {
          }
        })
      })
-      getDictTypeOptions('sys_org').then((res) => {
+      getDeptOption().then(res => {
-        this.sysOrgOptions = res
+        if(res.code === 200) {
+          this.sysDeptOptions = res.data.map(v => {
+            return {
+              label: v.orgName,
+              value: v.orgId
+            }
+          })
+        }
      })
-      getDictTypeOptions('sys_dept').then((res) => {
+      getOrgOption().then(res => {
-        this.sysDeptOptions = res
+        if(res.code === 200) {
+          this.sysOrgOptions = res.data.map(v => {
+            return {
+              label: v.orgName,
+              value: v.orgId
+            }
+          })
+        }
      })
    },
    openDetail(row) {

--- a/src/views/systemInfoManage/index.vue
+++ b/src/views/systemInfoManage/index.vue
@@ -4,7 +4,7 @@
      <div class="search_menu">
        <div class="search_menu_item_container">
          <div class="search_menu_item">
-            <span class="search_title">单位</span>
+            <span class="search_title">组织单位</span>
            <!-- <el-input
              v-no-backslash
              v-model="searchParams.let1"
@@ -16,6 +16,7 @@
              v-model="searchParams.let1"
              placeholder="请选择"
              class="search_item"
+              filterable
            >
              <el-option
                v-for="item in sysOrgOptions"
@@ -26,7 +27,7 @@
            </el-select>
          </div>
          <div class="search_menu_item">
-            <span class="search_title">部门</span>
+            <span class="search_title">业务部门</span>
            <!-- <el-input
              v-no-backslash
              v-model="searchParams.let2"
@@ -35,6 +36,7 @@
              class="search_item"
            ></el-input> -->
            <el-select
+              filterable
              v-model="searchParams.let2"
              placeholder="请选择"
              class="search_item"
@@ -119,7 +121,7 @@
        ></el-table-column>
        <el-table-column
          prop="manageOrgId"
-          label="单位"
+          label="建设单位"
          align="center"
          :formatter="
            (row, column, cellValue, index) =>
@@ -129,7 +131,7 @@
        </el-table-column>
        <el-table-column
          prop="manageDeptId"
-          label="部门"
+          label="业务部门"
          align="center"
          :formatter="
            (row, column, cellValue, index) =>
@@ -332,6 +334,8 @@ import {
  getDianXingAnLiSelectData,
  addasystemInfoManageTable,
  editDeleteSystemInfoManageTable,
+  getDeptOption,
+  getOrgOption
 } from '@/api/index.js'
 import { MessageBox, Message } from 'element-ui'
 import { getDictTypeOptions } from '@/utils'
@@ -409,11 +413,25 @@ export default {
      return obj.label
    },
    getDicts() {
-      getDictTypeOptions('sys_org').then((res) => {
+      getDeptOption().then(res => {
-        this.sysOrgOptions = res
+        if(res.code === 200) {
+          this.sysDeptOptions = res.data.map(v => {
+            return {
+              label: v.orgName,
+              value: v.orgId
+            }
+          })
+        }
      })
-      getDictTypeOptions('sys_dept').then((res) => {
+      getOrgOption().then(res => {
-        this.sysDeptOptions = res
+        if(res.code === 200) {
+          this.sysOrgOptions = res.data.map(v => {
+            return {
+              label: v.orgName,
+              value: v.orgId
+            }
+          })
+        }
      })
      getDictTypeOptions('sys_build_org').then((res) => {
        this.sysBuildOrgOptions = res