Forráskód Böngészése

Merge branch 'dev'

zhangyu 4 éve
szülő
commit
5b9b0b9af5

+ 6 - 4
src/components/business_space/newGraphy/graphy.vue

@@ -242,8 +242,9 @@ export default {
       let pa = {
       let pa = {
         zone: 'Ispace',
         zone: 'Ispace',
         data: {
         data: {
-          Filters: `FloorId='${this.buildFloor[1]}'`,
-          PageSize: 1000
+          // Filters: `FloorId='${this.buildFloor[1]}'`,
+          PageSize: 1000,
+          FloorId: this.buildFloor[1]
         }
         }
       }
       }
       queryZone(pa, res => {
       queryZone(pa, res => {
@@ -337,8 +338,9 @@ export default {
     getISPSPUnrelaBSP() {
     getISPSPUnrelaBSP() {
       let pa = {
       let pa = {
         data: {
         data: {
-          Filters: `FloorId='${this.buildFloor[1]}'`,
-          PageSize: 1000
+          // Filters: `FloorId='${this.buildFloor[1]}'`,
+          PageSize: 1000,
+          FloorId: this.buildFloor[1]
         },
         },
         objectType: this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
         objectType: this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code
       }
       }

+ 2 - 2
src/components/config_point/step3_edit/index.vue

@@ -60,7 +60,7 @@
         </template>
         </template>
       </el-form>
       </el-form>
       <div class='btn-box'>
       <div class='btn-box'>
-        <el-button type='primary' @click='save'>保存</el-button>
+        <el-button type='primary' @click='save' :disabled="!cacheTime" :loading="!cacheTime">保存</el-button>
       </div>
       </div>
     </div>
     </div>
   </div>
   </div>
@@ -81,7 +81,7 @@ import dictionaryCas from '@/components/config_point/dictionaryCascader'
 export default {
 export default {
   name: 'point_config_step3_edit',
   name: 'point_config_step3_edit',
   computed: {
   computed: {
-    ...mapGetters('project', ['projectId', 'datasourceId', 'protocolType'])
+    ...mapGetters('project', ['projectId', 'datasourceId', 'protocolType', 'cacheTime'])
   },
   },
   data() {
   data() {
     return {
     return {