Browse Source

系统集成开发

shaun-sheep 4 years ago
parent
commit
3596a2fe5e

+ 9 - 9
config/dev.env.js

@@ -3,15 +3,15 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-    NODE_ENV: '"development"',
-    BASE_URL: '"http://172.16.44.215"', //测试iframe地址
-    SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
-    // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
-    // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
-    MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
-    // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-    // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
-    // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
+  NODE_ENV: '"development"',
+  BASE_URL: '"http://172.16.44.215"', //测试iframe地址
+  SSO_SERVER: '"http://172.16.44.235:8081"', //测试环境
+  // BASE_URL: '"http://192.168.20.236"', //(新)测试iframe地址
+  // SSO_SERVER: '"http://192.168.20.236:8086"', //(新)测试环境
+  MQTT_SERVICE: '"ws://172.16.42.210:61614/stomp/"' //MQ测试环境地址
+  // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
+  // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
+  // MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 })
 
 

+ 69 - 0
src/components/config_point/toolLibrary/detailDialog.vue

@@ -0,0 +1,69 @@
+<template>
+  <el-dialog :title="object.val" :visible.sync="dialogTableVisible" width="70%">
+    <el-table :data="gridData" border :header-cell-style="{background:'#F3F4F7'}">
+      <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
+      <el-table-column property="name" label="名称" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column property="address" label="软件" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column property="date" label="特殊说明" align="center"></el-table-column>
+      <el-table-column property="name" label="适用厂家" align="center"></el-table-column>
+      <el-table-column property="address" label="使用说明" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column property="address" label="配置示例" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    name: "settingDialog",
+    data() {
+      return {
+        gridData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }],
+        dialogTableVisible: false,
+        object: {}
+      };
+    },
+    methods: {
+      show(val) {
+        this.dialogTableVisible = true
+        this.object = val
+      },
+      handleDown(index, row) {
+
+      },
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

+ 192 - 0
src/components/config_point/toolLibrary/settingDialog.vue

@@ -0,0 +1,192 @@
+<template>
+  <el-dialog title="配置集成工具库" :visible.sync="dialogTableVisible" width="70%">
+    <el-button type="default" style="margin-bottom: 20px" @click="handleEdit">添加协议</el-button>
+    <el-table :data="gridData" border :header-cell-style="{background:'#F3F4F7'}">
+      <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
+      <el-table-column property="name" label="协议类型" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column property="name" label="名称" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column property="address" label="软件" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column property="date" label="特殊说明" align="center"></el-table-column>
+      <el-table-column property="name" label="适用厂家" align="center"></el-table-column>
+      <el-table-column property="address" label="使用说明" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column property="address" label="配置示例" align="center" width="80">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleDown(scope.$index,scope.row)">下载</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column property="address" label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button @click="handleEdit(scope.$index, scope.row)">编辑
+          </el-button>
+          <el-button type="danger" @click="handleDelete(scope.$index, scope.row)">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog
+      width="40%"
+      :title="title"
+      :visible.sync="innerVisible"
+      append-to-body>
+      <el-form :model="form">
+        <el-form-item label="协议类型">
+          <el-select v-model="form.ProtocolType" filterable @change="handleChangeProtocolType"
+                     placeholder="请选择">
+            <el-option v-for="item in options" :key="item.value" :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="协议名称">
+          <el-input v-model="form.name" autocomplete="off" placeholder="请输入协议名称,必须唯一" style="width: 220px"/>
+        </el-form-item>
+        <el-form-item label="上传软件版本">
+          <upload-files
+            v-model="form.copyright"
+            :readOnly="false"
+            :isShow="1"
+            :keys-arr="[]"
+            :show-file-list="false"
+            @change="changeItem"/>
+        </el-form-item>
+        <el-form-item label="特殊说明">
+          <el-input type="textarea" v-model="form.data1" :autosize="{ minRows: 4, maxRows: 4}" style="width: 220px"/>
+        </el-form-item>
+        <el-form-item label="适用厂家">
+          <el-input type="textarea" v-model="form.data2" :autosize="{ minRows: 4, maxRows: 4}" style="width: 220px"/>
+        </el-form-item>
+        <el-form-item label="使用说明">
+          <upload-files
+            v-model="form.see"
+            :readOnly="false"
+            :isShow="1"
+            :keys-arr="[]"
+            :show-file-list="false"
+            @change="changeItem"/>
+        </el-form-item>
+        <el-form-item label="配置实例">
+          <upload-files
+            v-model="form.new"
+            :readOnly="false"
+            :isShow="1"
+            :keys-arr="[]"
+            :show-file-list="false"
+            @change="changeItem"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="innerVisible = false">取 消</el-button>
+        <el-button type="primary">保 存</el-button>
+      </div>
+    </el-dialog>
+  </el-dialog>
+</template>
+
+<script>
+  import uploadFiles from "@/components/business_space/lib/uploadFiles";
+
+  export default {
+    name: "",
+    components: {uploadFiles},
+    data() {
+      return {
+        gridData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }],
+        dialogTableVisible: false,
+        innerVisible: false,
+        title: '',
+        form: {
+          name: '',
+          ProtocolType: '',
+          copyright: '',
+          data1: '',
+          data2: '',
+          see: '',
+          new: ''
+        },
+        options: [
+          {
+            value: 'modbus-tcp',
+            label: 'Modbus TCP'
+          }, {
+            value: 'bacnet-ip',
+            label: 'BACNet IP'
+          }, {
+            value: 'opc',
+            label: 'OPC'
+          }, {
+            value: 'knx',
+            label: 'KNX'
+          }, {
+            value: 'mqtt',
+            label: 'MQTT'
+          }, {
+            value: 'amqp',
+            label: 'AMQP'
+          }, {
+            value: 'lora',
+            label: 'LoRa'
+          }, {
+            value: 'ems-collect',
+            label: 'ems-collect'
+          }, {
+            value: 'common',
+            label: '其他'
+          }],
+      };
+    },
+    methods: {
+      show() {
+        this.dialogTableVisible = true
+
+      },
+      handleDown(index, row) {
+
+      },
+      handleEdit(index, row) {
+        this.innerVisible = true
+        if (row) {
+          this.title = '编辑协议'
+        } else {
+          this.title = '添加协议'
+
+        }
+      },
+      handleDelete(index, row) {
+
+      },
+      handleChangeProtocolType(val) {
+
+      },
+      changeItem(val) {
+
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

+ 2 - 4
src/components/point/report/historyChart.vue

@@ -9,9 +9,7 @@
       </el-select>
     </div>
     <!-- 图表 -->
-    <div class="chart-area" ref="chart">
-
-    </div>
+    <div class="chart-area" ref="chart"></div>
   </div>
 </template>
 
@@ -186,4 +184,4 @@ export default {
 .chart-area {
   height: 450px;
 }
-</style>
+</style>

+ 22 - 23
src/components/point/report/tabFunNumOverview.vue

@@ -23,8 +23,8 @@
         <el-table-column prop='MeterFunc' label='表号-功能号' show-overflow-tooltip min-width="100" header-align='left'></el-table-column>
         <el-table-column prop='Data.Data' label='查看分精度' show-overflow-tooltip min-width="90" header-align='center' align='center'>
           <template slot-scope="scope">
-            <el-button style="padding:7px 15px;" @click="handleDrawer(scope.row, 0)"><i class="el-icon-s-data" style="font-size:15px;"></i>
-            </el-button>
+            <el-button style="padding:7px 15px;font-size:15px;" @click="handleDrawer(scope.row, 0)">
+              <i class="el-icon-s-data"/></el-button>
           </template>
         </el-table-column>
         <el-table-column prop='Data.Time' label='对应值 - 获取时间' show-overflow-tooltip min-width="270" header-align='center' align='center'
@@ -81,26 +81,25 @@
 </template>
 
 <script>
-import { Message } from 'element-ui';
-import {
-  getTabFunNumOverview
-} from '@/api/scan/request'
-import historyChart from './historyChart'
-import dataSource from './dataSource'
-import objectInstance from './objectInstance'
-import addTabFunNum from './addTabFunNum'
-import lStorage from '@/utils/localStorage'
-export default {
-  data() {
-    return {
-      //表格头样式
-      headerStyle: {
-        backgroundColor: '#e1e4e5',
-        color: '#2b2b2b',
-        lineHeight: '30px'
-      },
-      // allTableData: [],//所有表格数据
-      tableData: [],
+  import {Message} from 'element-ui';
+  import {getTabFunNumOverview} from '@/api/scan/request'
+  import historyChart from './historyChart'
+  import dataSource from './dataSource'
+  import objectInstance from './objectInstance'
+  import addTabFunNum from './addTabFunNum'
+  import lStorage from '@/utils/localStorage'
+
+  export default {
+    data() {
+      return {
+        //表格头样式
+        headerStyle: {
+          backgroundColor: '#e1e4e5',
+          color: '#2b2b2b',
+          lineHeight: '30px'
+        },
+        // allTableData: [],//所有表格数据
+        tableData: [],
       pageSizes: [10, 20, 50, 100],
       pageSize: 50,
       currentPage: 1,
@@ -252,4 +251,4 @@ export default {
 /deep/ .el-drawer__header>:first-child:focus{
   outline: none;
 }
-</style>
+</style>

+ 333 - 323
src/data/menus.js

@@ -1,326 +1,336 @@
 export default [
 	/******************** 平台管理 ***************************/
-	{
-		path: '/platform',
-		name: '平台管理',
-		disabled: true,
-	},
-	// 项目管理
-	{
-		path: '/platform/project',
-		name: '项目管理',
-		icon: 'icon-project-o'
-	},
-	// 人员管理
-	{
-		path: '/platform/user',
-		name: '人员管理',
-		icon: 'icon-renyuanguanli',
-		opts: [{
-			name: '查看',
-			basic: true,
-			permission: 'system:user:query'
-		}]
-	},
-	// 角色管理
-	{
-		path: '/platform/role',
-		name: '角色管理',
-		icon: 'icon-jiaoseguanli',
-		opts: [{
-			name: '查看',
-			basic: true,
-			permission: 'system:role:query'
-		}]
-	},
-	/******************** 前期准备 ***************************/
-	{
-		path: '/ready',
-		name: '前期准备',
-		disabled: true,
-	},
-	// 建筑楼层管理
-	{
-		path: '/ready/buildfloor',
-		name: '建筑楼层管理',
-		icon: 'icon-jianzhu'
-	},
-	// 需采集的信息点
-	{
-		path: '/ready/collectsetting',
-		name: '需采集的信息点',
-		icon: 'icon-xinxi'
-	},
-	// 扫楼App用户管理
-	{
-		path: '/ready/appuser',
-		name: '扫楼App用户管理',
-		icon: 'icon-app4'
-	},
-	/******************** 信息收集 ***************************/
-	{
-		path: '/information',
-		name: '信息收集',
-		disabled: true,
-	},
-	// 模型管理
-	{
-		path: '/model',
-		name: '模型管理',
-		icon: 'icon-moxing___',
-		children: [{
-			path: '/model/file',
-			name: '模型文件管理',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/model/report',
-			name: '模型质量报告',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}]
-	},
-	// 系统集成
-	{
-		path: '/point',
-		name: '系统集成',
-		icon: 'icon-xitong',
-		children: [{
-			path: '/point/pointsetting',
-			name: '子系统点位接入',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/point/dynamicdata',
-			name: '配置动参从点位取值',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		},
-		// {
-		// 	path: '/point/objectdata',
-		// 	name: '配置动参从对象取值',
-		// 	icon: '',
-		// 	opts: [{
-		// 		name: '查看',
-		// 		basic: true,
-		// 		permission: 'system:role:query'
-		// 	}]
-		// },
-		{
-			path: '/point/report',
-			name: '系统集成成果管理',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}]
-	},
-	// 扫楼作业
-	{
-		path: '/floor',
-		name: '扫楼作业',
-		icon: 'icon-shanglou',
-		children: [{
-			path: '/floor/task',
-			name: '现场任务管理',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		},{
-			path: '/floor/data',
-			name: '现场数据整理',
-			icon: '',
-			children: [ {
-				path: '/floor/data',
-				name: '信息点整理',
-				icon: '',
-				opts: [{
-					name: '查看',
-					basic: true,
-					permission: 'system:role:query'
-				}]
-			},
-			{
-				path: '/floor/plan',
-				name: '位置标签整理',
-				icon: '',
-				opts: [{
-					name: '查看',
-					basic: true,
-					permission: 'system:role:query'
-				}]
-			}]
-		}, {
-			path: '/floor/abnormalprop',
-			name: '扫楼报告',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/floor/log',
-			name: '扫楼日志查看',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}]
-	},
-	// 台账管理
-	{
-		path: '/ledger',
-		name: '台账管理',
-		icon: 'icon-taizhangzhangbushezhi',
-		children: [{
-			path: '/ledger/facility',
-			name: '设备台账',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/ledger/property',
-			name: '资产台账',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/ledger/list',
-			name: '系统台账',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/ledger/spacelist',
-			name: '业务空间台账',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-				path: '/ledger/cenotelist',
-				name: '竖井台账',
-				icon: '',
-				opts: [{
-					name: '查看',
-					basic: true,
-					permission: 'system:role:query'
-				}]
-		},{
-			path: '/ledger/rentlist',
-			name: '租户台账',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}, {
-			path: '/ledger/datareport',
-			name: '数据质量报告',
-			icon: '',
-			opts: [{
-				name: '查看',
-				basic: true,
-				permission: 'system:role:query'
-			}]
-		}]
-	},
-	/******************** 关系维护并计算 ***************************/
-	{
-		path: '/relation',
-		name: '关系维护并计算',
-		disabled: true,
-	},
-	// 关系维护
-	// {
-	// 	path: '/relation/maintain',
-	// 	name: '关系维护',
-	// 	icon: 'icon-guanxi',
-	// 	opts: [{
-	// 		name: '查看',
-	// 		basic: true,
-	// 		permission: 'system:user:query'
-	// 	}]
-	// },
-	// 全部关系总览
-	{
-		path: '/relation/overview',
-		name: '全部关系总览',
-		icon: 'icon-jiqixuexi-',
-		opts: [{
-			name: '查看',
-			basic: true,
-			permission: 'system:role:query'
-		}]
-	},
-	/******************** 数据项目化交付 ***************************/
-	{
-		path: '/deliver',
-		name: '数据项目化交付',
-		disabled: true,
-	},
-	// 项目数据转换
-	{
-		path: '/relation/data',
-		name: '项目数据转换',
-		icon: 'icon-view',
-		opts: [{
-			name: '查看',
-			basic: true,
-			permission: 'system:role:query'
-		}]
-	},
-	/******************** 通用字典 ***************************/
-	// {
-	// 	path: '/dictionaries',
-	// 	name: '通用字典',
-	// 	disabled: true,
-	// },
-	// // 厂家库
-	// {
-	// 	path: '/manufactor/supplier',
-	// 	name: '厂家库',
-	// 	icon: '',
-	// 	opts: [{
-	// 		name: '查看',
-	// 		basic: true,
-	// 		permission: 'system:role:query'
-	// 	}]
-	// }
+  {
+    path: '/platform',
+    name: '平台管理',
+    disabled: true,
+  },
+// 项目管理
+  {
+    path: '/platform/project',
+    name: '项目管理',
+    icon: 'icon-project-o'
+  },
+// 人员管理
+  {
+    path: '/platform/user',
+    name: '人员管理',
+    icon: 'icon-renyuanguanli',
+    opts: [{
+      name: '查看',
+      basic: true,
+      permission: 'system:user:query'
+    }]
+  },
+// 角色管理
+  {
+    path: '/platform/role',
+    name: '角色管理',
+    icon: 'icon-jiaoseguanli',
+    opts: [{
+      name: '查看',
+      basic: true,
+      permission: 'system:role:query'
+    }]
+  },
+  /******************** 前期准备 ***************************/
+  {
+    path: '/ready',
+    name: '前期准备',
+    disabled: true,
+  },
+// 建筑楼层管理
+  {
+    path: '/ready/buildfloor',
+    name: '建筑楼层管理',
+    icon: 'icon-jianzhu'
+  },
+// 需采集的信息点
+  {
+    path: '/ready/collectsetting',
+    name: '需采集的信息点',
+    icon: 'icon-xinxi'
+  },
+// 扫楼App用户管理
+  {
+    path: '/ready/appuser',
+    name: '扫楼App用户管理',
+    icon: 'icon-app4'
+  },
+  /******************** 信息收集 ***************************/
+  {
+    path: '/information',
+    name: '信息收集',
+    disabled: true,
+  },
+// 模型管理
+  {
+    path: '/model',
+    name: '模型管理',
+    icon: 'icon-moxing___',
+    children: [{
+      path: '/model/file',
+      name: '模型文件管理',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/model/report',
+      name: '模型质量报告',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }]
+  },
+// 系统集成
+  {
+    path: '/point',
+    name: '系统集成',
+    icon: 'icon-xitong',
+    children: [{
+      path: '/point/pointsetting',
+      name: '子系统点位接入',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/point/dynamicdata',
+      name: '配置动参从点位取值',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    },
+      // {
+      // 	path: '/point/objectdata',
+      // 	name: '配置动参从对象取值',
+      // 	icon: '',
+      // 	opts: [{
+      // 		name: '查看',
+      // 		basic: true,
+      // 		permission: 'system:role:query'
+      // 	}]
+      // },
+      {
+        path: '/point/report',
+        name: '系统集成监测',
+        icon: '',
+        opts: [{
+          name: '查看',
+          basic: true,
+          permission: 'system:role:query'
+        }]
+      }, {
+        path: '/point/tool',
+        name: '系统工具库',
+        icon: '',
+        opts: [{
+          name: '查看',
+          basic: true,
+          permission: 'system:role:query'
+        }]
+      }
+    ]
+  },
+// 扫楼作业
+  {
+    path: '/floor',
+    name: '扫楼作业',
+    icon: 'icon-shanglou',
+    children: [{
+      path: '/floor/task',
+      name: '现场任务管理',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/floor/data',
+      name: '现场数据整理',
+      icon: '',
+      children: [{
+        path: '/floor/data',
+        name: '信息点整理',
+        icon: '',
+        opts: [{
+          name: '查看',
+          basic: true,
+          permission: 'system:role:query'
+        }]
+      },
+        {
+          path: '/floor/plan',
+          name: '位置标签整理',
+          icon: '',
+          opts: [{
+            name: '查看',
+            basic: true,
+            permission: 'system:role:query'
+          }]
+        }]
+    }, {
+      path: '/floor/abnormalprop',
+      name: '扫楼报告',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/floor/log',
+      name: '扫楼日志查看',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }]
+  },
+// 台账管理
+  {
+    path: '/ledger',
+    name: '台账管理',
+    icon: 'icon-taizhangzhangbushezhi',
+    children: [{
+      path: '/ledger/facility',
+      name: '设备台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/property',
+      name: '资产台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/list',
+      name: '系统台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/spacelist',
+      name: '业务空间台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/cenotelist',
+      name: '竖井台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/rentlist',
+      name: '租户台账',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }, {
+      path: '/ledger/datareport',
+      name: '数据质量报告',
+      icon: '',
+      opts: [{
+        name: '查看',
+        basic: true,
+        permission: 'system:role:query'
+      }]
+    }]
+  },
+  /******************** 关系维护并计算 ***************************/
+  {
+    path: '/relation',
+    name: '关系维护并计算',
+    disabled: true,
+  },
+// 关系维护
+// {
+// 	path: '/relation/maintain',
+// 	name: '关系维护',
+// 	icon: 'icon-guanxi',
+// 	opts: [{
+// 		name: '查看',
+// 		basic: true,
+// 		permission: 'system:user:query'
+// 	}]
+// },
+// 全部关系总览
+  {
+    path: '/relation/overview',
+    name: '全部关系总览',
+    icon: 'icon-jiqixuexi-',
+    opts: [{
+      name: '查看',
+      basic: true,
+      permission: 'system:role:query'
+    }]
+  },
+  /******************** 数据项目化交付 ***************************/
+  {
+    path: '/deliver',
+    name: '数据项目化交付',
+    disabled: true,
+  },
+// 项目数据转换
+  {
+    path: '/relation/data',
+    name: '项目数据转换',
+    icon: 'icon-view',
+    opts: [{
+      name: '查看',
+      basic: true,
+      permission: 'system:role:query'
+    }]
+  },
+  /******************** 通用字典 ***************************/
+// {
+// 	path: '/dictionaries',
+// 	name: '通用字典',
+// 	disabled: true,
+// },
+// // 厂家库
+// {
+// 	path: '/manufactor/supplier',
+// 	name: '厂家库',
+// 	icon: '',
+// 	opts: [{
+// 		name: '查看',
+// 		basic: true,
+// 		permission: 'system:role:query'
+// 	}]
+// }
 ]

File diff suppressed because it is too large
+ 780 - 560
src/router/system.js


+ 19 - 16
src/views/point/config_point/edit_origin/dialog.vue

@@ -15,6 +15,10 @@
                      :value="item.value"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="json格式" v-if="formData.ProtocolType == 'common'">
+        <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" v-model="ProtocolInfo"
+                  placeholder="请输入json格式数据"></el-input>
+      </el-form-item>
       <!--                <el-form-item label="主机IP地址" v-if="formData.ProtocolType != 'common'">-->
       <!--                    <ip-input :ip="formData.ProtocolInfo.Ip" :port="formData.ProtocolInfo.Port" :ProtocolType="formData.ProtocolType" @change="changeItem" @deletePort="deletePort"></ip-input>-->
       <!--                </el-form-item>  -->
@@ -67,23 +71,21 @@
                      :value="item.value"></el-option>
         </el-select>
       </el-form-item>
+
       <el-form-item label="描述">
         <el-input type="textarea" v-model="formData.Description" :autosize="{ minRows: 4, maxRows: 4}"
                   placeholder="请输入描述内容,200个字以内"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button :disabled="formData.wangluo =='jianjie'?true:false">测试</el-button>
-        <el-button>取消</el-button>
+        <el-button @click="dialogVisible = false">取消</el-button>
         <el-button type="primary">保存</el-button>
       </el-form-item>
       <el-form-item label="测试日志">
         <el-input type="textarea" v-model="formData.ceshi" :autosize="{ minRows: 4, maxRows: 4}"
                   disabled></el-input>
       </el-form-item>
-      <el-form-item label="属性详情" v-if="formData.ProtocolType == 'common'">
-        <el-input type="textarea" :autosize="{ minRows: 8, maxRows: 8}" v-model="ProtocolInfo"
-                  placeholder="请输入json格式数据" style="display:inline-block;width:400px;"></el-input>
-      </el-form-item>
+
 
     </el-form>
 
@@ -122,17 +124,18 @@
           CollectInterval: 10
         },
         ProtocolInfo: "",//自定义协议信息
-        options: [{
-          value: 'modbus-tcp',
-          label: 'Modbus TCP'
-        }, {
-          value: 'bacnet-ip',
-          label: 'BACNet IP'
-        }, {
-          value: 'opc',
-          label: 'OPC'
-        }, {
-          value: 'knx',
+        options: [
+          {
+            value: 'modbus-tcp',
+            label: 'Modbus TCP'
+          }, {
+            value: 'bacnet-ip',
+            label: 'BACNet IP'
+          }, {
+            value: 'opc',
+            label: 'OPC'
+          }, {
+            value: 'knx',
           label: 'KNX'
         }, {
           value: 'mqtt',

+ 42 - 32
src/views/point/config_point/index.vue

@@ -1,34 +1,35 @@
 <template>
-    <div class="saga-config-point">
-        <div style="line-height:34px;padding-left:10px">
-            <span style="display:inline-block;height: 35px;line-height:34px;">此项目包括<i style="color:#409EFF;">{{list.length}}</i>个数据源</span>
-            <div style="float:right;height:34px;line-height:34px;padding-bottom: 1px;">
-                <!-- <el-button @click="sameData">同步配置文件到云端</el-button> -->
-                <el-button style="width:140px;" @click="addItem">添加数据源</el-button>
-            </div>
-        </div>
-        <div class="saga-origin-list" v-loading="isLoading">
-            <!-- <el-scrollbar> -->
-                <div class="disIne border-hover saga-list-item margin5" v-for="(item,index) in list" :key="index">
-                    <data-origin :id="'origin' + index" :renderData="item">
-                        <div class="center">
-                            <el-button @click="maintenance(item)" type="text">编辑点位</el-button>
-                            <el-button @click="goEdit(item)" type="text">编辑数据源</el-button>
-                          <el-button @click="del(item)" type="text">删除</el-button>
-                        </div>
-                    </data-origin>
-                </div>
-                <div v-if="!list.length" class="center" style="margin-top: 260px;">
-                    <i class="icon-wushuju iconfont"></i>
-                    暂无数据
-                </div>
-                <!-- <div class="disIne saga-list-item margin5 center pointer" @click="addItem">
-                    <i class="add-icon margin50">+</i>
-                </div> -->
-            <!-- </el-scrollbar> -->
-        </div>
-      <dataSourceDialog ref="dialog"></dataSourceDialog>
+  <div class="saga-config-point">
+    <div style="line-height:34px;padding-left:10px">
+      <span style="display:inline-block;height: 35px;line-height:34px;">此项目包括<i
+        style="color:#409EFF;">{{list.length}}</i>个数据源</span>
+      <div style="float:right;height:34px;line-height:34px;padding-bottom: 1px;">
+        <!-- <el-button @click="sameData">同步配置文件到云端</el-button> -->
+        <el-button style="width:140px;" @click="addItem">添加数据源</el-button>
+      </div>
     </div>
+    <div class="saga-origin-list" v-loading="isLoading">
+      <!-- <el-scrollbar> -->
+      <div class="disIne border-hover saga-list-item margin5" v-for="(item,index) in list" :key="index">
+        <data-origin :id="'origin' + index" :renderData="item">
+          <div class="center">
+            <el-button @click="maintenance(item)" type="text">编辑点位</el-button>
+            <el-button @click="goEdit(item)" type="text">编辑数据源</el-button>
+            <el-button @click="del(item)" type="text">删除</el-button>
+          </div>
+        </data-origin>
+      </div>
+      <div v-if="!list.length" class="center" style="margin-top: 260px;">
+        <i class="icon-wushuju iconfont"></i>
+        暂无数据
+      </div>
+      <!-- <div class="disIne saga-list-item margin5 center pointer" @click="addItem">
+          <i class="add-icon margin50">+</i>
+      </div> -->
+      <!-- </el-scrollbar> -->
+    </div>
+    <dataSourceDialog ref="dialog"></dataSourceDialog>
+  </div>
 </template>
 <script>
   import "@/assets/scss/point/point_config/common.scss"
@@ -36,10 +37,11 @@
   import dataOrigin from "@/components/config_point/data_origin"
   import {mapGetters} from "vuex";
   import {queryDataSourceCount, synchronizeProj} from "@/fetch/point_http"
-import dataSourceDialog from "./edit_origin/dialog";
+  import dataSourceDialog from "./edit_origin/dialog";
+
   export default {
     components: {
-      dataOrigin,dataSourceDialog
+      dataOrigin, dataSourceDialog
     },
     data() {
       return {
@@ -94,7 +96,15 @@ import dataSourceDialog from "./edit_origin/dialog";
               // })
             },
           del(item) {
-
+            this.$confirm('删除后无法恢复,所有点位将丢失,是否需要删除', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.$message.success('删除成功')
+            }).catch(() => {
+              this.$message.info('已取消删除')
+            })
           },
             maintenance(item) {
                 console.log(item)

+ 67 - 0
src/views/point/toolLibrary/index.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="tool-library">
+    <div class="tool-library-header">
+      <h4>软件工具</h4>
+      <el-button class="btn" type="text" @click="createTools">配置集成工具库</el-button>
+    </div>
+    <div class="tool-library-content">
+      <el-button type="text" v-for="item in list" class="btn" @click="detailItem(item)">{{item.val}}</el-button>
+    </div>
+    <detailDialog ref="detailObject"/>
+    <settingDialog ref="setting"/>
+  </div>
+</template>
+
+<script>
+  import detailDialog from "@/components/config_point/toolLibrary/detailDialog";
+  import settingDialog from "@/components/config_point/toolLibrary/settingDialog";
+
+  export default {
+    data() {
+      return {
+        list: [
+          {val: 'OPC'}, {val: 'webservice'}, {val: 'MQTT'}, {val: 'transfor'}, {val: 'BACNet IP'}
+        ]
+      }
+    },
+    components: {detailDialog, settingDialog},
+    methods: {
+      detailItem(item) {
+        this.$refs.detailObject.show(item)
+      },
+      createTools() {
+        this.$refs.setting.show()
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .tool-library {
+    .tool-library-header {
+      overflow: hidden;
+
+      h4 {
+        display: inline-block;
+      }
+
+      .btn {
+        float: right;
+      }
+    }
+
+    .tool-library-content {
+      width: 90%;
+      margin: 20px auto;
+      background: rgba(247, 247, 247, 1);
+      border-radius: 5px;
+      padding: 20px 0;
+
+      .btn {
+        width: 20%;
+        text-align: center;
+        font-size: 20px;
+      }
+    }
+  }
+</style>