tui

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

 <template>
   <div class="view">
-    <a-result
-      status="404"
-      title="404"
-      sub-title="Sorry, the page you visited does not exist."
-    >
+    <a-result status="404" title="404" sub-title="暂无内容">
       <template #extra>
-        <a-button type="primary" class="addclass"  @click="$router.push('/home')">
+        <a-button type="primary" class="addclass" @click="$router.push(url)">
           返回首页
         </a-button>
       </template>
@@ -19,12 +15,18 @@ export default {
   name: "PortalAdminVueNotFoundView",
 
   data() {
-    return {};
+    return {
+      url: "/home",
+    };
+  },
+  created() {
+    this.$route.path.indexOf("/home/thePlatformIsSet") == 0
+      ? (this.url = "/home/thePlatformIsSet")
+      : "";
   },
-
-  mounted() {},
 
   methods: {},
+  watch: {},
 };
 </script>
 

portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/makeTrendResearch.vue

@@ -90,11 +90,19 @@ export default {
           title: "整体同比",
           align: "center",
           dataIndex: "整体同比",
+          customRender: (text, record, index) => {
+            console.log(text);
+            return text + "%";
+          },
         },
         {
           title: "整体环比",
           align: "center",
           dataIndex: "整体环比",
+          customRender: (text, record, index) => {
+            console.log(text);
+            return text + "%";
+          },
         },
       ],
     };

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

@@ -3,7 +3,13 @@
     <div class="content">
       <div class="top">
         <h1 class="title_text">{{ detailsForm.interfaceName }}</h1>
-        <a-button type="primary" class="addclass" @click="$router.go(-1)" style="margin-bottom: 1rem">返回上一级</a-button>
+        <a-button
+          type="primary"
+          class="addclass"
+          @click="$router.go(-1)"
+          style="margin-bottom: 1rem"
+          >返回上一级</a-button
+        >
       </div>
       <a-card title="接口信息" :bordered="false" class="card_box">
         <a-descriptions>
@@ -22,12 +28,21 @@
           <a-descriptions-item label="content-type">{{
             detailsForm.contentType
           }}</a-descriptions-item>
-          <a-descriptions-item label="超时时长">{{ detailsForm.timeoutValue }}秒</a-descriptions-item>
+          <a-descriptions-item label="超时时长"
+            >{{ detailsForm.timeoutValue }}秒</a-descriptions-item
+          >
           <a-descriptions-item label="限流策略">{{
             detailsForm.limitStrategy == 1 ? "分钟" : "小时"
           }}</a-descriptions-item>
-          <a-descriptions-item label="访问网络" v-if="detailsForm && detailsForm.network">
-            <span v-for="(item, idx) of dict.network" v-show="detailsForm.network.indexOf(idx) != -1" :key="idx">
+          <a-descriptions-item
+            label="访问网络"
+            v-if="detailsForm && detailsForm.network"
+          >
+            <span
+              v-for="(item, idx) of dict.network"
+              v-show="detailsForm.network.indexOf(idx) != -1"
+              :key="idx"
+            >
               {{ item }}
             </span>
           </a-descriptions-item>
@@ -49,7 +64,7 @@
       </a-card>
       <a-card title="请求参数" :bordered="false" class="card_box">
         <div class="flex aic jcb mb10">
-          <a-radio-group v-model="requestPam.type" button-style="solid" disabled>
+          <a-radio-group v-model="requestPam.type" button-style="solid">
             <a-radio-button value="path"> 路径参数 </a-radio-button>
             <a-radio-button value="headers"> headers </a-radio-button>
             <a-radio-button value="query"> query </a-radio-button>
@@ -60,8 +75,15 @@
             <div>{{ detailsForm.inEncrypt == 1 ? "加密" : "不加密" }}</div>
           </div>
         </div>
-        <a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
-          :columns="table_columns" :dataSource="requestPam.table">
+        <a-table
+          size="middle"
+          bordered
+          :row-key="(record) => record.id"
+          :locale="{ emptyText: '无' }"
+          :pagination="false"
+          :columns="table_columns"
+          :dataSource="requestPam.table"
+        >
         </a-table>
       </a-card>
 
@@ -72,8 +94,15 @@
             <div>{{ detailsForm.outEncrypt == 1 ? "加密" : "不加密" }}</div>
           </div>
         </div>
-        <a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
-          :columns="table_columns" :dataSource="responsePam.table">
+        <a-table
+          size="middle"
+          bordered
+          :row-key="(record) => record.id"
+          :locale="{ emptyText: '无' }"
+          :pagination="false"
+          :columns="table_columns"
+          :dataSource="responsePam.table"
+        >
         </a-table>
       </a-card>
 
@@ -92,8 +121,15 @@
         </div>
       </a-card>
       <a-card title="变更记录" :bordered="false" class="card_box">
-        <a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false"
-          :columns="table_columns_gb" :dataSource="[]">
+        <a-table
+          size="middle"
+          bordered
+          :row-key="(record) => record.id"
+          :locale="{ emptyText: '无' }"
+          :pagination="false"
+          :columns="table_columns_gb"
+          :dataSource="[]"
+        >
         </a-table>
       </a-card>
     </div>
@@ -276,7 +312,7 @@ export default {
         margin-bottom: 1rem;
       }
 
-      &+.card_box {
+      & + .card_box {
         margin-top: 1rem;
       }
     }
@@ -288,15 +324,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/dictionary/dictionary.vue

 <template>
   <div class="Container">
+    <div class="main">
+      <a-tabs v-model="tabsActive" @change="tabsChange" :forceRender="false">
+        <a-button
+          style="margin-right: 16px"
+          slot="tabBarExtraContent"
+          @click="$router.back()"
+          >返回上一级</a-button
+        >
+        <a-tab-pane :tab="tabsList['meta']['title']" :key="0"> </a-tab-pane>
+      </a-tabs>
       <div class="my-card">
-            <div class="head-menu">
-                <div>属性字典</div>
-            </div>
         <div class="pd20">
           <div class="from-item">
             <div class="name">排队机分辨率：</div>
             <div>
-                        <a-tag color="blue" closable v-for="item, index in fblList" :key="index">
+              <a-tag
+                color="blue"
+                closable
+                v-for="(item, index) in fblList"
+                :key="index"
+              >
                 {{ item.name }}
               </a-tag>
             </div>
-                    <a-button icon="plus" size="small" @click="addZdShow('fblList', '排队机分辨率')">添加字典值</a-button>
+            <a-button
+              icon="plus"
+              size="small"
+              @click="addZdShow('fblList', '排队机分辨率')"
+              >添加字典值</a-button
+            >
           </div>
           <div class="from-item">
             <div class="name">接口标签：</div>
             <div>
-                        <a-tag color="blue" closable v-for="item, index in bqList" :key="index">
+              <a-tag
+                color="blue"
+                closable
+                v-for="(item, index) in bqList"
+                :key="index"
+              >
                 {{ item.name }}
               </a-tag>
             </div>
-                    <a-button icon="plus" size="small" @click="addZdShow('bqList', '接口标签')">添加字典值</a-button>
+            <a-button
+              icon="plus"
+              size="small"
+              @click="addZdShow('bqList', '接口标签')"
+              >添加字典值</a-button
+            >
+          </div>
         </div>
       </div>
     </div>
 
-        <a-modal :title="VisibleTitle" :centered="true" :destroyOnClose="true" :visible="Visible" @cancel="Visible = false"
-            width="30%">
-            <a-form-model :label-col="{ span: 5 }" :wrapper-col="{ span: 19 }" layout="horizontal" ref="appInfoFome"
-                :model="appInfoFome" :rules="appInfoRules">
+    <a-modal
+      :title="VisibleTitle"
+      :centered="true"
+      :destroyOnClose="true"
+      :visible="Visible"
+      @cancel="Visible = false"
+      width="30%"
+    >
+      <a-form-model
+        :label-col="{ span: 5 }"
+        :wrapper-col="{ span: 19 }"
+        layout="horizontal"
+        ref="appInfoFome"
+        :model="appInfoFome"
+        :rules="appInfoRules"
+      >
         <a-form-model-item label="字典值" prop="productName">
-                    <a-input placeholder="请输入字典值" allowClear v-model="appInfoFome.productName" />
+          <a-input
+            placeholder="请输入字典值"
+            allowClear
+            v-model="appInfoFome.productName"
+          />
         </a-form-model-item>
       </a-form-model>
       <template slot="footer">
-                <a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button>
+        <a-button type="primary" class="addclass" @click="Modal_Ok"
+          >确定</a-button
+        >
         <a-button @click="resetForm">重置</a-button>
       </template>
     </a-modal>
@@ -43,19 +89,24 @@
 </template>
 
 <script>
+import { getItemData } from "@/utils/js/common.js";
 import common from "@/mixins/common";
 export default {
   name: "dictionary",
   mixins: [common],
   data() {
     return {
-            fblList: [{
-                name: "1920*1080"
-            }, {
-                name: "1080*1920"
-            }, {
-                name: "1280*1280"
-            }],
+      fblList: [
+        {
+          name: "1920*1080",
+        },
+        {
+          name: "1080*1920",
+        },
+        {
+          name: "1280*1280",
+        },
+      ],
       bqList: [
         { name: "政务外网" },
         { name: "便民服务" },
@@ -65,7 +116,7 @@ export default {
       Visible: false,
       appInfoFome: {
         productName: undefined,
-                siteId: JSON.parse(localStorage.getItem("siteId"))
+        siteId: JSON.parse(localStorage.getItem("siteId")),
       }, //页面表单信息
       appInfoRules: {
         productName: [
@@ -74,31 +125,34 @@ export default {
             whitespace: true, //必选时，空格是否会被视为错误
             message: "请输入字典值",
             trigger: "blur",
-                    }
+          },
         ],
       },
-            keyName: ""
+      keyName: "",
+      tabsActive: 0,
     };
   },
-    created() {
+  mounted() {},
+  computed: {
+    tabsList() {
+      return getItemData(this.$router.options.routes, "name", "dictionary");
     },
-    mounted() {
   },
   methods: {
     addZdShow(key, title) {
-            this.Visible = true
-            this.resetForm()
-            this.keyName = key
-            this.VisibleTitle = title
+      this.Visible = true;
+      this.resetForm();
+      this.keyName = key;
+      this.VisibleTitle = title;
     },
     Modal_Ok() {
       this.$refs.appInfoFome.validate((valid) => {
         if (valid) {
           this[this.keyName].push({
-                        name: this.appInfoFome.productName
-                    })
-                    this.Visible = false
-                    this.resetForm()
+            name: this.appInfoFome.productName,
+          });
+          this.Visible = false;
+          this.resetForm();
         } else {
           this.$message.error(`请完善表单信息！`);
           return false;
@@ -107,7 +161,13 @@ export default {
     },
     resetForm() {
       this.$nextTick(() => {
-                this.appInfoFome.productName = ''
+        this.appInfoFome.productName = "";
+      });
+    },
+    tabsChange(val) {
+      this.$router.push({
+        path: `/home/thePlatformIsSet/menuManagement/${val}`,
+        // query: { testoption: "test001" },
       });
     },
   },
@@ -115,6 +175,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@headerH: 4.5rem;
 .from-item {
   display: flex;
   align-items: center;
@@ -151,11 +212,40 @@ export default {
       line-height: 52px;
       font-size: 16px;
       font-weight: bold;
-            color: #0595FD;
-            border-bottom: 2px solid #0595FD;
+      color: #0595fd;
+      border-bottom: 2px solid #0595fd;
       padding: 0 30px;
       margin-left: 20px;
     }
   }
 }
+.Container {
+  height: 100% !important;
+  // background: #fac;
+  background: #f5f5f5;
+  display: flex;
+  flex-direction: column;
+  .main {
+    // background: #afc;
+    background: #ffffff;
+    border-radius: 6px;
+    flex: 1;
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin: 1.2rem 2rem;
+  }
+
+  .ant-tabs-nav {
+    .ant-tabs-tab {
+      margin: 0 !important;
+    }
+  }
+  .ant-tabs-tab {
+    font-size: 1rem !important;
+    & + .ant-tabs-tab {
+      margin: 0 !important;
+      margin-left: 0.7rem !important;
+    }
+  }
+}
 </style>

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

@@ -2,7 +2,7 @@
   <div class="logService">
     <div class="header_box">
       <a-space>
-        <a-input v-model="searchName" placeholder="请输入内容关键之搜索">
+        <a-input v-model="searchName" placeholder="请输入内容关键字搜索">
         </a-input>
         <a-range-picker
           format="YYYY年MM月DD日"

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

@@ -4,7 +4,10 @@
       <!-- <button class="addRoles_btn" @click="showRoleEditModal(false)">
         <span>新增角色</span>
       </button> -->
-      <a-button type="primary" class="addclass"  @click="showRoleEditModal(false)"
+      <a-button
+        type="primary"
+        class="addclass"
+        @click="showRoleEditModal(false)"
         >新增角色</a-button
       >
       <span>
@@ -40,8 +43,13 @@
             >编辑</a-button
           >
           <a-button
-            style="color: #ff4420"
+            :style="
+              userInfo.id == record.id
+                ? { color: '#3333' }
+                : { color: '#ff4420' }
+            "
             type="link"
+            :disabled="userInfo.id === record.id"
             @click="deleteRole(record, index)"
             >删除</a-button
           >
@@ -66,6 +74,7 @@ export default {
   name: "PortalAdminVueAuthorityMis",
   data() {
     return {
+      userInfo: {},
       searchRoleName: undefined,
       tableLoading: false,
       tablePagination: {
@@ -130,6 +139,10 @@ export default {
     //     remark: `该角色定义为省级权限${key + 1}`,
     //   });
     // }
+    localStorage.getItem("userInfo")
+      ? (this.userInfo = JSON.parse(localStorage.getItem("userInfo")))
+      : "";
+    console.log(this.userInfo);
     this.getRoleList();
   },
   methods: {
@@ -137,7 +150,7 @@ export default {
       let res = await roleList({
         page: this.tablePagination.current, //当前页
         size: this.tablePagination.pageSize, //每页条数
-        name: this.searchRoleName,
+        name: this.searchRoleName ? "%" + this.searchRoleName + "%" : "",
       });
       let { code, data, dict } = res;
       if (!data.data && this.tablePagination.current > 1) {

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

@@ -2,7 +2,9 @@
   <div class="user">
     <div class="user_btn">
       <div class="add_btn">
-        <a-button type="primary" class="addclass"  @click="addUserModal">新增用户</a-button>
+        <a-button type="primary" class="addclass" @click="addUserModal"
+          >新增用户</a-button
+        >
       </div>
       <div class="search_btn">
         <a-space>
@@ -25,7 +27,9 @@
               >{{ v.value }}</a-select-option
             >
           </a-select>
-          <a-button type="primary" class="addclass"  @click="getUserList">搜索</a-button>
+          <a-button type="primary" class="addclass" @click="getUserList"
+            >搜索</a-button
+          >
           <a-button @click="resetList">重置</a-button>
         </a-space>
       </div>
@@ -195,11 +199,18 @@ export default {
     async getUserList() {
       let realName = "";
       let mobile = "";
-      if (/^[\u4e00-\u9fa5]+$/.test(this.userform.searchVal)) {
-        realName = this.userform.searchVal;
-      } else if (/^[\d]+$/.test(this.userform.searchVal)) {
-        mobile = this.userform.searchVal;
+      if (this.userform.searchVal) {
+        if (/^[\d]+$/.test(this.userform.searchVal)) {
+          mobile = "%" + this.userform.searchVal + "%";
+        } else {
+          realName = "%" + this.userform.searchVal + "%";
+        }
       }
+      // if (/^[\u4e00-\u9fa5]+$/.test(this.userform.searchVal)) {
+      //   realName = "%" + this.userform.searchVal + "%";
+      // } else if (/^[\d]+$/.test(this.userform.searchVal)) {
+      //   mobile = "%" + this.userform.searchVal + "%";
+      // }
       let res = await userList({
         page: this.tablePagination.current,
         size: this.tablePagination.pageSize,

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/components/Details.vue

@@ -628,9 +628,12 @@ export default {
     //type
     onReqType(type) {
       let index = this.requestPam.type;
+      console.log(index);
+
       if (index == "path") {
         this.requestPam.table = [];
       } else {
+        console.log(this.requestPam.table);
         let obj = {
           name: ``,
           type: "String",
@@ -639,10 +642,12 @@ export default {
           describe: ``,
           isType: true,
         };
+
         if (index == "body") {
           obj.isType = false;
         }
         if (type == "new") {
+          console.log(333);
           this.requestPam.table = [obj];
         } else {
           this.requestPam.table.push(obj);

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

@@ -105,7 +105,7 @@ export default {
       getProduct({
         page: 1,
         size: -1,
-        productName: this.searchVal,
+        productName: this.searchVal ? "%" + this.searchVal + "%" : "",
       }).then((res) => {
         this.listData = res.data.data;
       });
@@ -116,7 +116,7 @@ export default {
         this.$refs.AddEditAppName.appInfoFome.id = item.id;
         this.$refs.AddEditAppName.appInfoFome.productName = item.productName;
       } else {
-        this.$refs.AddEditAppName.appInfoFome.id = '';
+        this.$refs.AddEditAppName.appInfoFome.id = "";
         this.$refs.AddEditAppName.VisibleTitle = "新增产品";
       }
       this.$refs.AddEditAppName.Visible = true;