zhulizhen1111 преди 4 години
родител
ревизия
54141ffe0f

+ 6 - 3
src/api/equipmentList.js

@@ -1,6 +1,9 @@
-// 设备设施设备清单接口
 import httputils from "@/api/httputils"
-
+// 设备设施设备-清单接口
 export function queryEquipmentList({ getParams }) {
-    return httputils.getJson(`/api/plaza/floor`, getParams)
+    return httputils.getJson(`/api/data/glsms_asset/query`, getParams)
+}
+//楼层
+export function queryFloorList({ getParams }) {
+    return httputils.getJson(`/api/plaza/fact`, getParams)
 }

BIN
src/assets/imgs/1pxline.jpg


BIN
src/assets/imgs/2pxline.jpg


BIN
src/assets/imgs/3pxline.jpg


BIN
src/assets/imgs/dashedLine.jpg


BIN
src/assets/imgs/dotLine.jpg


BIN
src/assets/imgs/solidLine.jpg


+ 1 - 6
src/views/equipment/eqDialog.vue

@@ -27,14 +27,9 @@ export default {
             rotationImg: [require('@/assets/imgs/eq.jpg'), require('@/assets/imgs/survey_pop2.png'), require('@/assets/imgs/survey_pop1.png')]
         }
     },
-    mounted() {
-        // this.init()
-    },
+    mounted() {},
     components: { tableList },
     methods: {
-        init() {
-            this.$refs.list.getList()
-        },
         showModal(item) {
             this.visible = true
             this.dialogInfo = item

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

@@ -29,7 +29,7 @@
             </div>
             <editList></editList>
         </div>
-        <eq-dialog ref='dialog' :systemName='systemName'></eq-dialog>
+        <eq-dialog ref='dialog' v-if='systemName' :systemName='systemName'></eq-dialog>
     </div>
 </template>
 
@@ -40,6 +40,7 @@ import eqDialog from './eqDialog'
 import bottomLayer from './bottomLayer'
 import editList from '@/components/edit.vue'
 import { system, floors } from '@/utils/plugins/components.js'
+import { queryEquipmentList } from '@/api/equipmentList.js'
 export default {
     data() {
         return {
@@ -68,12 +69,23 @@ export default {
         dialogVisible(eve) {
             this.$refs.dialog.showModal(eve)
             // this.dialogInfo = eve
+        },
+        getList() {
+            let getParams = {
+                page: 1,
+                size: 10,
+                orderBy: 1,
+                keyword: ''
+            }
+            queryEquipmentList({ getParams }).then(res => {
+                console.log(res)
+            })
         }
     },
     mounted() {
         this.everySystem = this.system[0].children
-        this.$refs.floorMap.init()
-        // this.$refs.dialog.init()
+        // this.$refs.floorMap.init()
+        this.getList()
     }
 }
 </script>

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

@@ -4,12 +4,11 @@
         <Select width='146' tipPlace='top' caption='品牌:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
         <Select width='120' tipPlace='top' caption='楼层:' :selectdata='dataSelect2' style='margin:0 12px'></Select>
         <Select width='224' tipPlace='top' caption='生产厂商:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
-        <a-input-search placeholder style='width: 192px;margin-left:12px' @search='onSearch' />
+        <a-input-search placeholder style='width: 192px;margin-left:12px;height:34px' @search='onSearch' />
         <a-table size='small' style='margin-top:12px' :columns='columns' :data-source='data'></a-table>
     </div>
 </template>
 <script>
-import { queryEquipmentList } from '@/api/equipmentList.js'
 import Select from '@/components/Select/Select.vue'
 export default {
     components: { Select },
@@ -60,12 +59,7 @@ export default {
     },
     methods: {
         handleChange() {},
-        onSearch() {},
-        getList() {
-            queryEquipmentList().then(res => {
-                console.log(res)
-            })
-        }
+        onSearch() {}
     },
     mounted() {}
 }

+ 93 - 43
src/views/legendLibrary/addForm.vue

@@ -1,52 +1,47 @@
 <template>
     <div class='add-form'>
         <div class='form1'>
-            <span class='span1'>图例名称</span>
-            <span class='span2'>单位</span>
-            <span class='span3' v-if='value==1 || value==3'>展示预览</span>
+            <span class='span1'>图例编码</span>
+            <span class='span2'>图例名称</span>
+            <span class='span3' v-if='ruleForm.type==1 || ruleForm.type==3'>展示预览</span>
         </div>
         <div class='form2'>
             <div class='input-left'>
-                <div class='input-left-top'>
-                    <el-input v-model='ruleForm.name' style='width:200px;height:32px;margin-right:48px;'></el-input>
-                    <el-input v-model='ruleForm.name' style='width:200px;height:32px;'></el-input>
-                </div>
-                <div class='input-left-bottom'>
-                    <div class='title'>图例类型</div>
-                    <el-select v-model='value' placeholder='请选择' style='width:442px;height:32px;'>
-                        <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
-                    </el-select>
-                </div>
+                <el-input v-model='ruleForm.code' style='width:200px;height:32px;margin-right:48px;'></el-input>
+                <el-input v-model='ruleForm.name' style='width:200px;height:32px;'></el-input>
+                <div class='title'>单位</div>
+                <div class='type'>图例类型</div>
+                <el-input v-model='ruleForm.unit' style='width:200px;height:32px;'></el-input>
+                <el-select v-model='ruleForm.type' placeholder='请选择' style='width:200px;height:32px;margin-left:46px'>
+                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
+                </el-select>
             </div>
-            <div class='input-right' v-if='value==1 || value==3'></div>
+            <div class='input-right' v-if='ruleForm.type==1 || ruleForm.type==3'></div>
         </div>
-        <div v-if='value==1' class='form3'>
+        <div v-if='ruleForm.type==1' class='form3'>
             <div class='form3-top'>
-                <span class='form3-span1'>填充色</span>
-                <span class='form3-span2'>透明度</span>
+                <span class='form3-span1'>填充色以及透明度</span>
                 <span class='form3-span3'>边框颜色</span>
                 <span class='form3-span4'>边框线型</span>
                 <span class='form3-span5'>边框粗细</span>
             </div>
             <div class='form3-bottom'>
-                <el-select v-model='value' placeholder='请选择' size='small' style='width:120px;margin-right:24px;margin-left:12px;'>
-                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
-                </el-select>
-                <el-select v-model='value' placeholder='请选择' size='small' style='width:96px;margin-right:24px'>
-                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
-                </el-select>
-                <el-select v-model='value' placeholder='请选择' size='small' style='width:120px;margin-right:24px'>
-                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
-                </el-select>
-                <el-select v-model='value' placeholder='请选择' size='small' style='width:120px;margin-right:24px'>
-                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
+                <el-color-picker v-model='ruleForm.color' show-alpha style='margin:0 172px 0 10px'></el-color-picker>
+                <el-color-picker v-model='ruleForm.borderColor' show-alpha style='margin:0 90px 0 10px'></el-color-picker>
+
+                <el-select v-model='ruleForm.borderLine' placeholder='请选择' size='small' style='width:120px;margin-right:24px'>
+                    <el-option v-for='item in borderLineOption' :key='item.value' :value='item.value'>
+                        <img :src='item.label' alt />
+                    </el-option>
                 </el-select>
-                <el-select v-model='value' placeholder='请选择' size='small' style='width:120px;'>
-                    <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
+                <el-select v-model='ruleForm.linepx' placeholder='请选择' size='small' style='width:120px;'>
+                    <el-option v-for='item in linepxOption' :key='item.value' :label='item.label' :value='item.value'>
+                        <img :src='item.label' alt />
+                    </el-option>
                 </el-select>
             </div>
         </div>
-        <div v-if='value==3' class='form5'>
+        <div v-if='ruleForm.type==3' class='form5'>
             <div class='form5-top'>上传新图标</div>
             <div>
                 <el-upload class='upload-demo' action='https://jsonplaceholder.typicode.com/posts/' :file-list='fileList'>
@@ -54,7 +49,7 @@
                 </el-upload>
             </div>
         </div>
-        <div v-if='value==1 || value==3' class='form4'>
+        <div v-if='ruleForm.type==1 || ruleForm.type==3' class='form4'>
             <div class='form4-top'>
                 <span class='form4-span1'>对应工程信息化中的位置/设备分类</span>
                 <span class='form4-span2'>工程信息化的专业/系统</span>
@@ -79,7 +74,16 @@
 export default {
     data() {
         return {
-            ruleForm: {},
+            ruleForm: {
+                color: 'rgba(19, 206, 102, 0.8)',
+                borderColor: 'rgba(19, 206, 102, 0.8)',
+                borderLine: '_____________',
+                linepx: '________________',
+                code: '',
+                name: '',
+                type: '2',
+                unit: ''
+            },
             options: [
                 {
                     value: '2',
@@ -94,7 +98,34 @@ export default {
                     label: '图标'
                 }
             ],
-            value: '1',
+            borderLineOption: [
+                {
+                    value: '1',
+                    label: require('@/assets/imgs/solidLine.jpg')
+                },
+                {
+                    value: '2',
+                    label: require('@/assets/imgs/dashedLine.jpg')
+                },
+                {
+                    value: '3',
+                    label: require('@/assets/imgs/dotLine.jpg')
+                }
+            ],
+            linepxOption: [
+                {
+                    value: '1',
+                    label: require('@/assets/imgs/1pxline.jpg')
+                },
+                {
+                    value: '2',
+                    label: require('@/assets/imgs/2pxline.jpg')
+                },
+                {
+                    value: '3',
+                    label: require('@/assets/imgs/3pxline.jpg')
+                }
+            ],
             fileList: []
         }
     },
@@ -119,11 +150,18 @@ export default {
     .form2 {
         display: flex;
         .input-left {
-            .input-left-bottom {
+            width: 500px;
+            .title {
+                margin-right: 100px;
                 margin: 20px 0 8px 0;
-                .title {
-                    margin-bottom: 8px;
-                }
+                display: inline-block;
+                width: 250px;
+            }
+            .type {
+                margin-right: 100px;
+                margin: 20px 0 8px 0;
+                display: inline-block;
+                width: 250px;
             }
         }
         .input-right {
@@ -131,15 +169,15 @@ export default {
             height: 114px;
             background: rgba(245, 246, 247, 1);
             display: inline-block;
-            margin-left: 48px;
+            margin-left: 18px;
         }
     }
     .form3 {
-        width: 696px;
+        width: 720px;
         height: 86px;
         background: rgba(245, 246, 247, 1);
         border-radius: 4px;
-        margin-top: 16px;
+        margin-top: 20px;
         .form3-top {
             padding: 12px 0 8px 12px;
             .form3-span1 {
@@ -155,6 +193,9 @@ export default {
                 margin-right: 88px;
             }
         }
+        .form3-bottom {
+            display: flex;
+        }
     }
     .form4 {
         .form4-top {
@@ -168,15 +209,24 @@ export default {
         }
     }
     .form5 {
-        width: 696px;
+        width: 720px;
         height: 86px;
         background: rgba(245, 246, 247, 1);
         border-radius: 4px;
-        margin-top: 16px;
+        margin-top: 20px;
         padding-left: 12px;
         .form5-top {
             padding: 12px 0 8px 0;
         }
     }
+    .span1::after,
+    .span2::after,
+    .type::after,
+    .form3-span1::after,
+    .form3-span3::after {
+        content: '*';
+        color: #f56c6c;
+        margin-left: 4px;
+    }
 }
 </style>

+ 4 - 2
src/views/legendLibrary/addLegend.vue

@@ -1,7 +1,8 @@
 <template>
     <div class='add-legend'>
         <el-dialog :title='title' :visible.sync='dialogVisible'>
-            <add-form></add-form>
+            <add-list v-if='2'></add-list>
+            <add-form v-else></add-form>
             <span slot='footer' class='dialog-footer'>
                 <el-button @click='dialogVisible = false' size='small'>取 消</el-button>
                 <el-button type='primary' @click='dialogVisible = false' size='small'>确 定</el-button>
@@ -12,6 +13,7 @@
 
 <script>
 import addForm from './addForm'
+import addList from '../legendRules/addList'
 export default {
     data() {
         return {
@@ -20,7 +22,7 @@ export default {
             title: ''
         }
     },
-    components: { addForm },
+    components: { addForm, addList },
     methods: {
         open(row, title) {
             this.dialogVisible = true

+ 17 - 22
src/views/legendLibrary/index.vue

@@ -9,25 +9,13 @@
         </div>
         <div class='legend-library-bottom'>
             <div class='select-box'>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-select default-value='全部' style='width: 120px' @change='handleChange'>
-                    <a-select-option value='全部'>全部</a-select-option>
-                </a-select>
-                <a-input-search placeholder style='width: 200px' @search='onSearch' />
+                <Select width='180' tipPlace='top' caption='所属分类:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
+                <Select width='180' tipPlace='top' caption='说明书位置:' :selectdata='dataSelect2' :placeholder='"请选择"' style='margin:0 12px'></Select>
+                <Select width='180' tipPlace='top' caption='位置/设备分类:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
+                <Select width='180' tipPlace='top' caption='专业/系统:' :selectdata='dataSelect2' :placeholder='"请选择"' style='margin:0 12px'></Select>
+                <Select width='180' tipPlace='top' caption='铺位可视化:' :selectdata='dataSelect2' :placeholder='"请选择"'></Select>
+                <Select width='180' tipPlace='top' caption='状态:' :selectdata='dataSelect2' :placeholder='"请选择"' style='margin:0 12px'></Select>
+                <a-input-search placeholder style='width: 192px;height:34px' @search='onSearch' />
             </div>
             <el-table :data='tableData' style='width: 100%'>
                 <el-table-column prop='name' label='图例名称'></el-table-column>
@@ -55,8 +43,9 @@
 </template>
 <script>
 import addLegend from './addLegend'
+import Select from '@/components/Select/Select.vue'
 export default {
-    components: { addLegend },
+    components: { addLegend, Select },
     data() {
         return {
             columns: [
@@ -101,7 +90,13 @@ export default {
                     key: 'action'
                 }
             ],
-            tableData: [{ name: '车库', style: '--' }, { style: '--' }]
+            tableData: [{ name: '车库', style: '--' }, { style: '--' }],
+            dataSelect2: [
+                { id: 'test1', name: '选择项' },
+                { id: 'test2', name: '单平米' },
+                { id: 'test3', name: '下级分项' },
+                { id: 'test4', name: '滑动平均滑动平均' }
+            ]
         }
     },
     methods: {
@@ -116,7 +111,7 @@ export default {
         modifyClick(row) {
             this.$refs.addLegend.open(row, '修改图例库')
         },
-        deleteClick(row) {
+        deleteClick() {
             this.$confirm('作废后则不可更改', '确定要作废图例吗?', {
                 confirmButtonText: '作废',
                 cancelButtonText: '取消',

+ 0 - 17
src/views/legendLibrary/modifyForm.vue

@@ -1,17 +0,0 @@
-<template>
-    <div class='modify-form'></div>
-</template>
-
-<script>
-export default {
-    data() {
-        return {}
-    },
-    methods: {}
-}
-</script>
-
-<style lang='less' scoped>
-.modifyForm {
-}
-</style>

+ 10 - 0
src/views/legendRules/addList.vue

@@ -0,0 +1,10 @@
+<template>
+    <div>111111111111</div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style>
+</style>

+ 1 - 1
src/views/legendRules/index.vue

@@ -119,7 +119,7 @@ export default {
         },
         handleClick() {},
         add() {
-            this.$refs.addLegend.open('', '添加图例库')
+            this.$refs.addLegend.open('', '2')
         }
     },
     mounted() {}