瀏覽代碼

概况轮播数据

guoxiaohuan 4 年之前
父節點
當前提交
22f6269ce0

File diff suppressed because it is too large
+ 0 - 12671
package-lock.json


+ 7 - 4
src/api/other.js

@@ -1,9 +1,12 @@
 import httputils from '@/api/httputils'
-// 综合事项管理
+// 综合事项记录
 export function queryGlams({ getParams }) {
     return httputils.getJson(`/api/data/v_glsms_zhsxjl/query`, getParams)
 }
-
+// 第三方检测事项
+export function queryDsfrw({ data, getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_dsfrw/query`, data, getParams)
+}
 //综合事项管理-综合记录事项弹框
 export function xx({ getParams }) {
     return httputils.getJson(`/api/xx`, getParams)
@@ -15,6 +18,6 @@ export function querygcfzyfhz({ getParams }) {
 }
 
 // 辅助用房管理-广场辅助用房调改变更记录
-export function queryfzyfchange({ getParams }) {
-    return httputils.getJson(`/api/data/v_glsms_fzyfchange/query`, getParams)
+export function queryfzyfchange({ data, getParams }) {
+    return httputils.getJson(`/api/data/v_glsms_fzyfchange/query`, data, getParams)
 }

+ 7 - 5
src/assets/css/rotation.css

@@ -55,7 +55,7 @@
   justify-content: space-between;
 }
 .overview .view-box .view-left {
-  width: 58.7%;
+  width: 58.5%;
   margin-right: 10px;
   display: flex;
   flex-direction: column;
@@ -88,7 +88,7 @@
 .overview .view-box .view-left .lb-bottom {
   height: 34%;
   background: #ffffff;
-  padding: 16px;
+  padding: 12px 16px;
 }
 .overview .view-box .view-left .lb-bottom nav {
   width: 161px;
@@ -135,6 +135,8 @@
   margin-top: 0px;
 }
 .overview .view-box .view-left .lb-bottom .place-p2 img {
+  width: 16px;
+  height: 16px;
   margin-right: 3px;
 }
 .overview .view-box .view-left .lb-bottom .place-bottom {
@@ -179,7 +181,7 @@
   flex-direction: column;
 }
 .overview .view-box .view-right .view-right-box .lb-right {
-  height: 46%;
+  height: 38%;
   margin-top: 12px;
   margin-bottom: 10px;
   position: relative;
@@ -205,7 +207,7 @@
 .overview .view-box .view-right .view-right-box .lb-right-bottom {
   flex: 1;
   background: #ffffff;
-  padding: 20px 16px;
+  padding: 12px 16px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav {
   width: 161px;
@@ -213,7 +215,7 @@
   display: flex;
   align-items: center;
   background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-  margin-bottom: 16px;
+  margin-bottom: 12px;
 }
 .overview .view-box .view-right .view-right-box .lb-right-bottom nav span:nth-of-type(1) {
   width: 2px;

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

@@ -53,7 +53,7 @@
         display: flex;
         justify-content: space-between;
         .view-left {
-            width: 58.7%;
+            width: 58.5%;
             margin-right: 10px;
             display: flex;
             flex-direction: column;
@@ -85,7 +85,7 @@
             .lb-bottom {
                 height: 34%;
                 background: #ffffff;
-                padding: 16px;
+                padding: 12px 16px;
                 nav {
                     width: 161px;
                     height: 32px;
@@ -130,6 +130,8 @@
                     margin-bottom: 12px;
                     margin-top: 0px;
                     img {
+                        width: 16px;
+                        height: 16px;
                         margin-right: 3px;
                     }
                 }
@@ -175,7 +177,7 @@
                 display: flex;
                 flex-direction: column;
                 .lb-right {
-                    height: 46%;
+                    height: 38%;
                     margin-top: 12px;
                     margin-bottom: 10px;
                     position: relative;
@@ -201,14 +203,14 @@
                 .lb-right-bottom {
                     flex: 1;
                     background: #ffffff;
-                    padding: 20px 16px;
+                    padding: 12px 16px;
                     nav {
                         width: 161px;
                         height: 32px;
                         display: flex;
                         align-items: center;
                         background: linear-gradient(270deg, rgba(54, 156, 247, 0) 0%, rgba(2, 91, 170, 0.2) 100%);
-                        margin-bottom: 16px;
+                        margin-bottom: 12px;
                         span:nth-of-type(1) {
                             width: 2px;
                             height: 16px;

二進制
src/assets/imgs/didian.png


+ 1 - 1
src/components/Rotation/src/rotation.vue

@@ -10,7 +10,7 @@
         </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'>
-                <img :src='item' alt />
+                <img :src='item.url' alt />
             </el-carousel-item>
         </el-carousel>
     </div>

+ 172 - 81
src/main.js

@@ -1,89 +1,180 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
+var __awaiter =
+    (this && this.__awaiter) ||
+    function(thisArg, _arguments, P, generator) {
+        function adopt(value) {
+            return value instanceof P
+                ? value
+                : new P(function(resolve) {
+                      resolve(value)
+                  })
+        }
+        return new (P || (P = Promise))(function(resolve, reject) {
+            function fulfilled(value) {
+                try {
+                    step(generator.next(value))
+                } catch (e) {
+                    reject(e)
+                }
+            }
+            function rejected(value) {
+                try {
+                    step(generator['throw'](value))
+                } catch (e) {
+                    reject(e)
+                }
+            }
+            function step(result) {
+                result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected)
             }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+            step((generator = generator.apply(thisArg, _arguments || [])).next())
+        })
     }
-};
-import Vue from 'vue';
-import App from './App.vue';
-import router from './router';
-import store from './store';
-Vue.config.productionTip = false;
-import design from 'ant-design-vue';
-import 'ant-design-vue/dist/antd.css';
-Vue.use(design);
-import ElementUI from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css';
-Vue.use(ElementUI);
-import VueQuillEditor from 'vue-quill-editor';
-import 'quill/dist/quill.core.css';
-import 'quill/dist/quill.snow.css';
-import 'quill/dist/quill.bubble.css';
-Vue.use(VueQuillEditor);
-import WdEditor from '@/components/Editor';
-Vue.use(WdEditor);
-import Rotation from '@/components/Rotation';
-Vue.use(Rotation);
-import PicLarge from '@/components/PicLarge';
-Vue.use(PicLarge);
-import Legend from '@/components/Legend';
-Vue.use(Legend);
-import cookies from 'vue-cookie';
-Vue.use(cookies);
+var __generator =
+    (this && this.__generator) ||
+    function(thisArg, body) {
+        var _ = {
+                label: 0,
+                sent: function() {
+                    if (t[0] & 1) throw t[1]
+                    return t[1]
+                },
+                trys: [],
+                ops: [],
+            },
+            f,
+            y,
+            t,
+            g
+        return (
+            (g = { next: verb(0), throw: verb(1), return: verb(2) }),
+            typeof Symbol === 'function' &&
+                (g[Symbol.iterator] = function() {
+                    return this
+                }),
+            g
+        )
+        function verb(n) {
+            return function(v) {
+                return step([n, v])
+            }
+        }
+        function step(op) {
+            if (f) throw new TypeError('Generator is already executing.')
+            while (_)
+                try {
+                    if (
+                        ((f = 1),
+                        y &&
+                            (t = op[0] & 2 ? y['return'] : op[0] ? y['throw'] || ((t = y['return']) && t.call(y), 0) : y.next) &&
+                            !(t = t.call(y, op[1])).done)
+                    )
+                        return t
+                    if (((y = 0), t)) op = [op[0] & 2, t.value]
+                    switch (op[0]) {
+                        case 0:
+                        case 1:
+                            t = op
+                            break
+                        case 4:
+                            _.label++
+                            return { value: op[1], done: false }
+                        case 5:
+                            _.label++
+                            y = op[1]
+                            op = [0]
+                            continue
+                        case 7:
+                            op = _.ops.pop()
+                            _.trys.pop()
+                            continue
+                        default:
+                            if (!((t = _.trys), (t = t.length > 0 && t[t.length - 1])) && (op[0] === 6 || op[0] === 2)) {
+                                _ = 0
+                                continue
+                            }
+                            if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
+                                _.label = op[1]
+                                break
+                            }
+                            if (op[0] === 6 && _.label < t[1]) {
+                                _.label = t[1]
+                                t = op
+                                break
+                            }
+                            if (t && _.label < t[2]) {
+                                _.label = t[2]
+                                _.ops.push(op)
+                                break
+                            }
+                            if (t[2]) _.ops.pop()
+                            _.trys.pop()
+                            continue
+                    }
+                    op = body.call(thisArg, _)
+                } catch (e) {
+                    op = [6, e]
+                    y = 0
+                } finally {
+                    f = t = 0
+                }
+            if (op[0] & 5) throw op[1]
+            return { value: op[0] ? op[1] : void 0, done: true }
+        }
+    }
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import store from './store'
+Vue.config.productionTip = false
+import design from 'ant-design-vue'
+import 'ant-design-vue/dist/antd.css'
+Vue.use(design)
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+Vue.use(ElementUI)
+import VueQuillEditor from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+Vue.use(VueQuillEditor)
+import WdEditor from '@/components/Editor'
+Vue.use(WdEditor)
+import Rotation from '@/components/Rotation'
+Vue.use(Rotation)
+import PicLarge from '@/components/PicLarge'
+Vue.use(PicLarge)
+import Legend from '@/components/Legend'
+Vue.use(Legend)
+import cookies from 'vue-cookie'
+Vue.use(cookies)
 //////////模拟传入参数
-var username = 'aiyu6';
+var username = 'aiyu6'
 /////////////////
 // 在跳入路由之前要请求获取权限信息
-router.beforeEach(function (to, from, next) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (!!store.state.isrequestAuth) return [3 /*break*/, 3];
-                return [4 /*yield*/, store.dispatch('getUserInfo', username)];
-            case 1:
-                _a.sent();
-                return [4 /*yield*/, store.dispatch('getFloors')];
-            case 2:
-                _a.sent();
-                _a.label = 3;
-            case 3:
-                next();
-                return [2 /*return*/];
-        }
-    });
-}); });
+router.beforeEach(function(to, from, next) {
+    return __awaiter(void 0, void 0, void 0, function() {
+        return __generator(this, function(_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!!store.state.isrequestAuth) return [3 /*break*/, 3]
+                    return [4 /*yield*/, store.dispatch('getUserInfo', username)]
+                case 1:
+                    _a.sent()
+                    return [4 /*yield*/, store.dispatch('getFloors')]
+                case 2:
+                    _a.sent()
+                    _a.label = 3
+                case 3:
+                    next()
+                    return [2 /*return*/]
+            }
+        })
+    })
+})
 new Vue({
     router: router,
     store: store,
-    render: function (h) { return h(App); },
-}).$mount('#app');
+    render: function(h) {
+        return h(App)
+    },
+}).$mount('#app')

+ 26 - 1
src/views/other/gcfzDialog.vue

@@ -42,6 +42,7 @@
     </div>
 </template>
 <script>
+import { queryfzyfchange, queryDsfrw } from '@/api/other.js'
 export default {
     props: ['systemName'],
     data() {
@@ -109,12 +110,36 @@ export default {
             ]
         }
     },
-    mounted() {},
+    mounted() {
+        this.query()
+        this.dsfrwQuery()
+    },
     methods: {
         showModal(item) {
             this.visible = true
             this.dialogInfo = item
             console.log(this.dialogInfo)
+        },
+        // 辅助用房管理-广场辅助用房调改变更记录
+        query() {
+            let getParams = {
+                data: { plazaId: '1F', plazaId: '1001145' },
+                params: {}
+            }
+
+            queryfzyfchange(getParams).then(res => {
+                console.log('res', res)
+            })
+        },
+        // 第三方检测事项
+        dsfrwQuery() {
+            let getParams = {
+                data: { plazaId: '1001145', page: 1, size: 10 },
+                params: {}
+            }
+            queryDsfrw(getParams).then(res => {
+                console.log('res', res)
+            })
         }
     }
 }

+ 50 - 72
src/views/overview/index.vue

@@ -18,18 +18,21 @@
         <div class='view-box'>
             <div class='view-left'>
                 <div class='lb-left'>
-                    <rotation :rotationImg='rotationImg'></rotation>
-                    <div class='lb-icon' @click='picClick'></div>
-                    <img class='lb-img' @click='picClick' src='../../assets/imgs/zk.png' alt />
+                    <rotation :rotationImg='pic2'></rotation>
+                    <div class='lb-icon' @click='picClick("2")'></div>
+                    <img class='lb-img' @click='picClick("2")' src='../../assets/imgs/zk.png' alt />
                 </div>
                 <div class='lb-bottom'>
                     <nav>
                         <span></span>
                         <span>建筑综合信息</span>
                     </nav>
-                    <p class='place-p1'>三明万达广场</p>
+                    <p class='place-p1'>{{'-'}}</p>
                     <p class='place-p2'>
-                        <span>福建省三明市梅列区东乾二路1号15幢三明万达广场4楼201室福建省三明市梅列区东乾二路1号</span>
+                        <span>
+                            <img src='@/assets/imgs/didian.png' alt />
+                            {{'-'}}
+                        </span>
                     </p>
                     <div class='place-bottom'>
                         <div class='place-box'>
@@ -66,9 +69,9 @@
             <div class='view-right'>
                 <div class='view-right-box'>
                     <div class='lb-right'>
-                        <rotation :rotationImg='rotationImg'></rotation>
-                        <div class='lb-icon' @click='picClick'></div>
-                        <img class='lb-img' @click='picClick' src='../../assets/imgs/zk.png' alt />
+                        <rotation :rotationImg='pic1'></rotation>
+                        <div class='lb-icon' @click='picClick("1")'></div>
+                        <img class='lb-img' @click='picClick("1")' src='../../assets/imgs/zk.png' alt />
                     </div>
                     <div class='lb-right-bottom'>
                         <nav>
@@ -76,12 +79,26 @@
                             <span>施工单位信息</span>
                         </nav>
                         <div class='view-right-bottom'>
-                            <el-table :data='msgData' :height='350'>
+                            <el-table
+                                :data='constructions'
+                                :height='350'
+                                style='font-size:12px'
+                                :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
+                                v-loading='loading'
+                            >
                                 <el-table-column label='序号' width='50' type='index' align='left'></el-table-column>
-                                <el-table-column label='专业' width='70' prop='type'></el-table-column>
-                                <el-table-column prop='company' label='施工单位' width='150'></el-table-column>
-                                <el-table-column label='联系人' prop='people' width='70'></el-table-column>
-                                <el-table-column prop='phone' label='联系电话' width='100'></el-table-column>
+                                <el-table-column label='专业' width='70' prop='professional'>
+                                    <template slot-scope='{row}'>{{row.professional||'--'}}</template>
+                                </el-table-column>
+                                <el-table-column prop='unit ' label='施工单位'>
+                                    <template slot-scope='{row}'>{{row.unit ||'--'}}</template>
+                                </el-table-column>
+                                <el-table-column label='联系人' prop width='65'>
+                                    <template slot-scope='{row}'>{{'-'}}</template>
+                                </el-table-column>
+                                <el-table-column prop='phone' label='联系电话' width='100'>
+                                    <template slot-scope='{row}'>{{'-'}}</template>
+                                </el-table-column>
                             </el-table>
                         </div>
                     </div>
@@ -165,74 +182,47 @@ import { queryFact } from '@/api/overview'
 export default {
     data() {
         return {
-            pic1: [],
-            pic2: [],
-            build: {},
-            constructions: [],
-            msgData: [
-                { type: '总包', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '弱电', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '消防', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '机电', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '给排水', company: '南京金鸿装饰工程有限公司、深圳建装业集团股份有限公司广西建工集团有限公司' },
-                { type: '精装', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '电梯', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '总包', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '弱电', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '消防', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '机电', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                {
-                    type: '给排水',
-                    company: '南京金鸿装饰工程有限公司、深圳建装业集团股份有限公司广西建工集团有限公司',
-                    people: '李海涛',
-                    phone: 12546548854
-                },
-                { type: '精装', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 },
-                { type: '电梯', company: '中国建筑第一工程局有限公司', people: '李海涛', phone: 12546548854 }
-            ],
-            rotationImg: [
-                require('@/assets/imgs/survey_pop1.png'),
-                require('@/assets/imgs/survey_pop2.png'),
-                require('@/assets/imgs/survey_pop1.png')
-            ]
+            loading: true,
+            pic1: [], //区位图
+            pic2: [], //鸟瞰图
+            build: {}, //左下信息
+            constructions: [] //右下数组
         }
     },
     methods: {
-        picClick() {
-            this.$refs.picModal.showModal()
+        picClick(type) {
+            if (type == 1) {
+                this.$refs.picModal.showModal(this.pic1)
+            } else {
+                this.$refs.picModal.showModal(this.pic2)
+            }
         },
         query() {
             let params = {
                 getParams: {
-                    plazaId: 1000772
+                    plazaId: this.$store.state.plazaId
                 }
             }
             queryFact(params).then(res => {
-                console.log('res', res)
                 if (res.result == 'success') {
+                    this.loading = false
                     this.pic1 = res.pic1
                     this.pic2 = res.pic2
                     this.build = res.build
                     this.constructions = res.constructions
-                    // if (this.build.length > 0) {
-                    //     this.build.forEach(e => {
-                    //         console.log(e)
-                    //     })
-                    // }
                 }
             })
         },
         formatter(str, arrv) {
             if (str && arrv) {
-                const Objs = arrv.find(e => e.project == str)
-                return Objs ? Objs.basic : ''
+                const Objs = arrv.find(e => e && e.project == str)
+                return Objs ? Objs.basic : '--'
             } else {
                 return ''
             }
         }
     },
     mounted() {
-        console.log(this.$cookie.get('floorNow'))
         this.query()
     },
     components: {
@@ -244,22 +234,10 @@ export default {
 @import '../../assets/css/rotation.css';
 </style>
 <style lang="less">
-.el-table thead {
-    height: 16px;
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: rgba(100, 108, 115, 1);
-    line-height: 16px;
-    background: rgba(245, 246, 247, 1);
-}
-.el-table td,
-.el-table th {
-    padding: 3px 0;
-}
-.el-table--enable-row-transition .el-table__body td {
-    font-size: 12px;
-    font-family: MicrosoftYaHei;
-    color: rgba(31, 36, 41, 1);
-    line-height: 24px;
+.view-right-bottom {
+    .el-table td,
+    .el-table th {
+        padding: 3px 0;
+    }
 }
 </style>

+ 6 - 9
src/views/overview/picModal.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog :visible.sync='dialogVisible' width='90%' :close-on-click-modal='false' :show-close='false'>
-        <rotation :rotationImg='rotationImg' style='height:600px;'></rotation>
+        <rotation v-if='rotationImg.length>0' :rotationImg='rotationImg' style='height:600px;'></rotation>
         <span class='close' @click='close'>X</span>
     </el-dialog>
 </template>
@@ -11,16 +11,13 @@ export default {
         return {
             dialogVisible: false,
             mode: 'top',
-            rotationImg: [
-                require('@/assets/imgs/survey_pop1.png'),
-                require('@/assets/imgs/survey_pop2.png'),
-                require('@/assets/imgs/survey_pop1.png')
-            ]
+            rotationImg: []
         }
     },
     methods: {
-        showModal() {
+        showModal(params) {
             this.dialogVisible = true
+            this.rotationImg = params
         },
         close() {
             this.dialogVisible = false
@@ -33,10 +30,10 @@ export default {
 .close {
     display: block;
     position: absolute;
-    right: -50px;
+    right: -40px;
     font-size: 20px;
     color: #fff;
-    top: -120px;
+    top: -100px;
     z-index: 10;
     cursor: pointer;
 }