소스 검색

1. 配置文件新增showLookPic_projectData 可以查新图纸,项目资料的广场
2. 隐藏项目首页弹窗逻辑

yunxing 4 년 전
부모
커밋
47f047da2a
6개의 변경된 파일47개의 추가작업 그리고 7개의 파일을 삭제
  1. 2 0
      public/systemConf.js
  2. 4 0
      src/assets/css/rotation.css
  3. 5 0
      src/assets/css/rotation.less
  4. 15 4
      src/views/equipment/index.vue
  5. 19 3
      src/views/overview/index.vue
  6. 2 0
      src/views/statistics/index.vue

+ 2 - 0
public/systemConf.js

@@ -35,6 +35,8 @@ var __systemConf = {
         //开发
         serve_editerUrl: 'http://localhost:8091/wandaEditer/', // 编辑器地址
         serve_wandaBmGuideUrl: 'http://localhost:8090/wandaBmGuide/', //管理书地址
+        // 显示项目资料的广场ID,滁州南谯万达广场
+        showLookPic_projectData:['1002026',]
     },
 }
 window.__systemConf = __systemConf

+ 4 - 0
src/assets/css/rotation.css

@@ -45,6 +45,10 @@
   border-radius: 4px;
   /* cursor: not-allowed; */
 }
+.overview .view-title .view-button-disabled{
+    opacity: 0.5;
+    cursor: not-allowed;
+}
 .overview .view-title .view-button img {
   display: inline-block;
   height: 16px;

+ 5 - 0
src/assets/css/rotation.less

@@ -50,6 +50,11 @@
                 margin-right: 6px;
             }
         }
+        .view-button-disabled{
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+
     }
     .view-box {
         height: calc(100% - 32px);

+ 15 - 4
src/views/equipment/index.vue

@@ -14,15 +14,15 @@
                 <ul v-for='(eve,index) in everySystem' :key='"o"+index'>
                     <li class='li-style' :class='{"is-active": eve.id}' @click='dialogVisible(eve)'>
                         <span class='circle'></span>
-                        <!-- <el-button
+                        <el-button
                             type='text'
                             disabled
                             class='hanzi2'
                             title='数字化移交系统上线后可用'
-                            v-if='eve.label=="查看图纸"'
+                            v-if='eve.label=="查看图纸" && !showLookPic'
                             style='text-align:left'
-                        >{{eve.label}}</el-button>-->
-                        <span class='hanzi'>{{eve.label}}</span>
+                        >{{eve.label}}</el-button>
+                        <span class='hanzi' v-else>{{eve.label}}</span>
                     </li>
                 </ul>
             </div>
@@ -101,6 +101,8 @@ export default {
             keyFL: 'keyFL' + new Date().getTime(),
             keyLd: 'keyLd_' + new Date().getTime(),
             ShowDialog: false, //是否显示弹窗
+            showLookPic:false,
+
         }
     },
     components: { floorList, eqDialog, floorMap },
@@ -271,6 +273,15 @@ export default {
             }
         },
     },
+    created(){
+         /**
+         * 是否显示,可以点击的查看图纸
+         * 根据配置文件中,配置的广场ID显示查看图纸
+         */
+        if(window.__systemConf.conf.showLookPic_projectData.includes(this.plazaId)){
+            this.showLookPic = true
+        }   
+    },
     mounted() {
         // if (Object.keys(this.floorObj).length > 0) {
         //     this.floorInfo = this.floorObj

+ 19 - 3
src/views/overview/index.vue

@@ -11,8 +11,14 @@
                 <span>项目基本信息</span>
             </nav>
             <!-- <el-button type='info' plain disabled> -->
-            <div title='数字化移交系统上线后可用'>
-                <div class='view-button' :disabled='true' @click='findxmzl'>
+            <div v-if='!projectDataFlag' title='数字化移交系统上线后可用'>
+                <div class='view-button view-button-disabled' :disabled='true'>
+                    <img src='../../assets/imgs/wd.png' alt />
+                    项目资料
+                </div>
+            </div>
+            <div v-else>
+                <div class='view-button' @click='findxmzl'>
                     <img src='../../assets/imgs/wd.png' alt />
                     项目资料
                 </div>
@@ -150,6 +156,7 @@ export default {
             va: '',
             spanArr: [], //二维数组,用于存放单元格合并规则
             position: 0, //用于存储相同项的开始index
+            projectDataFlag: false, //项目资料按钮是否可以点击
         }
     },
     methods: {
@@ -257,7 +264,7 @@ export default {
                 this.$refs.picModal.showModal(this.pic2, type)
             }
         },
-        findxmzl() {
+        findxmzl() { 
             if (this.shuzihuayijiao) {
                 window.open(`${this.shuzihuayijiao}`, true)
             }
@@ -331,6 +338,15 @@ export default {
     },
     created() {
         this.init()
+        /**
+         * 是否可以点击项目资料
+         * 根据配置文件中,配置的广场id 可以点击
+         */
+        if(window.__systemConf.conf.showLookPic_projectData.includes(this.plazaId)){
+            this.projectDataFlag = true 
+        }else{
+            this.projectDataFlag = false
+        }
     },
     computed: {
         ...mapGetters(['isPreview', 'pic', 'plazaId']),

+ 2 - 0
src/views/statistics/index.vue

@@ -958,6 +958,8 @@ export default {
          *@description 打开弹窗
          */
         openMaskPanel(system) {
+            // TODO: 关闭弹窗逻辑,2020年11月26日修改,本次发版不上线弹窗功能
+            return true
             this.tabData = []
             system.assetTypeList.forEach(item => {
                 if (item.is_exception_num > 0) {