guoxiaohuan 4 years ago
parent
commit
e9dc12bbe6

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

@@ -66,6 +66,7 @@
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
+  border: 1px solid #ccc;
 }
 .overview .view-box .view-left .lb-left img {
   width: 100%;
@@ -193,6 +194,7 @@
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
+  border: 1px solid #ccc;
 }
 .overview .view-box .view-right .view-right-box .lb-right .lb-icon {
   z-index: 99;

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

@@ -63,6 +63,7 @@
                 margin-top: 12px;
                 margin-bottom: 10px;
                 position: relative;
+                border: 1px solid #ccc;
                 img {
                     width: 100%;
                     // height: 100%;
@@ -190,6 +191,7 @@
                     margin-top: 12px;
                     margin-bottom: 10px;
                     position: relative;
+                    border: 1px solid #ccc;
                     .lb-icon {
                         z-index: 99;
                         position: absolute;

+ 2 - 2
src/components/PicLarge/src/picLarge.vue

@@ -12,7 +12,7 @@
                         <li @click='getIndex(item.url)'>
                             <img :src='item.url' />
                         </li>
-                        <!-- <span>{{item.name}}</span> -->
+                        <span>{{item.name}}</span>
                     </ul>
                 </div>
                 <div class='pic-right'>
@@ -119,7 +119,7 @@ export default {
 <style lang="less">
 .tpyl {
     .el-dialog {
-        height: 80%;
+        height: 80% !important;
         margin-top: 5vh !important;
     }
     .el-dialog__body {

+ 2 - 3
src/components/Rotation/src/rotation.vue

@@ -10,6 +10,7 @@
                 src='https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1592807833&di=5adf17cda9f46c37696da5b1d0aec9dc&src=http://a3.att.hudong.com/14/75/01300000164186121366756803686.jpg'
                 alt
             />-->
+            <img :src='rotationImg[0].url' alt />
         </div>
         <el-carousel v-else trigger='click' style='height:100%' :interval='5000' arrow='always'>
             <el-carousel-item v-for='(item,index) in rotationImg' :key='index'>
@@ -27,9 +28,7 @@ export default {
             rotationImgs: [{ url: require('@/assets/images/login_back.png') }]
         }
     },
-    mounted() {
-        console.log(this.rotationImg)
-    }
+    mounted() {}
 }
 </script>
 <style lang="less" scoped>

+ 0 - 5
src/store/index.js

@@ -54,10 +54,6 @@ export default new Vuex.Store({
             state.fmapID = data
         },
     },
-    //   const params = {
-    //     username: 'aiyu6'
-    // }
-
     actions: {
         // 获取项目列表、userId
         async getUserInfo({ commit }, palyload) {
@@ -74,7 +70,6 @@ export default new Vuex.Store({
             })
         },
         getFloors(context) {
-            console.log(context)
             queryFloor({ plazaId: context.state.plazaId }).then((res) => {
                 if (res.result == 'success') {
                     context.commit('SETFLOORS', res.data)

+ 2 - 2
src/views/equipment/table/standTable.vue

@@ -33,8 +33,8 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%' @row-click='rowHandle'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
-            <el-table-column prop='classqc' label='设备名称' show-overflow-tooltip resizable>
-                <template slot-scope='{row}'>{{row.classqc || '--'}}</template>
+            <el-table-column prop label='设备名称' show-overflow-tooltip resizable>
+                <template slot-scope='{row}'>{{row.type_name || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
             <el-table-column prop='sl' label='数量' width='100'>

+ 1 - 1
src/views/equipment/table/wbTable.vue

@@ -222,7 +222,7 @@ export default {
                 row.forEach(el => {
                     let obj = {
                         name: el.description,
-                        url: el.urlname
+                        url: el.url
                     }
                     this.imgUrl.push(obj)
                 })

+ 1 - 1
src/views/equipment/table/wxTable.vue

@@ -229,7 +229,7 @@ export default {
                 row.forEach(el => {
                     let obj = {
                         name: el.description,
-                        url: el.urlname
+                        url: el.url
                     }
                     this.imgUrl.push(obj)
                 })

+ 2 - 2
src/views/other/gcfz1.vue

@@ -13,8 +13,8 @@
         <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
-        <el-table-column prop='roomsl' label='总间数'>
-            <template slot-scope='{row}'>{{row.roomsl||'--'}}</template>
+        <el-table-column prop='beforekf' label='总间数'>
+            <template slot-scope='{row}'>{{row.beforekf||'--'}}</template>
         </el-table-column>
         <el-table-column prop='area' label='面积(㎡)'>
             <template slot-scope='{row}'>{{row.area||'--'}}</template>

+ 1 - 3
src/views/other/zhsxDialog.vue

@@ -32,7 +32,7 @@ export default {
             this.visible = true
         },
         objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-            if (columnIndex === 2) {
+            if (columnIndex === 2 || columnIndex === 3) {
                 if (rowIndex > 0 && row[column.property] === this.tableData[rowIndex - 1][column.property]) {
                     return {
                         rowspan: 0,
@@ -50,8 +50,6 @@ export default {
                         colspan: 1
                     }
                 }
-            } else if (columnIndex == 3) {
-                console.log(row, column)
             }
         }
     }

+ 20 - 9
src/views/room/index.vue

@@ -290,15 +290,6 @@
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
-                            <el-input
-                                @change='Index4'
-                                clearable
-                                placeholder='异常工单编号'
-                                size='small'
-                                prefix-icon='el-icon-search'
-                                v-model='ycgdbhInput5'
-                                style='margin-right:12px;width:220px;'
-                            ></el-input>
                         </div>
                         <div class='dialog-none'>
                             <div class='input-dialog'>
@@ -336,6 +327,26 @@
                                             end-placeholder
                                         ></el-date-picker>
                                     </p>
+                                    <!-- <el-input
+                                @change='Index4'
+                                clearable
+                                placeholder='异常工单编号'
+                                size='small'
+                                prefix-icon='el-icon-search'
+                                v-model='ycgdbhInput5'
+                                style='margin-right:12px;width:220px;'
+                                    ></el-input>-->
+                                    <p class='input-dialog-p'>异常工单编号</p>
+                                    <p class='input-dialog-p2'>
+                                        <el-input
+                                            clearable
+                                            placeholder='异常工单编号'
+                                            size='small'
+                                            prefix-icon='el-icon-search'
+                                            v-model='ycgdbhInput5'
+                                            style='width:200px;'
+                                        ></el-input>
+                                    </p>
                                     <p class='input-dialog-p'>异常工单填报日期</p>
                                     <p class='input-dialog-p2'>
                                         <el-date-picker

+ 2 - 2
src/views/room/room5.vue

@@ -110,8 +110,8 @@ export default {
             if (row) {
                 row.forEach(el => {
                     let obj = {
-                        name: el.DESCRIPTION,
-                        url: el.URLNAME
+                        name: el.description,
+                        url: el.url
                     }
                     this.imgUrl.push(obj)
                 })