Bladeren bron

'去掉红色边框,编辑后可以重新转换关系'

shaun-sheep 5 jaren geleden
bovenliggende
commit
70ec970034
3 gewijzigde bestanden met toevoegingen van 19 en 27 verwijderingen
  1. 5 2
      src/framework/layout/layout-store.js
  2. 9 17
      src/views/relation/data/index.vue
  3. 5 8
      src/views/relation/datatable/index.vue

+ 5 - 2
src/framework/layout/layout-store.js

@@ -1,8 +1,6 @@
 import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import lStorage from '@/utils/localStorage'
-import axios from 'axios'
-import authutils from '../../utils/authutils'
 
 const KEY_MENU_SELECTED = 'menu_selected'
 const KEY_PROJECT_SELECTED = 'global_project_selected'
@@ -21,6 +19,7 @@ export default {
         uploaderList: [], //当前上传文件列表
         secret: "", //项目密码
         userId: "", //用户id
+        rowEdit: false,//表格数据变化
     },
     getters: {
         sidebarClosed: state => state.sidebarClosed,
@@ -60,6 +59,7 @@ export default {
         }
     },
     mutations: {
+        setRowEdit: (state, val) => (state.rowEdit = val),
         setSidebarClosed: (state, val) => (state.sidebarClosed = val),
         setSidebarSelected: (state, val) => {
             state.sidebarSelected = val
@@ -91,6 +91,9 @@ export default {
 
     },
     actions: {
+        setRowEdit(contentx, value) {
+            contentx.commit('setRowEdit', value)
+        },
         loadUserInfo({ state }) {
             console.log(state)
             return new Promise((resolve, reject) => {

+ 9 - 17
src/views/relation/data/index.vue

@@ -64,7 +64,7 @@
 
 <script>
   import {createEquip, dictCount, dictDataCenter, dictDataPlatFrom, dictSwitchCount} from '../../../api/relation/api'
-  import {mapGetters} from 'vuex'
+  import {mapActions, mapGetters, mapState} from 'vuex'
 
   export default {
     name: "index",
@@ -80,6 +80,8 @@
     },
     computed: {
       ...mapGetters('layout', ['projectId']),
+      ...mapState('layout', ['rowEdit'])
+
     },
     watch: {
       projectId() {
@@ -90,6 +92,7 @@
       this.init()
     },
     methods: {
+      ...mapActions('layout', ['setRowEdit']),
       init() {
         //  统计数量
         let count = {
@@ -105,20 +108,6 @@
             this.isDisabled = true
             return
           }
-          let _this = this
-          if (localStorage.getItem('CountNumber')) {
-            // if (localStorage.getItem('CountNumber') == res.Count) {
-            //   _this.isDisabled = true
-            // } else {
-            //   _this.isDisabled = false
-            // }
-            _this.isDisabled = localStorage.getItem('CountNumber') == res.Count ? true : false
-          } else { //不存在
-            localStorage.setItem('CountNumber', res.Count)
-
-          }
-
-
         })
         //数据中心-物理世界数据转换
         dictDataCenter(count, res => {
@@ -136,7 +125,10 @@
         dictCount(filterCount, res => {
           this.filterCount = res.Count
         })
-
+        this.diss()
+      },
+      diss() {
+        this.isDisabled = this.rowEdit ? false : true
       },
       dataTable() {
         this.$router.push({
@@ -165,8 +157,8 @@
 
       },
       resetTransformation() {
-        localStorage.setItem('CountNumber', this.replenishCount)
         this.isDisabled = true
+        this.setRowEdit(false)
         let param = {
           projectId: this.projectId
         }

+ 5 - 8
src/views/relation/datatable/index.vue

@@ -138,7 +138,6 @@
                 v-model="scope.row.SwitchRule"
                 :disabled="scope.row.type != 1"
                 @change="dataAndGlobal(scope.$index,scope.row,1)"
-                :class="!scope.row.SwitchRule && scope.row.DatacenterSign === 1 ?'danger-color':''"
             ></el-input>
 
           </template>
@@ -152,8 +151,6 @@
                 v-model="scope.row.SwitchRuleDataplatform"
                 :disabled="scope.row.type != 1"
                 @change="dataAndGlobal(scope.$index,scope.row,2)"
-                :class="!scope.row.SwitchRuleDataplatform && scope.row.DatacenterSign === 1 ?'danger-color':''"
-
             ></el-input>
           </template>
         </el-table-column>
@@ -165,7 +162,7 @@
 
 <script>
   import {dectInfo, dictUpdate} from '../../../api/relation/api'
-  import {mapGetters} from 'vuex'
+  import {mapActions, mapGetters, mapState} from 'vuex'
 
   export default {
     name: "index",
@@ -200,7 +197,6 @@
       dectInfo(param).then(res=> {
         this.loading = false
         if(res.data.Result === 'success') {
-          console.log(res.data.Count,'count')
           res.data.Content.length && res.data.Content.forEach(i => {
             this.tableList.push({
               majorName: i.CustomCategoryName,
@@ -263,9 +259,11 @@
       })
     },
     computed: {
-      ...mapGetters('layout', ['projectId','secret']),
+      ...mapGetters('layout', ['projectId']),
+      ...mapState('layout', ['rowEdit'])
     },
     methods: {
+      ...mapActions('layout', ['setRowEdit']),
       back() {
         this.$router.go(-1)
       },
@@ -273,7 +271,6 @@
         console.log(val)
       },
       dataAndGlobal(index, val, type) {
-        console.log(index, val)
         let param = []
         if (type === 1) {
           param.push({
@@ -292,9 +289,9 @@
           })
         }
         dictUpdate(param, res => {
+          this.setRowEdit(true)
         })
       }
-
     },
 
   }