bug修复

史敦盼
Commit 696da117 authored Jun 24, 2024 by 史敦盼
Showing with 37 additions and 39 deletions
public/index.html
src/views/archi-ele-list/index.vue
src/views/collectDataConfiguration/Detail.vue
--- a/public/index.html
+++ b/public/index.html
@@ -44,6 +44,7 @@
    }
    ::-webkit-scrollbar {
      width: 8px;
+      height: 8px;
    }
    ::-webkit-scrollbar-track {
      background-color: #fff;

--- a/src/views/archi-ele-list/index.vue
+++ b/src/views/archi-ele-list/index.vue
@@ -461,7 +461,6 @@
                v-model="ruleForm.let4"
              ></el-input>
            </el-form-item>
          </div>
        </el-form>
        <div
@@ -510,11 +509,7 @@
            label="长度"
            align="center"
          ></el-table-column> -->
-          <el-table-column
+          <el-table-column prop="controlType" label="控件" align="center">
-            prop="controlType"
-            label="控件"
-            align="center"
-          >
            <template slot-scope="scope">
              <span v-if="scope.row.controlType == 0">单行文本框</span>
              <span v-if="scope.row.controlType == 1">多行文本框</span>
@@ -641,7 +636,9 @@
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
-        <el-button class="greenButton"  v-debounce: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>
@@ -902,39 +899,38 @@ export default {
      scopeApplicationOptions: [],
      rowData: {},
      predefineColors: archiEleColor,
-      graphId: ''
+      graphId: '',
    }
  },
-  created(){
+  created() {
-    Promise.all([
+    Promise.all([this.get_dialog_select1(), this.get_dialog_select2()]).then(
-      this.get_dialog_select1(),
+      (res2) => {
-      this.get_dialog_select2(),
-    ]).then((res2) => {
        this.dialog_select1 = res2[0]
        this.search_select1 = res2[1]
        this.get_table()
-    })
+      },
+    )
    this.getStateList()
    this.getScopeApplicationOptions()
  },
  mounted() {
    window.addEventListener('resize', () => {
      this.set_table_height()
    })
    this.set_table_height()
  },
  methods: {
    // 适用范围
-    getScopeApplicationOptions(){
+    getScopeApplicationOptions() {
-      query_jia_gou_ceng_ci_new({"typeValue": "scope_application"}).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'scope_application' }).then(
+        (res) => {
          this.scopeApplicationOptions = res.data
-      })
+        },
+      )
    },
    // 状态
-    getStateList(){
+    getStateList() {
-      query_jia_gou_ceng_ci_new({"typeValue": "sys_state"}).then(res => {
+      query_jia_gou_ceng_ci_new({ typeValue: 'sys_state' }).then((res) => {
        if (res.code == 200) {
          this.stateList = res.data
        }
@@ -1351,12 +1347,17 @@ export default {
            referenceRelationship: this.ruleForm.referenceRelationship,
            example: this.ruleForm.example,
            scope: this.ruleForm.scope,
-            graphId: this.graphId
+            graphId: this.graphId,
          }
          const requestParams =
            this.is_add_edit == 'add'
              ? params
-              : { ...params, elementId: this.elementId, version: this.version, archiBelongId: this.rowData.archiBelongId }
+              : {
+                  ...params,
+                  elementId: this.elementId,
+                  version: this.version,
+                  archiBelongId: this.rowData.archiBelongId,
+                }
          if (this.is_add_edit == 'add') {
            add_jia_gou_yuan_su(requestParams).then((res) => {
              if (res.code == 200) {
@@ -1430,7 +1431,7 @@ export default {
            referenceRelationship: this.ruleForm.referenceRelationship,
            example: this.ruleForm.example,
            scope: this.ruleForm.scope,
-            graphId: this.graphId
+            graphId: this.graphId,
          }
          const requestParams =
            this.is_add_edit == 'add'
@@ -1525,7 +1526,7 @@ export default {
      //查询架构层次下拉框值
      return new Promise((resolve, reject) => {
        // query_jia_gou_ceng_ci({}).then((res) => {
-        query_jia_gou_ceng_ci_new({"typeValue": "archi_level"}).then(res => {
+        query_jia_gou_ceng_ci_new({ typeValue: 'archi_level' }).then((res) => {
          if (res.code == 200) {
            resolve(res.data)
          } else {
@@ -1561,7 +1562,7 @@ export default {
      //查询架构归属下拉框值
      return new Promise((resolve, reject) => {
        // query_jia_gou_gui_shu({}).then((res) => {
-        query_jia_gou_ceng_ci_new({"typeValue": "archi_belong"}).then(res => {
+        query_jia_gou_ceng_ci_new({ typeValue: 'archi_belong' }).then((res) => {
          if (res.code == 200) {
            resolve(res.data)
          } else {
@@ -1580,6 +1581,7 @@ export default {
      this.query_item1 = null
      this.query_item3 = null
      this.query_item4 = null
+      this.queryParamsScope = null
    },
    // 每页条数改变
    handleSizeChange(val) {
@@ -1602,7 +1604,7 @@ export default {
        elementName: this.query_item3,
        pageSize: this.pager.size,
        state: this.query_item4,
-        scope: this.queryParamsScope
+        scope: this.queryParamsScope,
      }
      this.loading = true
      query_jia_gou_yuan_su_guan_xi_table(params).then((result) => {
@@ -1686,7 +1688,7 @@ export default {
            state: 0,
            version: row.version,
            elementName: row.elementName,
-            archiBelongId: row.archiBelongId
+            archiBelongId: row.archiBelongId,
          }
          edit_jia_gou_yuan_su(params).then((res) => {
            if (res.code == 200) {
@@ -1725,7 +1727,7 @@ export default {
            state: 1,
            version: row.version,
            elementName: row.elementName,
-            archiBelongId: row.archiBelongId
+            archiBelongId: row.archiBelongId,
          }
          edit_jia_gou_yuan_su(params).then((res) => {
            if (res.code == 200) {
@@ -1763,7 +1765,7 @@ export default {
            elementId: row.elementId,
            state: row.state,
            delFlag: 1,
-            elementName: row.elementName
+            elementName: row.elementName,
          }
          delete_jia_gou_gui_shu(params).then((res) => {
            if (res.code == 200) {

--- a/src/views/collectDataConfiguration/Detail.vue
+++ b/src/views/collectDataConfiguration/Detail.vue
@@ -48,19 +48,14 @@ export default {
      default: false,
    },
  },
-  watch: {
+  watch: {},
-    // prjCodeDetail(v){
-    //     this.query.queryParam.prjCode = v
-    //     this.search()
-    // },
-  },
  data() {
    return {
      query: {
        url: collectDataConfiguration,
        method: 'post',
        queryParam: {
-          prjCode: '',
+          supervId: '',
        },
      },
      selectId: '',
@@ -98,10 +93,10 @@ export default {
  methods: {
    handleClose() {
      this.showDialog = false
-      this.query.queryParam.prjCode = ''
+      this.query.queryParam.supervId = ''
    },
    handleOpen() {
-      this.query.queryParam.prjCode = this.prjCodeDetail
+      this.query.queryParam.supervId = this.prjCodeDetail
      this.search()
    },
    async search() {