tui

portal-manager-ui/admin/src/views/dataActuary/dataActuary.vue

@@ -153,6 +153,7 @@ export default {
               font-size: 18px;
               font-weight: bold;
               padding-bottom: 10px;
+              text-align: center;
             }
             .remark {
               font-size: 14px;

portal-manager-ui/admin/src/views/home/home.vue

@@ -117,6 +117,7 @@ export default {
         key: Storage.get(2, "siteId") ? Storage.get(2, "siteId") : "暂无站点", // 当前站点
       },
       userInfo: Storage.get(2, "userInfo"), // 用户信息
+      routeInfo: "",
     };
   },
   created() {
@@ -143,7 +144,9 @@ export default {
       this.$bus.$emit("changeSite");
     },
     handelClick(item) {
+      this.routeInfo = "";
       if (item.key !== this.$route.path) {
+        sessionStorage.setItem("routeInfo", item.key);
         this.$router.push(item.key);
         // this.showPage = true;
       } else {
@@ -161,24 +164,36 @@ export default {
       });
     },
     Logout() {
+      let _this = this;
+      this.$confirm({
+        title: "您是否确定退出登录?",
+        onOk() {
           LogoutInterface({}).then((res) => {
             // this.$message.success(res.msg);
-        this.$Storage.remove(2, "Authorization");
-        this.$Storage.remove(2, "siteId");
-        this.$Storage.remove(2, "siteName");
-        this.$Storage.remove(2, "userInfo");
-        this.SET_USERDATA({});
+            _this.$Storage.remove(2, "Authorization");
+            _this.$Storage.remove(2, "siteId");
+            _this.$Storage.remove(2, "siteName");
+            _this.$Storage.remove(2, "userInfo");
+            sessionStorage.removeItem("routeInfo");
+            _this.SET_USERDATA({});
             setTimeout(() => {
-          this.$router.replace({ path: "/" });
+              _this.$router.replace({ path: "/" });
             }, 200);
           });
         },
+        onCancel() {},
+      });
+    },
     fnChangePassword() {
       this.visibleEditPwd = true;
     },
     // 返回门户
     backHome() {
-      this.$router.push("/home/dataManagement/dataAdmin");
+      this.$router.push(
+        sessionStorage.getItem("routeInfo")
+          ? sessionStorage.getItem("routeInfo")
+          : "/home/dataManagement/dataAdmin"
+      );
     },
   },
 };

portal-manager-ui/admin/src/views/thePlatformIsSet/components/APIServe/APIServe.vue

@@ -3,16 +3,26 @@
     <div class="search_box" ref="search_box">
       <h3>API服务</h3>
       <h4>
-        <a-input placeholder="请输入API名称搜索" v-model="searchVal" @pressEnter="getServiceApiList" />
+        <a-input
+          placeholder="请输入API名称搜索"
+          v-model="searchVal"
+          @pressEnter="getServiceApiList"
+          allow-clear
+        />
         <button class="search_btn btn" @click="handleSearch">
-          <span>{{ isSearch ? "重置" : "搜索" }}</span>
+          <span>搜索</span>
+          <!-- <span>{{ isSearch ? "重置" : "搜索" }}</span> -->
         </button>
       </h4>
     </div>
     <div class="stepbox" :style="{ height: contentHigh + 'px' }">
       <div class="_left">
         <a-steps progress-dot direction="vertical">
-          <a-step v-for="(item, index) in stepsList" :status="active === index ? 'process' : 'wait'" :key="index">
+          <a-step
+            v-for="(item, index) in stepsList"
+            :status="active === index ? 'process' : 'wait'"
+            :key="index"
+          >
             <span slot="title" @click="handleChange(item, index)">{{
               item.productName
             }}</span>
@@ -25,10 +35,19 @@
             <span class="list_title">{{ curApiInfo.name }}</span>
             <span class="count primary">{{ curApiInfo.total }}</span>
           </div>
-          <div class="list flex aic jcb" v-for="v in curApiInfo.list" :key="v.id">
+          <div
+            class="list flex aic jcb"
+            v-for="v in curApiInfo.list"
+            :key="v.id"
+          >
             <div class="api-name">{{ v.interfaceName }}</div>
             <span class="service-name">{{ v.description }}</span>
-            <a-button icon="read" type="primary" class="addclass" @click="pushroeuter(v)">
+            <a-button
+              icon="read"
+              type="primary"
+              class="addclass"
+              @click="pushroeuter(v)"
+            >
               查看文档
             </a-button>
           </div>
@@ -73,7 +92,7 @@ export default {
         if (code == 1) {
           if (data.data.length) {
             this.stepsList = data.data;
-            this.getApiDetail(data.data[0])
+            this.getApiDetail(data.data[0]);
           } else {
             this.curApiInfo = {};
           }
@@ -82,33 +101,38 @@ export default {
     },
 
     getApiDetail(item) {
-      getInterfaceList({ page: 1, size: -1, productId: item.id }).then((res) => {
+      getInterfaceList({ page: 1, size: -1, productId: item.id }).then(
+        (res) => {
           let { code, data } = res;
           if (code == 1) {
             this.curApiInfo = {
               name: item.productName,
               list: data.data,
-            total: data.total
+              total: data.total,
+            };
           }
         }
-      });
+      );
     },
     handleSearch() {
-      this.isSearch = !this.isSearch;
-      if (this.isSearch) {
-        this.active = -1;
-        this.getServiceApiList();
-      } else {
-        this.searchVal = "";
       this.active = 0;
       this.getServiceApiList();
-      }
+
+      // this.isSearch = !this.isSearch;
+      // if (this.isSearch) {
+      //   this.active = -1;
+      //   this.getServiceApiList();
+      // } else {
+      //   this.searchVal = "";
+      //   this.active = 0;
+      //   this.getServiceApiList();
+      // }
     },
     // 切换设备
     handleChange(row, index) {
       this.active = index;
       this.searchVal = "";
-      this.getApiDetail(row)
+      this.getApiDetail(row);
     },
     pushroeuter(v) {
       this.$router.push({
@@ -138,7 +162,9 @@ export default {
     align-items: center;
     display: flex;
     flex-flow: column;
-
+    /deep/.ant-input-affix-wrapper .ant-input-suffix {
+      right: 70px !important;
+    }
     h3 {
       font-size: 2.4rem;
       color: #fff;
@@ -177,7 +203,7 @@ export default {
       padding: 0;
       border: none;
 
-      &>span {
+      & > span {
         position: relative;
         display: block;
         width: 100%;
@@ -221,8 +247,8 @@ export default {
         width: 100%;
       }
 
-      &>span:before,
-      &>span:after {
+      & > span:before,
+      & > span:after {
         position: absolute;
         content: "";
         left: 0;
@@ -235,21 +261,21 @@ export default {
         transition: all 0.3s ease;
       }
 
-      &>span:before {
+      & > span:before {
         width: 2px;
         height: 0%;
       }
 
-      &>span:after {
+      & > span:after {
         height: 2px;
         width: 0%;
       }
 
-      &>span:hover:before {
+      & > span:hover:before {
         height: 100%;
       }
 
-      &>span:hover:after {
+      & > span:hover:after {
         width: 100%;
       }
     }
@@ -350,15 +376,21 @@ export default {
     width: 100%;
     height: @headerH;
     background: rgb(59, 135, 255);
-    background: -moz-linear-gradient(174deg,
+    background: -moz-linear-gradient(
+      174deg,
       rgba(59, 135, 255, 1) 24%,
-        rgba(108, 53, 247, 1) 85%);
-    background: -webkit-linear-gradient(174deg,
+      rgba(108, 53, 247, 1) 85%
+    );
+    background: -webkit-linear-gradient(
+      174deg,
       rgba(59, 135, 255, 1) 24%,
-        rgba(108, 53, 247, 1) 85%);
-    background: linear-gradient(174deg,
+      rgba(108, 53, 247, 1) 85%
+    );
+    background: linear-gradient(
+      174deg,
       rgba(59, 135, 255, 1) 24%,
-        rgba(108, 53, 247, 1) 85%);
+      rgba(108, 53, 247, 1) 85%
+    );
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1);
   }
 }

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/setMenuPerms.vue

@@ -164,7 +164,9 @@
                 </div>
               </div>
               <div class="bottom_">
-                <a-button type="primary" class="addclass"  @click="save">保存</a-button>
+                <a-button type="primary" class="addclass" @click="save"
+                  >保存</a-button
+                >
                 <a-button @click="resetForm">重置</a-button>
               </div>
             </div>
@@ -231,9 +233,54 @@ export default {
         menu;
       // this.menusList = res.data;
       if (sjgl && sjgl.length) this.permsForm.seleteDataManage = sjgl;
+
+      this.dataManage.childList &&
+        this.dataManage.childList.forEach((v) => {
+          v.checked = false;
+          this.permsForm.seleteDataManage &&
+            this.permsForm.seleteDataManage.forEach((val) => {
+              v.nodeId == val ? (v.checked = true) : "";
+            });
+        });
+      this.permsForm.checkAllManage = this.dataManage.childList.every(
+        (v) => v.checked
+      );
       if (zdbp && zdbp.length) this.permsForm.seleteDataArrange = zdbp;
+      this.dataArrange.childList &&
+        this.dataArrange.childList.forEach((v) => {
+          v.checked = false;
+          this.permsForm.seleteDataArrange &&
+            this.permsForm.seleteDataArrange.forEach((val) => {
+              v.nodeId == val ? (v.checked = true) : "";
+            });
+        });
+      this.permsForm.checkAllArrange = this.dataArrange.childList.every(
+        (v) => v.checked
+      );
       if (sjjs && sjjs.length) this.permsForm.seleteDataCalculate = sjjs;
+      this.dataCalculate.childList &&
+        this.dataCalculate.childList.forEach((v) => {
+          v.checked = false;
+          this.permsForm.seleteDataCalculate &&
+            this.permsForm.seleteDataCalculate.forEach((val) => {
+              v.nodeId == val ? (v.checked = true) : "";
+            });
+        });
+      this.permsForm.checkAllCalculate = this.dataCalculate.childList.every(
+        (v) => v.checked
+      );
       if (ptsz && ptsz.length) this.permsForm.seleteDataSet = ptsz;
+      this.dataSet.childList &&
+        this.dataSet.childList.forEach((v) => {
+          v.checked = false;
+          this.permsForm.seleteDataSet &&
+            this.permsForm.seleteDataSet.forEach((val) => {
+              v.nodeId == val ? (v.checked = true) : "";
+            });
+        });
+      this.permsForm.checkAllSet = this.dataSet.childList.every(
+        (v) => v.checked
+      );
     },
     // 获取角色菜单列表
     getRoleInfo() {