浏览代码

设备清单

guoxiaohuan 4 年之前
父节点
当前提交
0cda20ce5c

+ 81 - 172
src/main.js

@@ -1,180 +1,89 @@
-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)
+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;
             }
-            step((generator = generator.apply(thisArg, _arguments || [])).next())
-        })
+            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 };
     }
-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)
+};
+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');

+ 4 - 3
src/views/equipment/eqDialog.vue

@@ -7,9 +7,10 @@
                 <div v-if='dialogInfo.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
                     <rotation :rotationImg='rotationImg'></rotation>
                 </div>
+                <!-- 土建系统主要材料清单 -->
                 <tj-table v-else-if='dialogInfo.id.slice(0,4)=="TJQD"' :param='param' major='土建'></tj-table>
+                <!-- 主要设备清单 标准设备表格 -->
                 <standTable v-else-if='dialogInfo.id.slice(2,4)=="QD"' :param='param' :major='dialogInfo.id'></standTable>
-                <!-- <GDQDTable v-else-if='Object.keys(dialogInfo).length>0 && dialogInfo.id.slice(0,4)=="GDQD"' major></GDQDTable> -->
                 <look-page v-else-if='dialogInfo.id.slice(2,4)=="TZ"' param major></look-page>
             </div>
             <div v-else>
@@ -23,6 +24,7 @@
                         <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
                             <rotation :rotationImg='rotationImg'></rotation>
                         </div>
+                        <!-- 主要设备清单 标准设备表格加tab -->
                         <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
                         <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
                         <wb-table v-else-if='value.id.slice(2,4)=="WX"' param major='维修'></wb-table>
@@ -40,7 +42,6 @@ import tjTable from './table/tjTable'
 import wbTable from './table/wbTable'
 import zwTable from './table/zwTable'
 import lookPage from './table/lookPageTable'
-import GDQDTable from './table/GDQDTable'
 import standTable from './table/standTable'
 export default {
     props: ['systemName'],
@@ -54,7 +55,7 @@ export default {
         }
     },
     mounted() {},
-    components: { tableList, tjTable, wbTable, zwTable, lookPage, GDQDTable, standTable },
+    components: { tableList, tjTable, wbTable, zwTable, lookPage, standTable },
     methods: {
         showModal(item) {
             this.visible = true

+ 0 - 91
src/views/equipment/table/GDQDDrillingDialog.vue

@@ -1,91 +0,0 @@
-<template>
-    <div class='gdqd-dialog'>
-        <div class='top'></div>
-        <div class='gdqd-dialog-top'>
-            <Select width='224' tipPlace='top' caption='管理归属' size='small' style='margin-right:12px' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
-            <Select width='224' tipPlace='top' caption='设备状态' size='small' style='margin-right:12px' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
-            <Select width='224' tipPlace='top' caption='楼层:' size='small' style='margin-right:12px' :selectdata='floorSelect' :placeholder='"请选择"'></Select>
-            <el-input placeholder='请按照设备简称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照设备编号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按品牌搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照型号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照安装位置搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照生产厂商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照服务商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-        </div>
-        <el-table :data='tableData' style='width: 100%'>
-            <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='lb' label='设备简称'></el-table-column>
-            <el-table-column prop='sl' label='设备编号'></el-table-column>
-            <el-table-column prop='unit' label='数量'></el-table-column>
-            <el-table-column prop='lb' label='管理归属'></el-table-column>
-            <el-table-column prop='sl' label='设备状态'></el-table-column>
-            <el-table-column prop='unit' label='品牌'></el-table-column>
-            <el-table-column prop='sl' label='型号'></el-table-column>
-            <el-table-column prop='unit' label='楼层'></el-table-column>
-            <el-table-column prop='lb' label='安装位置'></el-table-column>
-            <el-table-column prop='sl' label='生产厂商'></el-table-column>
-            <el-table-column prop='unit' label='服务商'></el-table-column>
-        </el-table>
-    </div>
-</template>
-<script>
-import Select from '@/components/Select/Select.vue'
-import { mapGetters } from 'vuex'
-export default {
-    data() {
-        return {
-            tableData: [],
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
-            input: '',
-            floorSelect: [] //楼层下拉框
-        }
-    },
-    components: {
-        Select
-    },
-    computed: {
-        ...mapGetters(['floorsArr'])
-    },
-    mounted() {
-        this.init()
-    },
-    methods: {
-        open() {
-            this.visible = true
-        },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
-        }
-    }
-}
-</script>
-<style lang="less" scoped>
-.gdqd-dialog {
-    .top {
-    }
-    .gdqd-dialog-top {
-        display: flex;
-    }
-}
-</style>
-<style lang="less">
-.gdqd-dialog {
-    border: 1px solid green;
-    padding: 16px 24px 24px;
-}
-</style>

+ 0 - 135
src/views/equipment/table/GDQDTable.vue

@@ -1,135 +0,0 @@
-<!-- 设备清单的有select的表格 -->
-<template>
-    <!-- 变配电室内部设备清单 标准设备表格 -->
-    <div class='compute-list'>
-        <div class='eq-list-top'>
-            <Select width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect' style='margin-right:12px' @change='getList'></Select>
-            <el-input placeholder='请按照设备简称搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照品牌搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照型号搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <el-input placeholder='请按照生产厂商搜索' size='small' prefix-icon='el-icon-search' v-model='input'></el-input>
-            <a-input-search placeholder='请按照电井或商铺编号搜索' style='width: 192px;margin-bottom:12px;height:32px;' @search='onSearch' />
-        </div>
-        <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
-            <el-table-column type='index' label='序号' width='50'></el-table-column>
-            <el-table-column prop='lb' label='设备简称'></el-table-column>
-            <el-table-column prop='sl' label='数量'></el-table-column>
-            <el-table-column prop='unit' label='品牌'></el-table-column>
-            <el-table-column prop='lb' label='型号'></el-table-column>
-            <el-table-column prop='sl' label='楼层' :sortable='true'></el-table-column>
-            <el-table-column prop='unit' label='生产厂商'></el-table-column>
-        </el-table>
-        <div class='foot'>
-            <el-pagination
-                background
-                layout='prev, pager, next'
-                :total='total/pageSize'
-                :page-size='size'
-                @prev-click='pageChanged'
-                @next-click='pageChanged'
-                @current-change='pageChanged'
-            ></el-pagination>
-        </div>
-        <el-dialog width='80%' style='height:80%' title='设备清单' :visible.sync='innerVisible' append-to-body>
-            <GDQD-dialog ref='qdDialog'></GDQD-dialog>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import { queryEquipmentList } from '@/api/equipmentList.js'
-import Select from '@/components/Select/Select.vue'
-import GDQDDialog from './GDQDDrillingDialog'
-import { mapGetters } from 'vuex'
-export default {
-    data() {
-        return {
-            pageSize: 10,
-            tableData: [],
-            total: 0,
-            currentPage: 1,
-            size: 10,
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
-            innerVisible: false, //详情弹框
-            input: '',
-            floorSelect: []
-        }
-    },
-    props: ['major'],
-    computed: {
-        ...mapGetters(['floorsArr'])
-    },
-    methods: {
-        onSearch() {},
-        pageChanged(page, size) {
-            this.currentPage = page
-            this.size = size
-            this.getList()
-        },
-        getList() {
-            let postParams = {}
-            let data = {
-                page: this.currentPage,
-                size: this.size,
-                plazaId: this.$store.state.plazaId,
-                major: this.major
-            }
-            // console.log({ data, postParams })
-            // return
-            queryEquipmentList({ data, postParams }).then(res => {
-                console.log(res)
-                this.tableData = res.data.data
-                this.total = res.data.count
-            })
-        },
-        init() {
-            this.floorSelect = []
-            if (this.floorsArr.length > 0) {
-                this.floorsArr.forEach(e => {
-                    let obj = {
-                        id: e,
-                        name: e
-                    }
-                    this.floorSelect.push(obj)
-                })
-            }
-        }
-    },
-    components: {
-        GDQDDialog,
-        Select
-    },
-    mounted() {
-        this.init()
-        this.getList()
-    }
-}
-</script>
-<style lang="less" scoped>
-.compute-list {
-    .top {
-        width: 1366px;
-        height: 1px;
-        background: rgba(0, 0, 0, 0.06);
-        margin-bottom: 20px;
-    }
-    .eq-list-top {
-        display: flex;
-    }
-    .foot {
-        position: absolute;
-        height: 32px;
-        right: 26px;
-        bottom: 20px;
-    }
-    td {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-}
-</style>

+ 90 - 0
src/views/equipment/table/eqDetaileDialog.vue

@@ -0,0 +1,90 @@
+<template>
+    <div class='gdqd-dialog'>
+        <div class='top'></div>
+        <div class='gdqd-dialog-top'>
+            <el-input
+                placeholder='请输入设备简称、设备编号、品牌、型号、安装位置、生产厂商、服务商搜索'
+                style='width:490px;margin-right:12px'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='input'
+            ></el-input>
+            <Select width='120' style='margin-right:12px' tipPlace='top' caption='楼层:' size='small' :selectdata='floorSelect'></Select>
+            <Select width='224' style='margin-right:12px' tipPlace='top' caption='管理归属' size='small' :selectdata='dataSelect2'></Select>
+            <Select width='224' tipPlace='top' caption='设备状态' size='small' :selectdata='dataSelect2'></Select>
+        </div>
+        <el-table :data='tableData' style='width: 100%'>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
+            <el-table-column prop='sbjc' label='设备简称'></el-table-column>
+            <el-table-column prop='sbbh' label='设备编号'></el-table-column>
+            <el-table-column prop='sl' label='数量'></el-table-column>
+            <el-table-column prop='glgs' label='管理归属'></el-table-column>
+            <el-table-column prop='sbbh' label='设备状态'></el-table-column>
+            <el-table-column prop='brand' label='品牌'></el-table-column>
+            <el-table-column prop='sbxh' label='型号'></el-table-column>
+            <el-table-column prop='floor' label='楼层'></el-table-column>
+            <el-table-column prop='azwz' label='安装位置'></el-table-column>
+            <el-table-column prop='manufacturer' label='生产厂商'></el-table-column>
+            <el-table-column prop='fws' label='服务商'></el-table-column>
+        </el-table>
+    </div>
+</template>
+<script>
+import Select from '@/components/Select/Select.vue'
+import { mapGetters } from 'vuex'
+export default {
+    data() {
+        return {
+            tableData: [],
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
+            ],
+            input: '',
+            floorSelect: [] //楼层下拉框
+        }
+    },
+    components: {
+        Select
+    },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
+    mounted() {
+        this.init()
+    },
+    methods: {
+        open() {
+            this.visible = true
+        },
+        init() {
+            this.floorSelect = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        id: e,
+                        name: e
+                    }
+                    this.floorSelect.push(obj)
+                })
+            }
+        }
+    }
+}
+</script>
+<style lang="less" scoped>
+.gdqd-dialog {
+    .top {
+    }
+    .gdqd-dialog-top {
+        display: flex;
+    }
+}
+</style>
+<style lang="less">
+.gdqd-dialog {
+    padding: 16px 24px 24px;
+}
+</style>

+ 18 - 8
src/views/equipment/table/eqListTable.vue

@@ -1,13 +1,18 @@
-<!-- 设备清单的有select的表格 -->
+<!-- 设备清单的有tab的表格 -->
 <template>
     <div class='eq-list'>
         <div class='eq-list-top'>
-            <Select width='146' tipPlace='top' caption='品牌:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <Select width='120' tipPlace='top' caption='楼层:' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
-            <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"' @change='getList'></Select>
-            <a-input-search placeholder style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
+            <el-input
+                placeholder='请输入设备简称、品牌、型号、生产厂商搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='input'
+                style='width:310px;margin-right:12px'
+            ></el-input>
+            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
             <el-table-column prop='sbxh' label='序号' width='120'></el-table-column>
             <el-table-column prop='sbjbm' label='设备编号' width='160'></el-table-column>
             <el-table-column prop='sl' label='数量'></el-table-column>
@@ -28,15 +33,19 @@
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
+        <el-dialog width='1200px' style='height:80%' title='设备清单' :visible.sync='innerVisible' append-to-body>
+            <eq-detail ref='qdDialog'></eq-detail>
+        </el-dialog>
     </div>
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
+import EqDetail from './eqDetaileDialog'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 
 export default {
-    components: { Select },
+    components: { Select, EqDetail },
     data() {
         return {
             dataSelect2: [
@@ -49,7 +58,8 @@ export default {
             total: 0,
             currentPage: 1,
             size: 10,
-            floorSelect: []
+            floorSelect: [],
+            innerVisible: false //详情弹框
         }
     },
     computed: {

+ 24 - 4
src/views/equipment/table/standTable.vue

@@ -2,10 +2,17 @@
 <template>
     <div class='stand-list'>
         <div class='eq-list-top'>
-            <Select width='120' tipPlace='top' caption='楼层:' v-model='floor' :selectdata='floorSelect' style='margin:0 12px' @change='getList'></Select>
-            <a-input-search placeholder='请按照类别或品牌搜索' v-model='keyword' style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
+            <el-input
+                placeholder='请输入设备简称、品牌、型号、生产厂商搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='input'
+                style='width:310px;margin-right:12px'
+            ></el-input>
+            <Select @change='getList' width='120' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
         </div>
-        <el-table :data='tableData' style='width: 100%'>
+        <el-table :data='tableData' style='width: 100%' @row-click='innerVisible = true'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>
             <el-table-column prop='sbjc' label='设备简称' width='160'></el-table-column>
             <el-table-column prop='sl' label='数量'></el-table-column>
@@ -25,13 +32,22 @@
                 @current-change='pageChanged'
             ></el-pagination>
         </div>
+        <el-dialog width='1200px' style='height:80%' title='设备清单' :visible.sync='innerVisible' append-to-body>
+            <eq-detail ref='qdDialog'></eq-detail>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { queryEquipmentList } from '@/api/equipmentList.js'
+import EqDetail from './eqDetaileDialog'
+import Select from '@/components/Select/Select.vue'
+import { mapGetters } from 'vuex'
+
 export default {
     data() {
         return {
+            innerVisible: false,
+            input: '',
             pageSize: 10,
             tableData: [],
             total: 0,
@@ -43,6 +59,10 @@ export default {
         }
     },
     props: ['major', 'param'],
+    components: { EqDetail, Select },
+    computed: {
+        ...mapGetters(['floorsArr'])
+    },
     methods: {
         pageChanged(page, size) {
             this.currentPage = page
@@ -98,7 +118,7 @@ export default {
         }
     },
     mounted() {
-        // this.init()
+        this.init()
         this.getList()
     }
 }

+ 8 - 2
src/views/equipment/table/tjTable.vue

@@ -1,8 +1,14 @@
-<!-- 设备清单的有select的表格 标准设备表格 -->
 <template>
     <div class='tj-list'>
         <div class='eq-list-top'>
-            <a-input-search placeholder='请按照类别或品牌搜索' v-model='keyword' style='width: 192px;margin-left:12px;height:32px;' @search='getList' />
+            <el-input
+                placeholder='请输入类别或品牌搜索'
+                size='small'
+                @change='getList'
+                prefix-icon='el-icon-search'
+                v-model='input'
+                style='width:200px;margin-right:12px'
+            ></el-input>
         </div>
         <el-table :data='tableData' style='width: 100%'>
             <el-table-column type='index' label='序号' width='80'></el-table-column>