11 Commits 98414a1c40 ... a24bea41ca

Author SHA1 Message Date
  niuheng a24bea41ca 系统图编辑界面修改左侧文字样式 2 years ago
  niuheng 03e99ba4c2 左侧导航改成可关闭打开的 2 years ago
  qule c87e4f1a8e Merge branch 'master' of http://39.106.8.246:3003/BDTP/adm-frontend 2 years ago
  qule fb8ef53d26 bug 2 years ago
  niuheng 0ecaa04cbe 系统图编辑工具中的:删除按钮加鼠标悬浮手的提示 2 years ago
  niuheng fd02240961 业务空间台账,平面图底部操作栏样式调整 2 years ago
  niuheng 59046b7ad3 业务空间台账的无数据提示居中显示 2 years ago
  niuheng 2a64815fd8 暂无数据水平居中 2 years ago
  niuheng 72c24d2101 隐藏修改密码选项 2 years ago
  niuheng b9cd0fca0c 修改面包屑不显示的问题 2 years ago
  niuheng ee3da67341 修改导航栏文字及图标 2 years ago
30 changed files with 329 additions and 223 deletions
  1. BIN
      public/imgs/navigation/build_white.png
  2. BIN
      public/imgs/navigation/build_yellow.png
  3. BIN
      public/imgs/navigation/businessspace_white.png
  4. BIN
      public/imgs/navigation/businessspace_yellow.png
  5. BIN
      public/imgs/navigation/cadimg_white.png
  6. BIN
      public/imgs/navigation/cadimg_yellow.png
  7. BIN
      public/imgs/navigation/equip_white.png
  8. BIN
      public/imgs/navigation/equip_yellow.png
  9. BIN
      public/imgs/navigation/project_white.png
  10. BIN
      public/imgs/navigation/project_yellow.png
  11. BIN
      public/imgs/navigation/relationview_white.png
  12. BIN
      public/imgs/navigation/relationview_yellow.png
  13. BIN
      public/imgs/navigation/systemgraph_white.png
  14. BIN
      public/imgs/navigation/systemgraph_yellow.png
  15. BIN
      public/imgs/navigation/systemor_white.png
  16. BIN
      public/imgs/navigation/systemor_yellow.png
  17. 25 23
      public/systemConf.js
  18. 0 1
      src/Main.vue
  19. 2 2
      src/components/cadDrawingManage/index.vue
  20. 38 12
      src/components/frame/leftMenu.vue
  21. 76 26
      src/components/frame/pageLeft.vue
  22. 2 2
      src/components/frame/pageRight.vue
  23. 5 0
      src/components/old-adm/business_space/newGraphy/canvasFun.vue
  24. 13 11
      src/components/old-adm/business_space/newGraphy/graphy.vue
  25. 134 132
      src/components/old-adm/relation/components/overview/CardList.vue
  26. 5 0
      src/components/systemGraph/edit.vue
  27. 2 6
      src/components/systemGraph/graph.vue
  28. 1 2
      src/components/uploadFile/index.vue
  29. 3 3
      src/store/index.js
  30. 23 3
      src/utils/authUtils.ts

BIN
public/imgs/navigation/build_white.png


BIN
public/imgs/navigation/build_yellow.png


BIN
public/imgs/navigation/businessspace_white.png


BIN
public/imgs/navigation/businessspace_yellow.png


BIN
public/imgs/navigation/cadimg_white.png


BIN
public/imgs/navigation/cadimg_yellow.png


BIN
public/imgs/navigation/equip_white.png


BIN
public/imgs/navigation/equip_yellow.png


BIN
public/imgs/navigation/project_white.png


BIN
public/imgs/navigation/project_yellow.png


BIN
public/imgs/navigation/relationview_white.png


BIN
public/imgs/navigation/relationview_yellow.png


BIN
public/imgs/navigation/systemgraph_white.png


BIN
public/imgs/navigation/systemgraph_yellow.png


BIN
public/imgs/navigation/systemor_white.png


BIN
public/imgs/navigation/systemor_yellow.png


+ 25 - 23
public/systemConf.js

@@ -42,41 +42,43 @@ var __systemConf = {
     "name": "信息录入工具",
     "orders": 1,
     children: [{
+        "id": "projectmanage",
+        "name": "项目信息",
+        "orders": 6,
+        "path": "/project/manage",
+        "icon": "project"
+      }, {
       "id": "build_floor",
-      "name": "建筑楼层管理",
+      "name": "建筑楼层",
       "orders": 2,
       "path": "/ready/buildfloor",
       "type": "menu",
-      "icon": "icon-jianzhu"
+      "icon": "build"
     },{
-      "id": "equipment",
-      "name": "设备台账",
+      "id": "businessspaceledger",
+      "name": "业务空间",
       "orders": 3,
-      "path": "/ledger/facility"
+      "path": "/ledger/spacelist",
+      "icon": "businessspace"
     },{
-      "id": "businessspaceledger",
-      "name": "业务空间台账",
+      "id": "equipment",
+      "name": "设备",
       "orders": 3,
-      "path": "/ledger/spacelist"
+      "path": "/ledger/facility",
+      "icon": "equip"
     },
     {
       "id": "system",
-      "name": "系统台账",
+      "name": "系统",
       "orders": 4,
-      "path": "/ledger/list"
+      "path": "/ledger/list",
+      "icon": "systemor"
     },{
       "id": "overview",
-      "name": "全部关系总览",
+      "name": "关系",
       "orders": 5,
       "path": "/relation/overview",
-      "icon": "icon-jiqixuexi-"
-    }
-    ,{
-      "id": "projectmanage",
-      "name": "项目信息管理",
-      "orders": 6,
-      "path": "/project/manage",
-      "icon": "icon-jiqixuexi-"
+      "icon": "relationview"
     }
   ]
   }, {
@@ -85,10 +87,10 @@ var __systemConf = {
     "orders": 6,
     children: [{
       "id": "CADtuzhiguanli",
-      "name": "CAD核查图纸管理",
+      "name": "CAD图纸核查",
       "orders": 7,
       "path": "/deliveryTools/cadDrawingManage",
-      "icon": "icon-topology"
+      "icon": "cadimg"
     }]
   }, {
     "id": "draw",
@@ -96,10 +98,10 @@ var __systemConf = {
     "orders": 8,
     children: [{
       "id": "xitongtubianji",
-      "name": "系统图编辑工具",
+      "name": "系统图",
       "orders": 9,
       "path": "/systemGraph",
-      "icon": "icon-topology"
+      "icon": "systemgraph"
     }]
   }]
 };

+ 0 - 1
src/Main.vue

@@ -38,7 +38,6 @@ export default {
 }
 
 .leftRegion {
-  width: 235px;
   height: 100%;
 }
 .rightRegion {

+ 2 - 2
src/components/cadDrawingManage/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: ql
  * @Date: 2022-01-11 14:46:04
- * @LastEditTime: 2022-01-24 17:18:04
+ * @LastEditTime: 2022-01-24 19:30:09
  * @LastEditors: Please set LastEditors
  * @FilePath: \adm-frontend\src\components\cadDrawingManage\index.vue
 -->
@@ -163,7 +163,7 @@ export default {
   filters: {
     timeFormat(timestr) {
       if(timestr) {
-         return moment(timestr).format('YYYY-MM-DD HH:mm:ss')
+         return moment(timestr).format('YYYY-MM-DD HH:mm')
       } 
       return '--'
     }

+ 38 - 12
src/components/frame/leftMenu.vue

@@ -4,14 +4,14 @@
       :index="menu.orders.toString()"
       v-if="menu.children && menu.children.length > 0"
     >
-      <template slot="title">
+      <!-- <template slot="title">
         <i
           class="menuIcon"
-          :class="'iconfont ' + menu.icon"
+          :class="'leftMenuIconfont ' + menu.icon"
           v-if="!!menu.icon"
         ></i>
         <span v-text="menu.name"></span>
-      </template>
+      </template> -->
       <leftMenu
         :menu="subMenu"
         v-for="subMenu in menu.children"
@@ -22,21 +22,44 @@
       :index="menu.path"
       v-if="!menu.children || menu.children.length == 0"
     >
-      <i
+      <!-- <i
         class="menuIcon"
-        :class="'iconfont ' + menu.icon"
+        :class="'leftMenuIconfont ' + menu.icon"
         v-if="!!menu.icon"
-      ></i>
-      <span slot="title" v-text="menu.name"></span>
+      ></i> -->
+      <el-tooltip
+        v-if="!leftIsOpen"
+        effect="dark"
+        :content="menu.name"
+        placement="right"
+        popper-class="leftCloseTip"
+      >
+        <img :src="menu.state == 'normal' ? menu.normalImg : menu.activeImg" />
+      </el-tooltip>
+      <img
+        v-if="leftIsOpen"
+        :src="menu.state == 'normal' ? menu.normalImg : menu.activeImg"
+      />
+      <span
+        v-if="leftIsOpen"
+        slot="title"
+        v-text="menu.name"
+        style="margin-left: 6px"
+        :style="{
+          color: menu.state == 'normal' ? 'white' : 'rgb(255, 208, 75)',
+        }"
+      ></span>
     </el-menu-item>
   </div>
 </template>
 <script>
 export default {
   name: "leftMenu",
-  props: ["menu"],
+  props: ["menu", "leftIsOpen"],
   data() {
-    return {};
+    return {
+      routerPath: "",
+    };
   },
   computed: {},
   methods: {},
@@ -47,12 +70,15 @@ export default {
 };
 </script>
 
-<style scoped>
+<style>
 .menuIcon {
   margin-right: 6px;
   color: #fff;
-  width: 16px;
-  height:16px;
+  width: 20px;
+  height: 20px;
+}
+.leftCloseTip {
+  left: 58px !important;
 }
 </style>
 

+ 76 - 26
src/components/frame/pageLeft.vue

@@ -1,32 +1,60 @@
 <template>
-  <div id="pageLeft">
-    <div class="topContainer">
-      <div class="logoDiv">
-        <img :src="logoUrl" class="logoImg" />
+  <div id="pageLeft" :class="{leftClose:!leftIsOpen}">
+    <div class="leftContainer" v-if="leftIsOpen">
+      <div class="topContainer">
+        <div class="logoDiv">
+          <img :src="logoUrl" class="logoImg" />
+        </div>
+        <div class="middDiv">
+          <i class="el-icon-fa-bars fa fa-bars" @click="toggleLeft"></i>
+        </div>
       </div>
-      <div class="middDiv">
-        <i class="el-icon-fa-bars fa fa-bars"></i>
+      <div class="menuDiv">
+        <el-menu
+          text-color="#fff"
+          active-text-color="#ffd04b"
+          background-color="#364150"
+          router
+        >
+          <el-menu-item-group v-for="menu in menus" :key="menu.id">
+            <template slot="title">
+              <span v-text="menu.name"></span>
+            </template>
+            <leftMenu
+              :menu="subMenu"
+              v-for="subMenu in menu.children"
+              :key="subMenu.id"
+              :index="subMenu.id"
+              :leftIsOpen="leftIsOpen"
+            ></leftMenu>
+          </el-menu-item-group>
+        </el-menu>
       </div>
     </div>
-    <div class="menuDiv">
-      <el-menu
-        text-color="#fff"
-        active-text-color="#ffd04b"
-        background-color="#364150"
-        router
-      >
-        <el-menu-item-group v-for="menu in menus" :key="menu.id">
-          <template slot="title">
-            <span v-text="menu.name"></span>
-          </template>
-          <leftMenu
-            :menu="subMenu"
-            v-for="subMenu in menu.children"
-            :key="subMenu.id"
-            :index="subMenu.id"
-          ></leftMenu>
-        </el-menu-item-group>
-      </el-menu>
+    <div class="leftContainer" v-if="!leftIsOpen">
+      <div class="topContainer">
+        <div class="middDiv middDivClose">
+          <i class="el-icon-fa-bars fa fa-bars el-icon-fa-barsClose" @click="toggleLeft"></i>
+        </div>
+      </div>
+      <div class="menuDiv">
+        <el-menu
+          text-color="#fff"
+          active-text-color="#ffd04b"
+          background-color="#364150"
+          router
+        >
+          <el-menu-item-group v-for="menu in menus" :key="menu.id">
+            <leftMenu
+              :menu="subMenu"
+              v-for="subMenu in menu.children"
+              :key="subMenu.id"
+              :index="subMenu.id"
+              :leftIsOpen="leftIsOpen"
+            ></leftMenu>
+          </el-menu-item-group>
+        </el-menu>
+      </div>
     </div>
   </div>
 </template>
@@ -37,13 +65,18 @@ export default {
   props: [],
   data() {
     return {
+      leftIsOpen: true,
       logoUrl: require("@/assets/images/logo.png"),
     };
   },
   computed: {
     ...mapState(["menus"]),
   },
-  methods: {},
+  methods: {
+    toggleLeft: function () {
+      this.leftIsOpen = !this.leftIsOpen;
+    },
+  },
   created() {},
 
   mounted() {},
@@ -57,8 +90,16 @@ export default {
 #pageLeft {
   width: 235px;
   height: 100%;
+}
+
+.leftClose{
+  width:64px !important;
+}
+
+.leftContainer {
   display: flex;
   flex-direction: column;
+  height: 100%;
 }
 
 .topContainer {
@@ -94,6 +135,11 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   color: #ffffff;
   margin-left: 88px;
+  cursor: pointer;
+}
+
+.el-icon-fa-barsClose{
+  margin-left: 0;
 }
 
 .logoDiv {
@@ -104,6 +150,10 @@ export default {
   flex: 1;
 }
 
+.middDivClose{
+  text-align: center;
+}
+
 .el-menu-item-group__title span {
   font-size: 14px !important;
   color: #68707b;

+ 2 - 2
src/components/frame/pageRight.vue

@@ -23,11 +23,11 @@
             <i class="el-icon-switch-button"></i>
             <span class="user-pro-oper">退出登录</span>
           </div>
-          <div class="userPropLine"></div>
+          <!-- <div class="userPropLine"></div>
           <div class="userPropUpPass">
             <i class="el-icon-unlock"></i>
             <span class="user-pro-oper">修改密码</span>
-          </div>
+          </div> -->
 
           <div class="userInfo" slot="reference">
             <span v-text="user.name"></span>

+ 5 - 0
src/components/old-adm/business_space/newGraphy/canvasFun.vue

@@ -182,4 +182,9 @@ export default {
     }
   }
 }
+
+#canvas-actions-box>div{
+  line-height: 2;
+  padding: 0 10px !important;
+}
 </style>

+ 13 - 11
src/components/old-adm/business_space/newGraphy/graphy.vue

@@ -1,21 +1,23 @@
 <template>
   <div id="graphy" ref="graphy" v-loading="canvasLoading">
-    <div v-show="!FloorMap">
-      <!-- 平面图其他分区 -->
-      <!-- <div style="margin-right:10px;width: 100%;margin-bottom: 10px" v-if="showOtherFlag">
-        <el-button type="primary" @click="addZoneBtn">添加分区</el-button>
-        <el-select v-model="OtherValue" placeholder="请选择分区类型" @change="changeOtherZone">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
-        </el-select>
-      </div> -->
+    <!-- <div v-show="!FloorMap">
       <div
         class="center"
-        style="height: 400px; padding-top: 182px; box-sizing: border-box"
+        style="height: 400px; padding-top: 182px; box-sizing: border-box;text-align: center; margin: 0 auto;"
       >
         <i class="icon-wushuju iconfont"></i>
-        暂无数据
+        请选择建筑楼层
       </div>
+    </div> -->
+    <div
+      class="middle_sty"
+      style="height: 91%; text-align: center"
+      v-show="!FloorMap"
+    >
+      <p>
+        <i class="icon-wushuju iconfont"></i>
+        请选择建筑楼层
+      </p>
     </div>
     <div class="canvas-box" v-show="FloorMap">
       <canvas

+ 134 - 132
src/components/old-adm/relation/components/overview/CardList.vue

@@ -12,155 +12,157 @@
         class="container"
         v-for="(child,childIndex) in item.childGraphicTypeList"
       >
-        <p class="relation-text">
-          <span class="iconfont icon-juxing"></span>
-          <span @click="toDetail(child)" style="cursor:pointer;">
-            {{ child.graphTypeName }}
-            <i class="icon-zuzhiguanxi iconfont"/></span>
-          <span class="pic-code">图类型编码:{{ child.graphTypeCode }}</span>
-          <el-tooltip
-            v-if="child.Note"
-            :content="child.Note"
-            placement="top">
-            <i
-              @click="explain"
-              class="icon-shuoming iconfont"
-            />
-          </el-tooltip>
-        </p>
-
-        <el-row :gutter="24">
-          <el-col
-            :key="relation.Id"
-            :span="8"
-            v-for="(relation,relIndex) in child.relationTypeProjectList"
-          >
-            <el-card
-              class="card "
-              shadow="hover"
-              style="position: relative;"
-
+        <div v-if="!!child.relationTypeProjectList.length">
+          <p class="relation-text">
+            <span class="iconfont icon-juxing"></span>
+            <span @click="toDetail(child)" style="cursor:pointer;">
+              {{ child.graphTypeName }}
+              <i class="icon-zuzhiguanxi iconfont"/></span>
+            <span class="pic-code">图类型编码:{{ child.graphTypeCode }}</span>
+            <el-tooltip
+              v-if="child.Note"
+              :content="child.Note"
+              placement="top">
+              <i
+                @click="explain"
+                class="icon-shuoming iconfont"
+              />
+            </el-tooltip>
+          </p>
+
+          <el-row :gutter="24">
+            <el-col
+              :key="relation.Id"
+              :span="8"
+              v-for="(relation,relIndex) in child.relationTypeProjectList"
             >
-              <!-- border:none-->
-              <!--              <div v-show="relation.cardDisabled || relation.ComputationalState === 3 " class="mask"></div>-->
-              <div v-show="relation.computationalState === 3 " class="mask"></div>
-              <div style="overflow: hidden;">
-                <el-tooltip
-                  :content="relation.relationTypeName"
-                  placement="top"
-                >
-                  <p class="relation-title reset-test reset-title">{{ relation.relationTypeName }}</p>
-                </el-tooltip>
-                <el-tooltip
-                  :content="relation.relationTypeCode"
-                  placement="top"
-                >
-                  <p class="asc reset-title reset-test">边类型编码:{{ relation.relationTypeCode }}</p>
-                </el-tooltip>
-                <p class="relation-title-icon reset-test fr">
+              <el-card
+                class="card "
+                shadow="hover"
+                style="position: relative;"
+
+              >
+                <!-- border:none-->
+                <!--              <div v-show="relation.cardDisabled || relation.ComputationalState === 3 " class="mask"></div>-->
+                <div v-show="relation.computationalState === 3 " class="mask"></div>
+                <div style="overflow: hidden;">
                   <el-tooltip
-                    v-if="relation.note"
-                    :content="relation.note"
+                    :content="relation.relationTypeName"
                     placement="top"
-                    style="z-index: 3;position:relative;"
                   >
-                    <i class="iconfont icon-warn icon"/>
+                    <p class="relation-title reset-test reset-title">{{ relation.relationTypeName }}</p>
                   </el-tooltip>
-                </p>
-              </div>
-              <article>
-                <el-row>
-                  <el-col :span="13">
-                    <div class="grid-content">
-                      <p class="object">主要连接对象</p>
-                      <el-tooltip
-                        :content="relation.conneObject"
-                        placement="top"
-                      >
-                        <p class="group reset-title">{{ relation.conneObject }}</p>
-                      </el-tooltip>
-                    </div>
-                  </el-col>
-                  <el-col :span="2">
-                    <div class="grid-content">
-                      <p class="thread"></p>
-                    </div>
-                  </el-col>
-                  <el-col :span="9">
-                    <div class="grid-content ">
-                      <p class="line-number">连接数量</p>
-                      <p :class="relation.count > 0? 'line-number-show' :'line-number-hide'">{{ relation.count }}</p>
-
-                    </div>
-                  </el-col>
-                </el-row>
-                <p class="last-computed">
-                  <!--  <span v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>-->
-                  <!--                  <span v-show="relation.cardDisabled || relation.ComputationalState === 3">关系计算中...</span>-->
-                  <span v-show="relation.computationalState === 3">关系计算中...</span>
-                  <span v-show="relation.computationalState === 5">计算失败</span>
-                  <span
-                    v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{ relation.computingTime }}</span>
                   <el-tooltip
-                    :content="relation.computationalState === 2 ? '关系变更,请重新计算':'启动计算'"
+                    :content="relation.relationTypeCode"
                     placement="top"
                   >
-                    <el-badge
-                      class="item float-right"
-                      :is-dot="relation.computationalState === 2 || relation.computationalState === 5"
+                    <p class="asc reset-title reset-test">边类型编码:{{ relation.relationTypeCode }}</p>
+                  </el-tooltip>
+                  <p class="relation-title-icon reset-test fr">
+                    <el-tooltip
+                      v-if="relation.note"
+                      :content="relation.note"
+                      placement="top"
+                      style="z-index: 3;position:relative;"
+                    >
+                      <i class="iconfont icon-warn icon"/>
+                    </el-tooltip>
+                  </p>
+                </div>
+                <article>
+                  <el-row>
+                    <el-col :span="13">
+                      <div class="grid-content">
+                        <p class="object">主要连接对象</p>
+                        <el-tooltip
+                          :content="relation.conneObject"
+                          placement="top"
+                        >
+                          <p class="group reset-title">{{ relation.conneObject }}</p>
+                        </el-tooltip>
+                      </div>
+                    </el-col>
+                    <el-col :span="2">
+                      <div class="grid-content">
+                        <p class="thread"></p>
+                      </div>
+                    </el-col>
+                    <el-col :span="9">
+                      <div class="grid-content ">
+                        <p class="line-number">连接数量</p>
+                        <p :class="relation.count > 0? 'line-number-show' :'line-number-hide'">{{ relation.count }}</p>
+
+                      </div>
+                    </el-col>
+                  </el-row>
+                  <p class="last-computed">
+                    <!--  <span v-show="relation.ComputationalState === 3 || relation.ComputationalState === 4">关系计算中...</span>-->
+                    <!--                  <span v-show="relation.cardDisabled || relation.ComputationalState === 3">关系计算中...</span>-->
+                    <span v-show="relation.computationalState === 3">关系计算中...</span>
+                    <span v-show="relation.computationalState === 5">计算失败</span>
+                    <span
+                      v-show="relation.computationalState !== 3  && relation.computingTime">最后一次计算时间 {{ relation.computingTime }}</span>
+                    <el-tooltip
+                      :content="relation.computationalState === 2 ? '关系变更,请重新计算':'启动计算'"
+                      placement="top"
+                    >
+                      <el-badge
+                        class="item float-right"
+                        :is-dot="relation.computationalState === 2 || relation.computationalState === 5"
+                      >
+                        <el-button
+                          @click="computed(relation)"
+                          :disabled="!relation.source && !relation.automatic "
+                          circle
+                          type="primary"
+                          plain
+                          icon="iconfont icon-changyongtubiao-mianxing-"
+                          class="sm-button"
+                        >
+                          <!--style="background: #000;color: #fff"-->
+                        </el-button>
+                      </el-badge>
+                    </el-tooltip>
+                    <el-tooltip
+                      content="手动编辑"
+                      placement="top"
                     >
                       <el-button
-                        @click="computed(relation)"
-                        :disabled="!relation.source && !relation.automatic "
+                        :disabled="relation.manual === 1"
+                        :style="{'border':(relation.manual=== 1? '1px solid #DCDFE6' :'')}"
+                        @click="manual(relation)"
                         circle
+                        class="float-right sm-button"
                         type="primary"
                         plain
-                        icon="iconfont icon-changyongtubiao-mianxing-"
-                        class="sm-button"
+                        icon="iconfont icon-bianji"
+
                       >
-                        <!--style="background: #000;color: #fff"-->
                       </el-button>
-                    </el-badge>
-                  </el-tooltip>
-                  <el-tooltip
-                    content="手动编辑"
-                    placement="top"
-                  >
-                    <el-button
-                      :disabled="relation.manual === 1"
-                      :style="{'border':(relation.manual=== 1? '1px solid #DCDFE6' :'')}"
-                      @click="manual(relation)"
-                      circle
-                      class="float-right sm-button"
-                      type="primary"
-                      plain
-                      icon="iconfont icon-bianji"
-
-                    >
-                    </el-button>
 
-                  </el-tooltip>
-                  <el-tooltip
-                    content="设定设备对象源/末端"
-                    placement="top"
-                    v-if="relation.source"
-                  >
-                    <el-button
-                      @click="equipment(relation)"
-                      type="primary"
-                      plain
-                      circle
-                      class="float-right sm-button"
-                      icon="iconfont icon-23 "
-                      style="transform: rotate(90deg);"
+                    </el-tooltip>
+                    <el-tooltip
+                      content="设定设备对象源/末端"
+                      placement="top"
+                      v-if="relation.source"
                     >
-                    </el-button>
-                  </el-tooltip>
-                </p>
-              </article>
-            </el-card>
-          </el-col>
-        </el-row>
+                      <el-button
+                        @click="equipment(relation)"
+                        type="primary"
+                        plain
+                        circle
+                        class="float-right sm-button"
+                        icon="iconfont icon-23 "
+                        style="transform: rotate(90deg);"
+                      >
+                      </el-button>
+                    </el-tooltip>
+                  </p>
+                </article>
+              </el-card>
+            </el-col>
+          </el-row>
+        </div>
       </section>
     </div>
     <RelationMaintain

+ 5 - 0
src/components/systemGraph/edit.vue

@@ -1128,6 +1128,7 @@ export default {
 #divGraphEdit .delBtn {
   float: right;
   margin-right: 49px;
+  cursor: pointer;
 }
 
 #divGraphEdit .imgBar {
@@ -1200,6 +1201,8 @@ export default {
 #divGraphEdit .graphInfoName {
   margin-left: 12px;
   margin-top: 21px;
+  font-size: 12px;
+  color:#6F777F;
 }
 
 #divGraphEdit .graphInfoFirstEdit {
@@ -1212,6 +1215,7 @@ export default {
 #divGraphEdit .graphInfoContent {
   margin-top: 12px;
   margin-left: 36px;
+  font-weight: normal;
 }
 
 #divGraphEdit .graphRegion {
@@ -1297,6 +1301,7 @@ export default {
   position: absolute;
   bottom: 16px;
   margin-left: 62px;
+  cursor: pointer;
 }
 
 #divGraphEdit .rightDetail .selectPrefix {

+ 2 - 6
src/components/systemGraph/graph.vue

@@ -155,11 +155,8 @@ export default {
           //关闭右侧详情框
           this.$emit("closeright");
         });
+
         pixiContainer.appendChild(pixiApp.view);
-        // pixiApp.stage.interactive = true;
-        // pixiApp.view.on("click", (event) => {
-        //   alert(1);
-        // });
         _this.pixiApp = pixiApp;
       } else pixiApp = _this.pixiApp;
 
@@ -254,7 +251,7 @@ export default {
       });
 
       //画线
-      _this.lineArr.forEach((_cLine) => {
+      _this.lineArr.forEach((_cLine, _index) => {
         var lineColor = "0x" + _cLine.style.lineColor.substring(1);
         var lineInstance = new PIXI.Graphics();
         lineInstance.lineStyle(_cLine.style.lineWidth, lineColor, 1, 0, false);
@@ -285,7 +282,6 @@ export default {
           _this.isClickGraphNode = true;
           _this.clickEventCall(event, 2);
         });
-
         pixiApp.stage.addChild(lineInstance);
       });
     },

+ 1 - 2
src/components/uploadFile/index.vue

@@ -31,7 +31,7 @@
             @confirm='confirmHandle'
         >
             <template #content>
-                确定取消上传
+                确定关闭弹框
             </template>
             <template #handle>
                 <Button @click="modalClose" type="default">取消</Button>
@@ -80,7 +80,6 @@ export default {
                     },
                     files: that.fileList
                 });
-                console.log({res})
             }
         },
         uploading(nv, ov) {

+ 3 - 3
src/store/index.js

@@ -59,11 +59,11 @@ export default new Vuex.Store({
             function find(menus) {
                 for (let i = 0; i < menus.length; i++) {
                     let currMenu = menus[i];
-                    if (currMenu.url == breadcrumb.to) {
+                    if (currMenu.path == breadcrumb.to) {
                         return currMenu;
                     }
-                    if (currMenu.child && currMenu.child.length > 0) {
-                        let findMenu = find(currMenu.child);
+                    if (currMenu.children && currMenu.children.length > 0) {
+                        let findMenu = find(currMenu.children);
                         if (findMenu) {
                             newBreadcrumbs.push({
                                 label: findMenu.name,

+ 23 - 3
src/utils/authUtils.ts

@@ -30,11 +30,13 @@ export class authUtils {
     if (vueStore.state.user.id) {
       //更新面包屑数据
       vueStore.commit("updateBreadcrumbs", { to: to.path });
+      var prefitxMenuImg = "/" + (window as any).__systemConf.baseRouteUrl + '/imgs/navigation/';
+      var leftMenus = constructorMenu(vueStore.state.menus);
+      vueStore.commit("updateMenus", leftMenus);
       return next();
     }
-
     let userInfoResult = await userController.getUserInfoById();
-    
+
     if (userInfoResult.result != logicConfig.resultObj.success) {
       console.error("获取用户信息失败,原因:" + userInfoResult.message);
       return next({ path: logicConfig.routerNameConfig.loginRouteName });
@@ -50,7 +52,10 @@ export class authUtils {
       id: _userInfo.id,
       name: _userInfo.name,
     });
-    vueStore.commit("updateMenus", _userInfo.menus || (window as any).__systemConf.menus);
+
+    var prefitxMenuImg = "/" + (window as any).__systemConf.baseRouteUrl + '/imgs/navigation/';
+    var leftMenus = constructorMenu(_userInfo.menus || (window as any).__systemConf.menus);
+    vueStore.commit("updateMenus", leftMenus);
 
     //更新面包屑数据
     vueStore.commit("updateBreadcrumbs", { to: to.path });
@@ -70,5 +75,20 @@ export class authUtils {
     vueStore.commit("updateSelectProject", projects[0]);
 
     next();
+
+
+    function constructorMenu(menus) {
+      menus.forEach(_c => {
+        if (_c.children && _c.children.length > 0) {
+          _c.children = constructorMenu(_c.children);
+        } else {
+          _c.normalImg = prefitxMenuImg + _c.icon + '_white.png';
+          _c.activeImg = prefitxMenuImg + _c.icon + '_yellow.png';
+          _c.state = to.path == _c.path ? 'active' : 'normal';
+        }
+      });
+      return menus;
+    };
+
   }
 }