Browse Source

Merge remote-tracking branch 'origin/dataType' into dataType

onlyh 3 years ago
parent
commit
d151b431e1

+ 1 - 1
config/index.js

@@ -10,7 +10,7 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: proxyTable["18"],
+    proxyTable: proxyTable["14"],
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST

+ 3 - 3
package.json

@@ -5,10 +5,10 @@
   "author": "yaoll <yaolinlin@sagacloud.cn>",
   "private": true,
   "remote": {
-    "host": "192.168.20.236",
-    "path": "/opt/nginx/ibms/dist",
+    "host": "192.168.64.18",
+    "path": "/root/apps/web/adm/dist",
     "user": "root",
-    "password": "saga",
+    "password": "persagy@2020",
     "local": "dist"
   },
   "scripts": {

+ 24 - 1
src/components/dialogs/list/systemType.vue

@@ -29,7 +29,7 @@
                     class="data-table"
                     border
                     row-key="id"
-                    :data="type == 'read' ? linkSystemData : tableData"
+                    :data="tableData"
                     @selection-change="handleSelectionChange"
                     style="width: 100%"
                     ref="multipleTable"
@@ -201,9 +201,31 @@ export default {
                 this.toggleSelection(res.content)
             })
         },
+        getSystemTableData() {
+            const sysIdList = this.linkSystemData.map(sys => {
+                return sys.id
+            })
+            if (sysIdList.length) {
+                let param = {
+                    data: {
+                        filters: `id in ${JSON.stringify(sysIdList)}`,
+                        pageNumber: 1,
+                        pageSize: 1000
+                    }
+                }
+                querySysLinkBuild(param, res => {
+                    this.tableData = res.content
+                })
+            } else {
+                this.tableData = [];
+            }
+        },
         //获取关联的系统
         getLinkSystemData() {
             this.linkSystemData = this.list ? JSON.parse(JSON.stringify(this.list)) : []
+            if (this.type == 'read') {
+                this.getSystemTableData();
+            }
         },
         //添加设备关联系统关系
         createRelatSys() {
@@ -227,6 +249,7 @@ export default {
             handler() {
                 if (this.dialog.systemType) {
                     this.getData()
+                    this.tableData = [];
                     if (this.type == 'read') {
                         this.getLinkSystemData()
                     } else {

+ 71 - 13
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -103,19 +103,7 @@ export default {
       dialogExport: false,
       dialogProcess: false,
       graphicTypeNum: 0,
-      activities: [{
-        content: '数据文件处理中..',
-        size: 'large',
-        type: 'primary',
-        icon: 'el-icon-check',
-        color: '#0bbd87'
-      }, {
-        content: '数据处理成功',
-        color: '#0bbd87',
-        icon: 'el-icon-check',
-        size: 'large',
-        type: 'primary',
-      }],
+      activities: [],
     }
   },
   computed: {
@@ -162,11 +150,81 @@ export default {
         // console.log(event.file, fileList)
       },
       success(event, file, fileList) {
+				if (event.content && event.content[0] && event.content[0].state === "0") {
+					this.activities = [{
+						content: '数据文件处理中..',
+						size: 'large',
+						type: 'primary',
+						icon: 'el-icon-check',
+						color: '#0bbd87'
+					}, {
+						content: `关系全部导入成功(导入关系:${event.content[0].successCount} 条)`,
+						color: '#0bbd87',
+						icon: 'el-icon-check',
+						size: 'large',
+						type: 'success',
+					}]
+				} else if (event.content && event.content[0] && event.content[0].state === "1") {
+					this.activities = [{
+						content: '数据文件处理中..',
+						size: 'large',
+						type: 'primary',
+						icon: 'el-icon-check',
+						color: '#0bbd87'
+					}, {
+						content: `关系部分导入成功(导入成功:${event.content[0].successCount} 条;导入失败:${event.content[0].failCount} 条)`,
+						color: '#0bbd87',
+						icon: 'el-icon-check',
+						size: 'large',
+						type: 'success',
+					}]
+				} else if (event.content && event.content[0] && event.content[0].state === "2") {
+					this.activities = [{
+						content: '数据文件处理中..',
+						size: 'large',
+						type: 'primary',
+						icon: 'el-icon-check',
+						color: '#0bbd87'
+					}, {
+						content: '关系导入失败!',
+						color: '#f56c6c',
+						icon: 'el-icon-close',
+						size: 'large',
+						type: 'primary',
+					}]
+				} else {
+					this.activities = [{
+						content: '数据文件处理中..',
+						size: 'large',
+						type: 'primary',
+						icon: 'el-icon-check',
+						color: '#0bbd87'
+					}, {
+						content: '关系导入失败!',
+						color: '#f56c6c',
+						icon: 'el-icon-close',
+						size: 'large',
+						type: 'primary',
+					}]
+				}
         this.dialogExport = true
         this.dialogProcess = true
 
       },
       error(event, file, fileList) {
+				this.activities = [{
+					content: '数据文件处理中..',
+					size: 'large',
+					type: 'primary',
+					icon: 'el-icon-check',
+					color: '#0bbd87'
+        }, {
+					content: '文件上传失败!',
+					color: '#f56c6c',
+					icon: 'el-icon-close',
+					size: 'large',
+					type: 'primary',
+        }]
         this.dialogExport = true
         this.dialogProcess = true
 

+ 1 - 1
src/framework/layout/layout-store.js

@@ -26,7 +26,7 @@ export default {
     },
     projectId: '',
     group_code: '',
-    projects: project["18"],
+    projects: project["14"],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码

+ 106 - 72
src/framework/layout/project.js

@@ -1,166 +1,196 @@
 const project = {
-  '39': [
+  "39": [
     {
       id: "Pj4501030002",
       name: "南宁万象城",
       pwd: "saga123456",
       group_code: "HR"
-    }, {
+    },
+    {
       id: "Pj3702120002",
       name: "青岛港务局航运中心",
       pwd: "saga123456",
       group_code: "QD"
-    }, {
+    },
+    {
       id: "Pj4403050002",
       name: "深圳万象天地",
       pwd: "saga123456",
       group_code: "HR"
-    }, {
+    },
+    {
       id: "Pj1101051029",
       name: "北京万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj0001110001",
       name: "飞龙商场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj1101050029",
       name: "东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj4403070003",
       name: "深圳龙岗万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj4403050019",
       name: "招商深圳太子广场汇港二期",
       pwd: "saga123456",
       group_code: "ZS"
-    }, {
+    },
+    {
       id: "Pj5001120003",
       name: "香港置地约克北郡",
       pwd: "saga123456",
       group_code: "XG"
-    }, {
+    },
+    {
       id: "Pj3201110003",
       name: "弘阳集团弘云智慧管理平台",
       pwd: "saga123456",
       group_code: "HY"
-    }, {
+    },
+    {
       id: "Pj3702020002",
       name: "青岛海天中心",
       pwd: "saga123456",
       group_code: "GX"
-    }, {
+    },
+    {
       id: "Pj1101010006",
       name: "亚投行",
       pwd: "saga123456",
       group_code: "BT"
-    }, {
+    },
+    {
       id: "Pj1101050013",
       name: "BIM测试项目_亚投行",
       pwd: "saga123456",
       group_code: "BT"
-    }, {
+    },
+    {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj1101150002",
       name: "华润生命科学园",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3101150007",
       name: "招商上海森兰花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj5101080004",
       name: "成都招商花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3201130004",
       name: "招商南京燕子矶花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3702120001",
       name: "金融中心",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj1101051130",
       name: "万达模型测试项目2",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj0002220001",
       name: "数字化交付01",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220002",
       name: "数字化交付02",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220003",
       name: "数字化交付03",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220004",
       name: "数字化交付04",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220005",
       name: "数字化交付05",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220006",
       name: "数字化交付06",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220007",
       name: "数字化交付07",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220008",
       name: "数字化交付08",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220009",
       name: "数字化交付09",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj0002220010",
       name: "数字化交付10",
       pwd: "saga123456",
       group_code: "BR"
     }
   ],
-  '14': [{
-    id: "Pj1101051029",
-    name: "北京万达广场",
-    pwd: "saga123456",
-    group_code: "WD"
-  },
+  "14": [
+    {
+      id: "Pj1101051029",
+      name: "北京万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    },
     {
       id: "Pj1101050029",
-      name: "东坝万达广场",
+      name: "北京东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
     },
@@ -201,118 +231,122 @@ const project = {
       group_code: "ZS"
     },
     {
-      id: "Pj3201130004",
-      name: "招商南京燕子矶花园城项目",
-      pwd: "saga123456",
-      group_code: "ZS"
-    },
-    {
-      id: "Pj4403050019",
-      name: "招商IOC广场",
-      pwd: "saga123456",
-      group_code: "ZS"
-    },
-    {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-
-    }],
-  '18': [
+    }
+  ],
+  "18": [
     {
       id: "Pj1101051029",
       name: "北京万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj0001110001",
       name: "飞龙商场",
       pwd: "saga123456",
       group_code: "MK"
-    }, {
+    },
+    {
       id: "Pj0001110002",
       name: "常州常武",
       pwd: "saga123456",
       group_code: "MK"
-    }, {
+    },
+    {
       id: "Pj1101050029",
       name: "东坝万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj4403070003",
       name: "深圳龙岗万达广场",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj4403050019",
       name: "招商深圳太子广场汇港二期",
       pwd: "saga123456",
       group_code: "ZS"
-    }, {
+    },
+    {
       id: "Pj5001120003",
       name: "香港置地约克北郡",
       pwd: "saga123456",
       group_code: "XG"
-    }, {
+    },
+    {
       id: "Pj3201110003",
       name: "弘阳集团弘云智慧管理平台",
       pwd: "saga123456",
       group_code: "HY"
-    }, {
+    },
+    {
       id: "Pj3702020002",
       name: "青岛海天中心",
       pwd: "saga123456",
       group_code: "GX"
-    }, {
+    },
+    {
       id: "Pj1101010006",
       name: "亚投行",
       pwd: "saga123456",
       group_code: "BT"
-    }, {
+    },
+    {
       id: "Pj1101050013",
       name: "BIM测试项目_亚投行",
       pwd: "saga123456",
       group_code: "BT"
-    }, {
+    },
+    {
       id: "Pj1101080259",
       name: "博锐尚格北京总部办公楼",
       pwd: "saga123456",
       group_code: "BR"
-    }, {
+    },
+    {
       id: "Pj1101150002",
       name: "华润生命科学园",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3101150007",
       name: "招商上海森兰花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj5101080004",
       name: "成都招商花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3201130004",
       name: "招商南京燕子矶花园城",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj3702120001",
       name: "金融中心",
       pwd: "saga123456",
       group_code: "WD"
-    }, {
+    },
+    {
       id: "Pj1101051130",
       name: "万达模型测试项目2",
       pwd: "saga123456",
       group_code: "WD"
     }
   ]
+};
 
-}
-
-export default project
+export default project;

+ 11 - 11
src/router/system.js

@@ -392,7 +392,7 @@ export default [{
         path: 'task',
         name: 'buildTask',
         component: buildTask,
-        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场任务管理'}]}
+        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场任务管理'}]}
       },
       {
         path: 'addDeviceTask',
@@ -400,7 +400,7 @@ export default [{
         component: addDeviceTask,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证设备台账'}]
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证设备台账'}]
         }
       },
       {
@@ -409,7 +409,7 @@ export default [{
         component: addAssetsTask,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证资产台账'}]
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证资产台账'}]
         }
       },
       {
@@ -418,7 +418,7 @@ export default [{
         component: addModelTask,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证模型'}]
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场任务管理', path: '/floor/task'}, {label: '现场验证模型'}]
         }
       },
       {
@@ -427,7 +427,7 @@ export default [{
         component: buildData,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场数据整理', path: '/floor/data'}, {label: '信息点整理'}]
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场数据整理', path: '/floor/data'}, {label: '信息点整理'}]
         }
       },
       {
@@ -436,14 +436,14 @@ export default [{
         component: buildGraphy,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场数据整理', path: '/floor/data'}, {label: '位置标签整理'}]
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场数据整理', path: '/floor/data'}, {label: '位置标签整理'}]
         }
       },
       {
         path: 'abnormalprop',
         name: 'buildAssets',
         component: buildAssets,
-        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '扫楼报告'}]}
+        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '扫楼报告'}]}
       },
       {
         path: 'report',
@@ -451,7 +451,7 @@ export default [{
         component: report,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '扫楼报告', path: '/floor/abnormalprop'}, {
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '扫楼报告', path: '/floor/abnormalprop'}, {
             label: '报告',
             path: '/floor/report'
           }]
@@ -461,7 +461,7 @@ export default [{
         path: 'log',
         name: 'buildLog',
         component: buildLog,
-        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '扫楼日志查看'}]}
+        meta: {keepAlive: false, breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '扫楼日志查看'}]}
       },
       {
         path: 'updatePointZone',
@@ -469,7 +469,7 @@ export default [{
         component: updatePointZone,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场数据整理', path: '/floor/data'}, {
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场数据整理', path: '/floor/data'}, {
             label: '位置标签整理',
             path: '/floor/plan'
           }, {label: '维护业务空间信息'}]
@@ -481,7 +481,7 @@ export default [{
         component: createPointZone,
         meta: {
           keepAlive: false,
-          breadcrumbs: [{label: '扫楼作业', path: '/floor'}, {label: '现场数据整理', path: '/floor/data'}, {
+          breadcrumbs: [{label: '扫楼作业', path: '/floor/task'}, {label: '现场数据整理', path: '/floor/data'}, {
             label: '位置标签整理',
             path: '/floor/plan'
           }, {label: '创建业务空间'}]

+ 15 - 8
src/views/data_admin/buildTask/index.vue

@@ -118,29 +118,36 @@
       this.$refs.statistics.upDataList()
     },
     handleChangeTask(val) {//切换任务类型
-      this.newTaskTypes = val
+      this.newTaskTypes = val;
+      this.upData();
     },
     handleChangeModel(val) {//修改模型文件
       if (val[1]) {
-        this.modelFile = val[1]
+        this.modelFile = val[1];
       } else {
-        this.modelFile = ''
+        this.modelFile = '';
       }
+      this.upData();
     },
     changeState(val) {//修改任务执行情况
-      this.taskState = val
+      this.taskState = val;
+      this.upData();
     },
     changeFloor(val) {//修改建筑楼层
-      this.buildfloor = val
+      this.buildfloor = val;
+      this.upData();
     },
     changeModelCascader(val) {//修改模型-设备类型
-      this.modelCategory = val.code
+      this.modelCategory = val.code;
+      this.upData();
     },
     changeDeviceCascader(val) {//修改设备-设备类型
-      this.deviceCategory = val.code
+      this.deviceCategory = val.code;
+      this.upData();
     },
     changeAssetsCascader(val) {//修改设备族
-      this.family = val.code
+      this.family = val.code;
+      this.upData();
     },
     handleAddTaskDialog() {
       if(this.taskTypes[0] =='tear' ||this.taskTypes[0] =='replace' ) {

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

@@ -96,7 +96,7 @@
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="报错信息">
+                    <el-table-column label="报错信息" :show-overflow-tooltip="false">
                         <template slot-scope="scope">
                             <span style="margin-left: 10px">{{ scope.row.error ? scope.row.error : "--" }}</span>
                         </template>