系统设置部分ui调整

src/views/deviceManagement/deviceConfig.vue

@@ -18,7 +18,7 @@
         @node-click="handleNodeClick"
       >
       <span slot-scope="{node,data}">
-                    <el-image :src="data.url"></el-image>
+                    <!-- <el-image :src="data.url"></el-image> -->
                     <span style="padding-left: 10px; vertical-align: text-bottom;">{{ node.label }}</span>
                     <span class="operate_btns">
                         <dropdown :events="data.id ? menuEvents : subMenuEvents" :data="{ node, data }"
@@ -224,6 +224,7 @@ export default {
   },
   methods: {
     searchTypeEvent() {},
+    dropDownClick(){},
     getTableData(val) {},
     handleSizeChange(val) {},
     filterNode(value, data) {

src/views/deviceManagement/deviceWarning.vue

@@ -13,7 +13,7 @@
         @node-click="handleNodeClick"
       >
       <span slot-scope="{node,data}">
-                    <el-image :src="data.url"></el-image>
+                    <!-- <el-image :src="data.url"></el-image> -->
                     <span style="padding-left: 10px; vertical-align: text-bottom;">{{ node.label }}</span>
                     <span class="operate_btns">
                         <dropdown :events="data.id ? menuEvents : subMenuEvents" :data="{ node, data }"
@@ -167,6 +167,7 @@ export default {
   methods: {
     // 新建告警类别
     newAlarmType() {},
+    dropDownClick(){},
     handleClick() {
       //
     },

src/views/systemManagement/indexConfiguration/smartBoard.vue

@@ -60,22 +60,32 @@ export default {
             value: 'test',
             data: [
                 {
+                    id:1,
                     label: '人员画像',
+                    url: require('@/assets/tree/strategy/louceng@3x.png'),
                     children: [{
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '人员态势',
                     }, {
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '餐厅消费态势'
                     }, {
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '商超消费态势'
                     }]
                 },
                 {
+                    id:2,
+                    url: require('@/assets/tree/strategy/louceng@3x.png'),
                     label: '能源画像',
                     children: [{
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '用电态势',
                     }, {
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '用水态势'
                     }, {
+                        url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                         label: '用热态势'
                     }]
                 }
@@ -148,6 +158,7 @@ export default {
         handleSelectionChange() {
             //
         },
+        dropDownClick(){},
         getTableData() {
             this.tableData = [];
             getUserList()

src/views/systemManagement/infoConfiguration/floorInfo.vue

@@ -17,9 +17,9 @@ export default {
     data() {
         return {
             label: "1F",
-            testUrl: "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+            testUrl: "",
             srcList: [
-                "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+                "",
             ],
         }
     }

src/views/systemManagement/infoConfiguration/index.vue

@@ -17,6 +17,7 @@
         </div>
         <div class="right-pane">
             <floorInfo></floorInfo>
+            <!-- <SecuritystaffInfo ></SecuritystaffInfo> -->
         </div>
     </div>
 </template>
@@ -24,35 +25,45 @@
 <script>
 import dropdown from '@/components/Dropdown/index';
 import floorInfo from './floorInfo';
+import SecuritystaffInfo from './securitystaffInfo';
 export default {
-    components: { floorInfo, dropdown },
+    components: { floorInfo, dropdown, SecuritystaffInfo },
     data() {
         return {
+            floorShow: true,
+            infoShow: false,
             filterText: '',
             data: [{
-                id:1,
+                id: 1,
+                url: require('@/assets/tree/strategy/louceng@3x.png'),
                 label: '楼层地图信息配置',
                 children: [{
+                    url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                     label: '1F',
                 }, {
+                    url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                     label: '20F'
                 }, {
+                    url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                     label: 'B1'
                 }]
             },
             {
-                id:2,
+                id: 2,
+                url: require('@/assets/tree/strategy/louceng@3x.png'),
                 label: '安保人员信息',
                 children: [{
+                    url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                     label: '前台人员排班信息',
                 }, {
+                    url: require('@/assets/tree/strategy/huiyishi@3x.png'),
                     label: '安防人员排班信息'
                 }]
             }],
             defaultProps: {
                 children: 'children',
                 label: 'label'
-            }, 
+            },
             menuEvents: [
                 { label: '新建', funcName: 'addNode' }
             ],
@@ -75,8 +86,9 @@ export default {
             if (!value) return true;
             return data.label.indexOf(value) !== -1;
         },
-        handleNodeClick() {
-            //
+        handleNodeClick(data) {
+        },
+        dropDownClick() {
         }
     }
 }

src/views/systemManagement/infoConfiguration/infoConfigure.vue

@@ -1,23 +1,14 @@
 <template>
     <div class="container">
-        <div class="left-pane">
-            <el-input placeholder="请输入关键字" suffix-icon="el-icon-search" v-model="filterText"></el-input>
-            <el-tree ref="tree" :data="data" :props="defaultProps" node-key="id" default-expand-all
-                :filter-node-method="filterNode" @node-click="handleNodeClick">
-            </el-tree>
-            <el-button class="newInfo_button"><i class="el-icon-s-order"></i>新建消息模块</el-button>
+        <div style="width: 100%; height: 100px;margin-top: 10px;">
+            <el-tag>{{ label }}</el-tag>
+            <el-button type="text">历史记录</el-button>
         </div>
-        <div class="right-pane">
-            <div style="width: 100%; height: 100px;margin-top: 10px;">
-                <el-tag>{{ label }}</el-tag>
-                <el-button type="text">历史记录</el-button>
-            </div>
-            <div style="height: 600px;width: 100%; margin-top: 10px;">
-                <el-image style="height: 100%;" :src="testUrl" :fit="contain" :preview-src-list="srcList"></el-image>
-            </div>
-            <el-button>删除</el-button>
-            <el-button>更新</el-button>
+        <div style="height: 600px;width: 100%; margin-top: 10px;">
+            <!-- <el-image style="height: 100%;" :src="testUrl" :fit="contain" :preview-src-list="srcList"></el-image> -->
         </div>
+        <el-button>删除</el-button>
+        <el-button>更新</el-button>
     </div>
 </template>
 
@@ -25,46 +16,12 @@
 export default {
     data() {
         return {
-            label: "1F",
-            testUrl: "",
-            srcList: [
-                "",
-            ],
-            filterText: '',
-            data: [{
-                label: '楼层地图信息配置',
-                children: [{
-                    label: '1F',
-                }, {
-                    label: '20F'
-                }, {
-                    label: 'B1'
-                }]
-            },
-            {
-                label: '安保人员信息',
-                children: [{
-                    label: '前台人员排班信息',
-                }, {
-                    label: '安防人员排班信息'
-                }]
-            }],
-            defaultProps: {
-                children: 'children',
-                label: 'label'
-            }
         }
     },
     watch: {
-        filterText(val) {
-            this.$refs.tree.filter(val);
-        }
     },
     methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.label.indexOf(value) !== -1;
-        }
+
     }
 }
 </script>
@@ -111,6 +68,7 @@ export default {
         margin-right: 20px;
     }
 }
+
 .el-tag {
     position: absolute;
     background-color: transparent;

src/views/systemManagement/infoConfiguration/securitystaffInfo.vue

@@ -6,7 +6,7 @@
             <el-button type="text">历史记录</el-button>
         </div>
         <div style="height: 600px;width: 100%; margin-top: 10px;">
-            <el-table border :data="tableData" tooltip-effect="dark" 
+            <el-table :data="tableData" tooltip-effect="dark" 
                 :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }" style="width: 100%">
                 <el-table-column type="index" width="50" label="序号">
                 </el-table-column>

src/views/systemManagement/messageConfiguration/index.vue

@@ -99,6 +99,7 @@ export default {
             if (!value) return true;
             return data.label.indexOf(value) !== -1;
         },
+        dropDownClick(){},
         handleNodeClick(data) {
             switch (data.label) {
                 case '年度报告通知':

src/views/systemManagement/messageConfiguration/messageCreate.vue

@@ -2,12 +2,13 @@
     <div>
         <el-tag>新建消息模块</el-tag>
         <el-form :model="form" label-position="left" label-width="80px">
-            <el-form-item :model="form.template_name" label="模块名称：">
-                <el-input class="template_name" v-model="input"></el-input>
+            <el-form-item label="模块名称：">
+                <el-input v-model="form.template_name" class="template_name"></el-input>
             </el-form-item>
-            <el-form-item :model="form.template_superior" label="模块上级：">
-                <el-select>
-                    <el-option label="普通消息"></el-option>
+            <el-form-item label="模块上级：">
+                <el-select v-model="form.template_superior">
+                    <el-option v-for="item in superiorOptions" :value="item.value" :key="item.value"
+                        :label="item.label"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item :model="form.channelconfig" label="通道配置：">
@@ -29,7 +30,7 @@
             <el-form-item :model="form.sendtiming" label="发送时间：">
                 <el-radio v-model="radio" label="1" style="margin-top:13px">定时</el-radio>
                 <span>
-                    <el-date-picker v-model="value1" type="datetime" placeholder="选择日期时间">
+                    <el-date-picker v-model="value" type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                 </span>
             </el-form-item>
@@ -52,7 +53,7 @@ export default {
             checked: true,
             checked2: true,
             radio: '1',
-            value1: '',
+            value: '',
             defaultProps: {
                 children: 'children',
                 label: 'label'
@@ -60,7 +61,13 @@ export default {
             form: {
 
             },
-            input: ''
+            options: [],
+            superiorOptions: [
+                {
+                    value:'1',
+                    label:'test'
+                }
+            ]
         }
     },
 
@@ -122,8 +129,9 @@ export default {
         /deep/.el-input__inner {
             width: 320px;
         }
-        /deep/.el-input__suffix{
-            right:-80px;
+
+        /deep/.el-input__suffix {
+            right: -80px;
         }
     }
 
@@ -136,12 +144,14 @@ export default {
     }
 
 }
-.template_name{
+
+.template_name {
     /deep/.el-input__inner {
-            float: left;
-        }
-    
+        float: left;
+    }
+
 }
+
 .el-tag {
     position: relative;
     background-color: transparent;

src/views/systemManagement/messageConfiguration/messageRemind.vue

@@ -7,11 +7,12 @@
                 <el-checkbox label="钉钉"></el-checkbox>
                 <el-checkbox label="站内通知"></el-checkbox>
             </el-form-item>
-            <el-form-item :model="form.personconfig" label="人员配置：">
+            <el-form-item label="人员配置：">
                 <div style="display: flex; margin-right:30px;">
                     <el-checkbox label="指定用户：" v-model="checked2"></el-checkbox><span>
-                        <el-select style="width: 80px;">
-                            <el-option label="张三"></el-option>
+                        <el-select v-model="form.personconfig" style="width: 80px;">
+                            <el-option v-for="item in personOptions" :value="item.value" :key="item.value"
+                        :label="item.label"></el-option>
                         </el-select>
                     </span>
                 </div>
@@ -48,6 +49,12 @@ export default {
             title: '',
             content: '',
             messagePreview: '',
+            personOptions: [
+                {
+                    value:'1',
+                    label:'test'
+                }
+            ],
             data: [{
                 label: '普通消息',
                 children: [{