updated

config/index.js

@@ -64,6 +64,14 @@ module.exports = {
                 ws: true,
                 // 将主机标头的原点更改为目标URL
                 changeOrigin: false
+            },
+            '/godhand': {
+                // 目标 API 地址
+                target: 'http://192.168.20.225:8080/',
+                // 如果要代理 websockets
+                ws: true,
+                // 将主机标头的原点更改为目标URL
+                changeOrigin: false
             }
         },
 

src/api/scan/request.js

@@ -336,7 +336,7 @@ export function createPost(param) {
             ]
         }
     }
-    return fetch({ method: 'POST', url: `${physics}/godhand/equipment/create?projectId=${param.perjectId}&secret=${param.secret}`, data })
+    return fetch({ method: 'POST', url: `${godhand}/equipment/create?projectId=${param.perjectId}&secret=${param.secret}`, data })
 }
 
 

src/components/ledger/handsontables/assets.vue

@@ -10,7 +10,7 @@
     </div>-->
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}资产</span>
-      <div style="width:300px;float:right;overflow:hidden;">
+      <div style="float:right;overflow:hidden;">
         <el-button size="small" style="width: 80px;" @click="addDevice" icon="iconfont icon-tianjia">添加资产</el-button>
         <el-button size="small" style="width: 80px;" @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
         <el-button size="small" style="width: 80px;" @click="undo" icon="iconfont icon-undo">撤销</el-button>

src/components/ledger/handsontables/device.vue

@@ -8,7 +8,7 @@
         <i class="iconfont icon-xiaolian"></i>
       </span>
       <span>当前筛选条件下共{{page.total || '--'}}设备</span>
-      <div style="width:390px;float:right;overflow:hidden;">
+      <div style="float:right;overflow:hidden;">
         <el-button size="small" style='width: 80px;' @click="download" icon="iconfont icon-xiazai">下载</el-button>
         <el-button size="small" style='width: 80px;' @click="addDevice" icon="iconfont icon-tianjia">添加设备</el-button>
         <el-button size="small" style='width: 80px;' @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>

src/components/ledger/handsontables/system.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}系统</span>
-      <div style="width:300px;float:right;overflow:hidden;">
+      <div style="float:right;overflow:hidden;">
         <el-button size="small" style="width: 80px" @click="addDevice" icon="iconfont icon-tianjia">添加系统</el-button>
         <el-button size="small" style="width: 80px" @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
         <el-button size="small" style="width: 80px" @click="undo" icon="iconfont icon-undo">撤销</el-button>

src/framework/layout/Main.vue

@@ -8,8 +8,8 @@
             <div id='page-content-wrapper' class='page-content-wrapper'>
                 <div class='page-bar'>
                     <el-breadcrumb separator='/'>
-                        <!-- <el-breadcrumb-item :to='{ path: "/" }'>首页</el-breadcrumb-item> -->
-                        <el-breadcrumb-item v-for='(b, index) in breadcrumb' :key='index' :to='b.path ? { path: b.path } : null'>{{b.label}}</el-breadcrumb-item>
+                    <el-breadcrumb-item v-show="!breadcrumb.length"  :to='{ path: "/" }'>首页</el-breadcrumb-item>
+                    <el-breadcrumb-item v-show="breadcrumb.length" v-for='(b, index) in breadcrumb' :key='index' :to='b.path ? { path: b.path } : null'>{{b.label}}</el-breadcrumb-item>                       
                     </el-breadcrumb>
                 </div>
                 <!-- <router-view class='page-content'/> -->

src/framework/layout/PageHeader.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='page-header'>
         <div id='page-header-logo' class='page-logo'>
-            <a href='index.html'>
+            <a @click="toIndex">
                 <img src='@/assets/logo.png' alt='logo' class='logo-default'>
             </a>
             <div class='menu-toggler sidebar-toggler' @click.stop='toggleSidebar'>
@@ -59,6 +59,9 @@ export default {
             if (cmd == 'logout') {
                 frameworkApi.toLogout()
             }
+        },
+        toIndex() {
+            this.$router.push('/')
         }
     },
     created() {

src/router/system.js

@@ -167,7 +167,12 @@ export default [
             { path: '', name: 'buildData', component: buildData },
             { path: 'data', name: 'buildData', component: buildData },
             { path: 'plan', name: 'buildGraphy', component: buildGraphy },
-            { path: 'abnormalprop', name: 'buildAssets', component: buildAssets },
+            {
+                path: 'abnormalprop',
+                name: 'buildAssets',
+                component: buildAssets,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '异常资产清单' }] }
+            },
             {
                 path: 'log',
                 name: 'buildLog',

src/views/data_admin/buildAssets/Noverify.vue

@@ -24,10 +24,14 @@
             <el-table-column header-align='center' align='center' prop='spaceName' label='所在元空间'></el-table-column>
             <el-table-column header-align='center' align='center' prop='eq' label='对应设备类'></el-table-column>
             <el-table-column header-align='center' align='center' prop='bimXY' label='BIM模型中坐标'></el-table-column>
-            <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='220'>
+            <el-table-column header-align='center' align='center' prop='PointName' label='对应的岗位' width='120'>
+                <template slot-scope='scope'>
+                    <el-button v-if="scope.row.EquipmentId" type='primary' plain size='mini' @click='post(scope.row)'>查看岗位详情</el-button>
+                </template>
+            </el-table-column>
+            <el-table-column header-align='center' align='center' prop='PointName' label='操作' width='150'>
                 <template slot-scope='scope'>
                     <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
-                    <el-button type='primary' plain size='mini' @click='post(scope.row)'>岗位</el-button>
                     <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
                 </template>
             </el-table-column>

src/views/data_admin/buildAssets/Station.vue

@@ -1,12 +1,12 @@
 <template>
-    <el-dialog title='添加岗位' :visible.sync='dialogVisible' width='500px'>
+    <el-dialog title='添加对应岗位' :visible.sync='dialogVisible' width='500px'>
         <div class='add-box'>
-            <el-select v-model='value' placeholder='资产设备族对应的设备类' clearable>
+            <el-select v-model='value' placeholder='资产设备族对应的设备类' clearable style="width: 300px">
                 <el-option v-for='item in options' :key='item.code' :label='item.name' :value='item.code'></el-option>
             </el-select>
         </div>
         <span slot='footer' class='dialog-footer'>
-            <el-button type='primary' @click='save'>保存</el-button>
+            <el-button type='primary' @click='save'>确定创建对应岗位</el-button>
         </span>
     </el-dialog>
 </template>