shaun-sheep 4 роки тому
батько
коміт
a7216200c4

+ 1 - 1
config/index.js

@@ -80,7 +80,7 @@ module.exports = {
       },
       '/image-service': {
         // 目标 API 地址
-        target: 'http://39.97.179.199:8888',
+        target: 'http://39.97.179.199:8891',
         changeOrigin: true,
         pathRewrite: {
           "^/image-service": "/image-service/"

+ 2 - 2
config/prod.env.js

@@ -2,14 +2,14 @@
 module.exports = {
   NODE_ENV: '"production"',
   // BASE_URL: '"http://192.168.64.14:8081"', //测试iframe地址
-  BASE_URL: '"http://182.92.126.202:9001"', //龙湖iframe地址
   // SSO_SERVER: '"http://192.168.12.238: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测试环境地址
   // BASE_URL: '"http://mbi.sagacloud.cn"', //线上iframe地址
   // SSO_SERVER: '"http://sso.sagacloud.cn"',  //正式环境
-  SSO_SERVER: '"http://sso.sagacloud.cn"',  //龙湖正式环境
+  BASE_URL: '"http://182.92.126.202:9001"', //龙湖iframe地址
+  SSO_SERVER: '"http://182.92.126.202:8889/"',  //龙湖正式环境
    MQTT_SERVICE: '"ws://adm.sagacloud.cn/stomp/"' //MQ正式环境地址
 }
 

+ 2 - 2
src/components/ledger/cenote/dialog/addSpaceDialog.vue

@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      title: "添加系统所在业务空间",
+      title: "添加竖井所在业务空间",
       keycode: "", //输入查询条件
       inSpaceType: "业务空间",
       Buildfloor: ["all"], // 选中的建筑楼层
@@ -220,4 +220,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 2 - 1
src/components/ledger/lib/uploadImgsName.vue

@@ -127,7 +127,8 @@
     delImage(i, key) {
       if (this.type == "video") {
         this.videoPicArr = this.videoPicArr.map(item => {
-          if (item.key.substring(0, item.length - 3) == this.imagesArr[i].key.substring(0, this.imagesArr[i].length - 3)) {
+          if (item.Key.substring(0, item.length - 3) == this.imagesArr[i].Key.substring(0, this.imagesArr[i].length - 3)) {
+          // if (item.key.substring(0, item.length - 3) == this.imagesArr[i].key.substring(0, this.imagesArr[i].length - 3)) {
             return undefined
           } else {
             return item

+ 24 - 13
src/components/ledger/system/dialog/addEquipDialog.vue

@@ -15,16 +15,19 @@
     </el-row>
 
     <div class="table-box">
-      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
-        @selection-change="handleSelectionChange">
+      <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle"
+                ref="multipleTable"
+                @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
-            <div>{{scope.row.EquipLocalName||scope.row.EquipName||''}}</div>
+            <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
+        <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
+                         min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
@@ -32,9 +35,11 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="page.total"></el-pagination>
+      <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :total="page.total"></el-pagination>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="dialogVisible = false">取 消</el-button>
@@ -44,10 +49,11 @@
 </template>
 
 <script>
-import { sysLinkEquip, unSysEq } from "@/api/scan/request";
+import {sysLinkEquip, unSysEq} from "@/api/scan/request";
 import floorCascader from "@/components/ledger/lib/floorCascader";
 import myCascader from "@/components/ledger/system/lib/equipType";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
+
 export default {
   components: {
     floorCascader,
@@ -91,7 +97,8 @@ export default {
     type: String, //选中的tab页
     params: Object //查看的竖井关系信息
   },
-  created() { },
+  created() {
+  },
   methods: {
     //修改建筑楼层
     changeFloor(value) {
@@ -109,7 +116,7 @@ export default {
       let params = {
         data: {
           Filters: `not EquipID isNull`,
-          Cascade: [{ Name: "equipCategory" }],
+          Cascade: [{Name: "equipCategory"}],
           Orders: "createTime desc, EquipID desc",
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize
@@ -172,6 +179,7 @@ export default {
     //修改设备类别
     changeDevice(value) {
       this.Equipcategory = value.code;
+      this.page.pageNumber = 1
       this.getTableData();
     },
     //改变pagesize
@@ -196,14 +204,17 @@ export default {
   .filters {
     margin-bottom: 10px;
   }
+
   .table-box {
     height: 370px;
+
     .fr {
       margin-top: 10px;
     }
   }
 }
+
 /deep/ #buildFloor .buildFloor {
   margin: 0 5px 0 5px;
 }
-</style>
+</style>

+ 4 - 0
src/components/relation/overview/CardList.vue

@@ -168,6 +168,7 @@
       :TableVisibleMoreLoading="TableVisibleMoreLoading"
       @openComputed="openComputed"
       @RelationType="RelationType"
+      @Refresh="Refresh"
     />
   </div>
 
@@ -225,6 +226,9 @@
     computed: {},
 
     methods: {
+      Refresh() {
+        this.$emit('Refresh')
+      },
       explain() {
         // alert('explain click')
       },

+ 2 - 1
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -519,7 +519,7 @@
       },
 
       promptly() {
-    
+
         if (this.isComputed.IsAutomatic && !this.isComputed.IsSource) { //需要自动计算并且不需要配置云末端
           this.$emit('RelationType', this.isComputed.RelationType, this.isComputed.ZoneType)
         }
@@ -593,6 +593,7 @@
         }
         calcSpecial(params, res => {
           this.$message.success('计算成功')
+          this.$emit('Refresh')
         })
 
       },

+ 10 - 10
src/framework/layout/PageHeader.vue

@@ -22,16 +22,16 @@
               yanruolan
               <i class='el-icon-fa-user el-icon--right'></i>
           </span>
-      <!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->
-      <!--                <span class='el-dropdown-link'>-->
-      <!--                    {{ userInfo.userName }}-->
-      <!--                    <i class='el-icon-fa-user el-icon&#45;&#45;right'></i>-->
-      <!--                </span>-->
-      <!--        <el-dropdown-menu slot='dropdown'>-->
-      <!--          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>-->
-      <!--          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>-->
-      <!--        </el-dropdown-menu>-->
-      <!--      </el-dropdown>-->
+<!--      <el-dropdown trigger='hover' class='user-menu-dropdown' @command='userMenuCommand'>-->
+<!--                      <span class='el-dropdown-link'>-->
+<!--                          {{ userInfo.userName }}-->
+<!--                          <i class='el-icon-fa-user el-icon&#45;&#45;right'></i>-->
+<!--                      </span>-->
+<!--        <el-dropdown-menu slot='dropdown'>-->
+<!--          <el-dropdown-item icon='el-icon-plus' command='logout'>退出</el-dropdown-item>-->
+<!--          <el-dropdown-item icon='el-icon-circle-plus'>修改密码</el-dropdown-item>-->
+<!--        </el-dropdown-menu>-->
+<!--      </el-dropdown>-->
       <ul class="header-nav">
         <li class="header-nav-Splitscreen">
           <a href="/splitScreen" target="_blank"><i class="el-icon-s-platform"></i></a>

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

@@ -1,3 +1,4 @@
+
 import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import lStorage from '@/utils/localStorage'

+ 1 - 0
src/views/ledger/cenotelist/index.vue

@@ -307,6 +307,7 @@ export default {
         data: "SpaceList",
         renderer: (instance, td, row, col, prop, value, cellProperties) => {
           td.style.color = "#409EFF";
+          td.style.cursor = "pointer";
           td.innerHTML = `<span>${value?value.length:0}</span>`
           return td;
         },

+ 5 - 0
src/views/relation/overview/index.vue

@@ -7,6 +7,7 @@
       @calcSpecial="calcSpecial"
       @openComputed="openComputed"
       @RelationType="RelationType"
+      @Refresh="Refresh"
     />
   </div>
 </template>
@@ -223,6 +224,10 @@ export default {
       sysDirection(param, res => {
         this.init();
       });
+    },
+    Refresh() {
+
+      this.init()
     }
   }
 };

+ 0 - 1
src/views/system/auth/index.vue

@@ -22,7 +22,6 @@ export default {
     this.$router.replace({path: "/"})
     // this.$store.dispatch('layout/loadUserInfo').then(resp => {
     //     console.log('store dispatch result ', resp)
-    //     // if (resp.result  == 'success') {
     //     if (resp.Result  == 'success') {
     //         let lastRoute = this.$store.getters['lastRoute']
     //         console.log('last route ', lastRoute)