Переглянути джерело

Merge remote-tracking branch 'origin/main'

zhanghao 1 місяць тому
батько
коміт
6c2b245fec

BIN
src/assets/images/service_new/maeX.png


+ 3 - 3
src/components/VideoComponent/index.vue

@@ -123,9 +123,9 @@ export default {
     initViewer() {
       const that = this;
       let apiUrl = '/uvp-backend-common/api/v1/authorization';
-      if (apiUrl.startsWith('/sxgw')) {
-        apiUrl = apiUrl.substring(4);
-      }
+      // if (apiUrl.startsWith('/sxgw')) {
+      //   apiUrl = apiUrl.substring(4);
+      // }
       DataFunc.post(apiUrl, {
         ak: that.cameraConfig.ak,
         sk: that.cameraConfig.sk

+ 4 - 17
src/utils/request2.js

@@ -17,7 +17,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
+  // baseURL: process.env.VUE_APP_BASE_API,
   // 超时
   timeout: 60 * 60 * 1000
 })
@@ -29,13 +29,7 @@ service.interceptors.request.use(config => {
   // 是否需要防止数据重复提交
   const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
   if (getToken()) {
-     const loginPath = isPadDevice() ? 2 : 1;
- // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-      if(loginPath==1){
-        config.headers['SX-Access-Token'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      }else{
-        config.headers['SX-Access-Token'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      }
+        config.headers['SX-Access-Token'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改    
   }
   // 请求参数加密
   if (process.env.VUE_APP_AES_ENCRYPT_ENABLED == 'true') {
@@ -110,7 +104,7 @@ service.interceptors.response.use(
     }
 
     // 判断是否为登录接口
-    if (res.config.url.includes('/login' || res.config.url.includes('/loginPad'))) {
+    if (res.config.url.includes('/login')) {
       // 跳过登录接口的统一处理,交由业务逻辑处理
       if (code !== 200) {
         return Promise.reject(res.data); // 返回原始错误数据
@@ -128,14 +122,7 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-             const loginPath = isPadDevice() ? 2 : 1;
-            // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-            if(loginPath==1){
-              location.href = '#/login';
-              }else{
-                location.href = '#/loginPad';
-              }
-
+              location.href = '#/login';         
           });
         }).catch(() => {
           isRelogin.show = false;

+ 2 - 1
src/views/pad/building/energyRateDialog.vue

@@ -128,8 +128,9 @@
                     <transition name="fade-grow">
                       <div class="machine" v-if="macShow">
                         <div class="macBox">
+                          <div @click="macShow = !macShow" style="position: absolute;right: 25px;top: 25px;"> <img src="@/assets/images/service_new/maeX.png"></div>
                           <div class="content-title">
-                            <span class="title">机房总用电量</span>
+                            <span @click="macShow = !macShow"  class="title">机房总用电量</span>
                           </div>
                           <div class="leftNavList">
                             <div class="left-list">

+ 1 - 1
src/views/pad/engineering/monitorLiveList.vue

@@ -228,7 +228,7 @@ export default {
         left:0;
         bottom: 0;
         width: 100%;
-        height: 25px;
+        height: 55px;
         opacity: 0.55;
         background: #000000;
         display: flex;

+ 172 - 146
src/views/pad/engineering/unitProjectDia.vue

@@ -1,167 +1,193 @@
 <template>
-    <div class="myDiaList">
-      <div class="title">已接入项目数量</div>
-      <div class="closeBtn" @click="close"></div>
-      <div class="flex-container">
-        <div class="header">
-          <div class="flex-column">项目名称</div>
-          <div class="flex-column">摄像头数量</div>
-        </div>
-        <div class="dataList">
-          <div class="flex-row" v-for="(item,index) in dataList" :key="index" @click="choose(item.id)">
-            <div class="flex-column">{{item.projectName}}</div>
-            <div class="flex-column">{{item.cameraNum}}</div>
-          </div>
+  <div class="myDiaList">
+    <div class="title">已接入项目数量</div>
+    <div class="closeBtn" @click="close"></div>
+    <div class="flex-container">
+      <div class="header">
+        <div class="firX">项目名称</div>
+        <div class="firY">摄像头数量</div>
+      </div>
+      <div class="dataList">
+        <div class="flex-row" v-for="(item,index) in dataList" :key="index" @click="choose(item.id)">
+          <div class="groX">{{item.projectName}}</div>
+          <div class="groY">{{item.cameraNum}}</div>
         </div>
       </div>
     </div>
-  </template>
-
-  <script>
-  import {getFoodsList, planCheckList} from "@/api/screen/service";
-  import pinyin from "../data/pinyin.js";
-  import { etCameraNumList } from "@/api/screen/service"
-  export default {
-    name: "UnitCamera",
-    props: {
-      week: {
-        type: String,
-        default: "",
-      },
-      appOrg: {
-        type: String,
-        default: "10001",
-      },
-      curCompanyear:{
-        type: String,
-        default: "",
-      }
+  </div>
+</template>
+
+<script>
+import {getFoodsList, planCheckList} from "@/api/screen/service";
+import pinyin from "../data/pinyin.js";
+import { etCameraNumList } from "@/api/screen/service"
+export default {
+  name: "UnitCamera",
+  props: {
+    week: {
+      type: String,
+      default: "",
     },
-    data() {
-      return {
-        dataList: [],
-      };
+    appOrg: {
+      type: String,
+      default: "10001",
     },
-    created () {
-      this.etCameraNumList()
+    curCompanyear:{
+      type: String,
+      default: "",
+    }
+  },
+  data() {
+    return {
+      dataList: [],
+    };
+  },
+  created () {
+    this.etCameraNumList()
+  },
+  mounted() {},
+  methods: {
+    choose(appOrg){
+      this.$emit("choose",appOrg);
     },
-    mounted() {},
-    methods: {
-      choose(appOrg){
-        this.$emit("choose",appOrg);
-      },
-      etCameraNumList(){
-        etCameraNumList(this.$props.curCompanyear).then((res) => {
-          if (Number(res.code) === 200) {
-            this.dataList = res.data;
-            this.dataList.forEach((item, index) => {
-              item.id = item.id;
-            });
-          }
-        });
-      },
-      close() {
-        this.$emit("close");
-      },
+    etCameraNumList(){
+      etCameraNumList(this.$props.curCompanyear).then((res) => {
+        if (Number(res.code) === 200) {
+          this.dataList = res.data;
+          this.dataList.forEach((item, index) => {
+            item.id = item.id;
+          });
+        }
+      });
     },
-  };
-  </script>
-
-  <style lang="scss" scoped>
-  .myDiaList {
-    position: relative;
-    width: 668px;
-    height: 432px;
-    background: url("../../../assets/images/main/dialog-bg.png") no-repeat;
-    background-size: cover;
-  }
-
-  .title {
-    color: #00FFFF;
-    height: 40px;
-    padding: 8px 0 8px 25px;
-  }
-
-  .closeBtn{
-    position: absolute;
-    right: 10px;
-    top: 5px;
-    width: 25px;
-    height: 25px;
-    cursor: pointer;
+    close() {
+      this.$emit("close");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.myDiaList {
+  position: relative;
+  width: 668px;
+  height: 432px;
+  background: url("../../../assets/images/main/dialog-bg.png") no-repeat;
+  background-size: cover;
+}
+
+.title {
+  color: #00FFFF;
+  height: 40px;
+  padding: 8px 0 8px 25px;
+}
+
+.closeBtn{
+  position: absolute;
+  right: 10px;
+  top: 5px;
+  width: 25px;
+  height: 25px;
+  cursor: pointer;
+}
+
+.flex-container {
+  width: 100%;
+  padding: 0 10px 0;
+}
+
+.header{
+  display: flex;  /* 每行使用 flexbox 布局 */
+  position: relative;
+  width: 100%;
+  background-color: rgba(21, 105, 107, 0.5);
+  .firX{
+    width: 70%;
+    padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
   }
-
-  .flex-container {
-    width: 100%;
-    padding: 0 10px 0;
+  .firY{ 
+   padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+    width: 30%;
   }
+}
 
-  .header{
-    display: flex;  /* 每行使用 flexbox 布局 */
-    position: relative;
-    background-color: rgba(21, 105, 107, 0.5);
-  }
-
-  .dataList{
-    height: 400px;
-    overflow: auto;
-    background: radial-gradient(
+.dataList{
+  height: 400px;
+  overflow: auto;
+  background: radial-gradient(
         190% 71% at 50% 49%,
         rgba(21, 105, 107, 0.54) 0%,
         rgba(27, 95, 97, 0) 100%
   )
-  }
-
-  .dataList::-webkit-scrollbar {
-    display: none;
-  }
-
-  .flex-row {
-    display: flex;  /* 每行使用 flexbox 布局 */
-    position: relative;
-  }
-
-  .flex-row::before{
-    content: "";
-    height: 15px;
-    border-left: 2px #00FFFF solid;
-    position: absolute;
-    left: 0;
-    top: 10px
-  }
-
-  .flex-column {
-    flex: 1;  /* 每列均分可用空间 */
+}
+
+.dataList::-webkit-scrollbar {
+  display: none;
+}
+
+.flex-row {
+  display: flex;  /* 每行使用 flexbox 布局 */
+  position: relative;
+  width: 100%;
+  .groX{
+    width: 70%;
     padding: 8px 12px;
-    text-align: left;  /* 左对齐文本 */
-    color: white;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
   }
-
-  .header .flex-column {
-    color: #00ffff;
+  .groY{ 
+   padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+    width: 30%;
   }
-
-  .el-scrollbar {
-    background: #15696b;
-    border: 1px solid #00ffff;
-    ul {
-      li {
-        color: #fff;
-      }
+}
+
+.flex-row::before{
+  content: "";
+  height: 15px;
+  border-left: 2px #00FFFF solid;
+  position: absolute;
+  left: 0;
+  top: 10px
+}
+
+.flex-column {
+  flex: 1;  /* 每列均分可用空间 */
+  padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+}
+
+.header .flex-column {
+  color: #00ffff;
+}
+
+.el-scrollbar {
+  background: #15696b;
+  border: 1px solid #00ffff;
+  ul {
+    li {
+      color: #fff;
     }
   }
-  .el-select-dropdown__item.hover,
-  .el-select-dropdown__item:hover {
-    background: #15696b;
-    color: #00ffff;
-  }
-  .el-select-dropdown__item.selected {
-    color: #00ffff;
-  }
-  .el-select .el-input .el-select__caret {
-    display: none;
-  }
-
-
-  </style>
+}
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background: #15696b;
+  color: #00ffff;
+}
+.el-select-dropdown__item.selected {
+  color: #00ffff;
+}
+.el-select .el-input .el-select__caret {
+  display: none;
+}
+
+
+</style>
 

+ 4 - 2
src/views/screen/building/energyRateDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="main-data dialog-area" @click.stop="preventDefault"  @mouseleave="leaveFun">
+  <div class="main-data dialog-area" @click.stop="preventDefault" @mouseleave="leaveFun">
     <div class="dialog-title">
       <img src="@/assets/images/main/cont_title_bg.png" />
       <div class="title">楼宇中控</div>
@@ -127,9 +127,11 @@
                     <!-- 机房总用电量 -->
                     <transition name="fade-grow">
                       <div class="machine" v-if="macShow">
+                        
                         <div class="macBox">
+                          <div @click="macShow = !macShow" style="position: absolute;right: 25px;top: 25px;"> <img src="@/assets/images/service_new/maeX.png"></div>
                           <div class="content-title">
-                            <span class="title">机房总用电量</span>
+                            <span @click="macShow = !macShow" class="title">机房总用电量</span>
                           </div>
                           <div class="leftNavList">
                             <div class="left-list">

+ 1 - 1
src/views/screen/engineering/monitorLiveList.vue

@@ -228,7 +228,7 @@ export default {
         left:0;
         bottom: 0;
         width: 100%;
-        height: 25px;
+        height: 55px;
         opacity: 0.55;
         background: #000000;
         display: flex;

+ 30 - 4
src/views/screen/engineering/unitProjectDia.vue

@@ -4,13 +4,13 @@
     <div class="closeBtn" @click="close"></div>
     <div class="flex-container">
       <div class="header">
-        <div class="flex-column">项目名称</div>
-        <div class="flex-column">摄像头数量</div>
+        <div class="firX">项目名称</div>
+        <div class="firY">摄像头数量</div>
       </div>
       <div class="dataList">
         <div class="flex-row" v-for="(item,index) in dataList" :key="index" @click="choose(item.id)">
-          <div class="flex-column">{{item.projectName}}</div>
-          <div class="flex-column">{{item.cameraNum}}</div>
+          <div class="groX">{{item.projectName}}</div>
+          <div class="groY">{{item.cameraNum}}</div>
         </div>
       </div>
     </div>
@@ -99,7 +99,20 @@ export default {
 .header{
   display: flex;  /* 每行使用 flexbox 布局 */
   position: relative;
+  width: 100%;
   background-color: rgba(21, 105, 107, 0.5);
+  .firX{
+    width: 70%;
+    padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+  }
+  .firY{ 
+   padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+    width: 30%;
+  }
 }
 
 .dataList{
@@ -119,6 +132,19 @@ export default {
 .flex-row {
   display: flex;  /* 每行使用 flexbox 布局 */
   position: relative;
+  width: 100%;
+  .groX{
+    width: 70%;
+    padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+  }
+  .groY{ 
+   padding: 8px 12px;
+  text-align: left;  /* 左对齐文本 */
+  color: white;
+    width: 30%;
+  }
 }
 
 .flex-row::before{