From 77d0a4b118c92d6896550b9e0e1922974fdd2c56 Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Wed, 30 Oct 2024 14:31:39 +0800
Subject: [PATCH] 10.30

---
 fuintAdmin_zt/src/views/Site/add.vue          | 21 ++++++++++++++-----
 .../src/views/homeComponents/agent.vue        |  2 +-
 fuintAdmin_zt/src/views/setting/hardware.vue  |  9 ++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Site/add.vue b/fuintAdmin_zt/src/views/Site/add.vue
index 6695817b2..77c7c73a6 100644
--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ b/fuintAdmin_zt/src/views/Site/add.vue
@@ -51,6 +51,9 @@ export default {
 
   },
   methods: {
+    goback(){
+      this.$router.go(-1)
+    },
     // 查询菜单树结构
     getMenuTreeselect() {
       // merchantId 代表deptType
@@ -311,7 +314,11 @@ export default {
 </script>
 
 <template>
-  <div class="container">
+  <div>
+    <div class="top-box">
+      <span style="cursor: pointer; text-indent: 20px;" @click="goback()">当前位置：机构管理 / 角色信息  /  新增角色</span>
+    </div>
+    <div class="container">
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px">
     <div class="top-box">
 <!--      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
@@ -410,6 +417,8 @@ export default {
     </div>
     </el-form>
   </div>
+  </div>
+
 </template>
 
 <style scoped lang="scss">
@@ -420,15 +429,17 @@ export default {
   background: #f4f5f9;
 }
 
-.top-box {
+.top-box{
   width: 100%;
+  background: #fff;
   box-sizing: border-box;
   padding: 20px;
   display: flex;
   align-items: center;
-  background: #FFFFFF;
-  box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
-  border-radius: 10px 10px 10px 10px;
+  font-weight: 400;
+  font-size: 14px;
+  color: #999;
+  padding-left: 25px;
 }
 
 .demo-ruleForm {
diff --git a/fuintAdmin_zt/src/views/homeComponents/agent.vue b/fuintAdmin_zt/src/views/homeComponents/agent.vue
index 8b3e4948a..69806480e 100644
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@@ -284,7 +284,7 @@ export default {
         start.setMinutes(0)
         start.setSeconds(0)
         start.setMilliseconds(0)
-        this.value2 = [start,new Date()];
+        this.value2 = [parseTime(start),parseTime(new Date())];
       } else if (this.timeList[index]=='近一周'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue
index 8b99b5487..79067dc88 100644
--- a/fuintAdmin_zt/src/views/setting/hardware.vue
+++ b/fuintAdmin_zt/src/views/setting/hardware.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="card-change" >
+  <div class="card-change"  style="min-height: 500px; margin-left: 20px; margin-top: 20px; margin-right: 20px;" shadow="never">
+    <div>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
         <el-form-item label="" prop="name">
           <el-input
@@ -374,5 +374,10 @@ export default {
   width: 98px;
   height: 98px;
 }
+
+
+
+
+
 </style>