Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/.env

@@ -10,4 +10,6 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
 #VUE_APP_API_BASE_URL=http://api.iczer.com
 #门户
 VUE_APP_API_portal_URL=http://192.168.0.98:11072
-# VUE_APP_API_portal_URL=http://10.12.185.213:11072
+# VUE_APP_API_portal_URL=http://10.12.185.213:11072
\ No newline at end of file
+# 系统名称
+VUE_APP_sysName = "基础设置"
\ No newline at end of file

base-manager-ui/admin/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <!-- <title><%= process.env.VUE_APP_NAME %></title> -->
-    <title>基础设置系统</title>
+    <title></title>
     <!-- require cdn assets css -->
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
       <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />

base-manager-ui/admin/src/layouts/Layouts.vue

@@ -4,8 +4,14 @@
     <a-layout-header class="header">
       <div class="flex aic">
         <router-link to="/" class="flex aic">
-          <img class="mr10" width="32" src="@/assets/img/logo.png" />
-          <h1 class="title">基础设置系统</h1>
+          <img
+            class="mr10"
+            width="32"
+            :src="sysLogo ? api + sysLogo : require('@/assets/img/logo.png')"
+          />
+          <h1 class="title">
+            {{ sysName ? sysName : systemName }}
+          </h1>
         </router-link>
         <HeaderSite class="ml20"></HeaderSite>
       </div>
@@ -57,14 +63,19 @@ export default {
   },
   data() {
     return {
+      systemName: process.env.VUE_APP_sysName,
+      api: process.env.VUE_APP_API_IMG_URL,
       portalUrl: process.env.VUE_APP_API_portal_URL, // 门户地址
       visibleInit: false,
     };
   },
   computed: {
-    ...mapState("setting", ["systemName", "menuData"]),
+    ...mapState("site", ["sysName", "sysLogo"]),
+    ...mapState("setting", ["menuData"]),
+  },
+  created() {
+    document.title = this.sysName ? this.sysName : this.systemName; // 设置项目标题
   },
-  created() {},
   methods: {},
 };
 </script>
@@ -87,8 +98,10 @@ export default {
     color: #fff;
   }
   .title {
-    font-size: 20px;
     font-weight: bold;
+    font-size: 18px;
+    max-width: 200px;
+    line-height: normal;
   }
 }
 .main {

base-manager-ui/admin/src/layouts/header/AdminHeader.vue

@@ -8,8 +8,13 @@
         to="/"
         :class="['logo', isMobile ? null : 'pc', headerTheme]"
       >
-        <img width="32" src="@/assets/img/logo.png" />
-        <h1 v-if="!isMobile" style="padding-left: 10px">{{ systemName }}</h1>
+        <img
+          width="32"
+          :src="sysLogo ? api + sysLogo : require('@/assets/img/logo.png')"
+        />
+        <h1 class="title" v-if="!isMobile" style="padding-left: 10px">
+          {{ sysName ? sysName : systemName }}
+        </h1>
       </router-link>
       <a-divider v-if="isMobile" type="vertical" />
       <a-icon
@@ -84,6 +89,8 @@ export default {
   props: ["collapsed", "menuData"],
   data() {
     return {
+      api: process.env.VUE_APP_API_IMG_URL,
+      systemName: process.env.VUE_APP_sysName,
       visibleInit: false,
       langList: [
         { key: "CN", name: "简体中文", alias: "简体" },
@@ -95,6 +102,7 @@ export default {
     };
   },
   computed: {
+    ...mapState("site", ["sysName", "sysLogo"]),
     ...mapState("setting", [
       "theme",
       "isMobile",
@@ -127,7 +135,9 @@ export default {
       return `calc(${headWidth} - ${extraWidth})`;
     },
   },
-  created() {},
+  created() {
+    document.title = this.sysName ? this.sysName : this.systemName; // 设置项目标题
+  },
   methods: {
     toggleCollapse() {
       this.$emit("toggleCollapse");
@@ -142,4 +152,10 @@ export default {
 
 <style lang="less" scoped>
 @import "index";
+.title {
+  font-weight: bold;
+  font-size: 18px;
+  max-width: 200px;
+  line-height: normal;
+}
 </style>

base-manager-ui/admin/src/pages/basicset/jump/jump.vue

@@ -20,22 +20,22 @@ export default {
       "SET_token",
       "SET_SITE_ID",
       "SET_siteName",
+      "SET_sysName",
+      "SET_sysLogo",
     ]),
     // 获取token
     getToken() {
-      let token = this.$route.query.token;
-      let userInfo = this.$route.query.userInfo;
-      let siteId = this.$route.query.siteid;
-      let siteName = this.$route.query.siteName;
+      let { token, userInfo, siteid, siteName, sysName, sysLogo } =
+        this.$route.query;
       if (token && userInfo) {
         userInfo = JSON.parse(userInfo);
         this.SET_userInfo(userInfo);
         this.SET_token(token);
-        this.SET_SITE_ID(siteId);
+        this.SET_SITE_ID(siteid);
         this.SET_siteName(siteName);
-        // local.setLocal("token", token);
-        // local.setLocal("baseUserInfo", userInfo);
-        local.setLocal("siteId", siteId);
+        this.SET_sysName(sysName);
+        this.SET_sysLogo(sysLogo);
+        local.setLocal("siteId", siteid);
         local.setLocal("siteName", siteName);
         this.$router.push("/website");
       } else {

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -822,7 +822,7 @@ export default {
   }
   .ant-checkbox-group {
     display: grid;
-    grid-template-columns: 160px 160px 160px 160px 160px 160px;
+    grid-template-columns: 260px 260px 260px 260px;
   }
   .ant-checkbox-wrapper {
     margin-left: 0px;

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -184,7 +184,7 @@
                 <div class="deploy_module">
                   <div class="color_title">部署模块</div>
                   <a-row>
-                    <a-col :span="20">
+                    <a-col :span="24">
                       <div class="item_box">
                         <div
                           class="item"
@@ -533,13 +533,16 @@ export default {
           display: flex;
           flex-wrap: wrap;
           .item {
-            width: 120px;
+            width: 140px;
+            height: 54px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
             background-color: rgba(30, 159, 255, 0.2);
             margin-right: 10px;
             margin-bottom: 10px;
             padding: 6px;
             border-radius: 5px;
-            text-align: center;
           }
         }
       }

base-manager-ui/admin/src/store/modules/site.js

 export default {
   namespaced: true,
   state: {
+    sysName: "", // 系统名称
+    sysLogo: "", // 系统logo
     siteId: "", // 站点id
     siteName: "", // 站点名称
     imageResolution: [], // 皮肤设置分辨率
@@ -38,6 +40,12 @@ export default {
     },
   },
   mutations: {
+    SET_sysName(state, sysName) {
+      state.sysName = sysName;
+    },
+    SET_sysLogo(state, sysLogo) {
+      state.sysLogo = sysLogo;
+    },
     SET_siteName(state, siteName) {
       state.siteName = siteName;
     },

base-manager/pom.xml

@@ -63,6 +63,27 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>product</id>
+            <properties>
+                <profiles.active>product</profiles.active>
+                <profiles.server.path>/base</profiles.server.path>
+                <profiles.publish.path>/home/publish</profiles.publish.path>
+                <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
+                <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
+                <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+                <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
+                <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+                <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
+                <profiles.log.level>info</profiles.log.level>
+                <package.environment>build</package.environment>
+                <skipUi>false</skipUi>
+            </properties>
+        </profile>
+
         <profile>
             <id>yibin</id>
             <properties>

portal-manager-ui/admin/.env.development

 # 开发环境配置
 NODE_ENV = development
-VUE_APP_API_BASE_URL=http://8.136.255.30:11078
+#VUE_APP_API_BASE_URL=http://8.136.255.30:11078
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
 #图片显示拼接
 VUE_APP_API_IMG_URL=http://8.136.255.30:11078/
 #余林
-VUE_APP_API_PHP_URL=http://8.136.255.30:8090
+#VUE_APP_API_PHP_URL=http://8.136.255.30:8090
+VUE_APP_API_PHP_URL=http://192.168.0.98:8090
 #宜宾
 #VUE_APP_API_BASE_URL=http://10.12.185.213:11072
 

portal-manager-ui/admin/src/router/routes.js

@@ -156,7 +156,7 @@ const routes = [
               import(
                 /* webpackChunkName: "easyPoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/module.vue"
               ),
-            meta: { title: "易政秀报表" },
+            meta: { title: "在线制作记录报表" },
             children: [
               {
                 path: "PoliticsShow",
@@ -165,7 +165,7 @@ const routes = [
                   import(
                     /* webpackChunkName: "PoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue"
                   ),
-                meta: { title: "易政秀报表" },
+                meta: { title: "在线制作记录报表" },
               },
             ],
           },
@@ -453,7 +453,7 @@ const routes = [
             /* webpackChunkName: "dataActuary" */ "@/views/dataActuary/business/index.vue"
           ),
         meta: { title: "业务数据分析" },
-        redirect: 'dataActuary/business/basecontent',
+        redirect: "dataActuary/business/basecontent",
         children: [
           {
             path: "basecontent",
@@ -473,7 +473,7 @@ const routes = [
               ),
             meta: { title: "分析结果" },
           },
-        ]
+        ],
       },
       {
         path: "dataActuary/portrayal",
@@ -483,7 +483,7 @@ const routes = [
             /* webpackChunkName: "dataActuary" */ "@/views/dataActuary/portrayal/index.vue"
           ),
         meta: { title: "群众画像图谱" },
-        redirect: 'dataActuary/portrayal/portrayalbase',
+        redirect: "dataActuary/portrayal/portrayalbase",
         children: [
           {
             path: "portrayalbase",
@@ -503,7 +503,7 @@ const routes = [
               ),
             meta: { title: "分析结果" },
           },
-        ]
+        ],
       },
       {
         path: "dataActuary/portrayal/register",

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>
 
@@ -36,4 +38,4 @@ export default {
   flex-direction: column;
   justify-content: center;
 }
-</style>
+</style>
\ No newline at end of file

portal-manager-ui/admin/src/views/dataActuary/business/analysiscontent/index.vue

@@ -118,8 +118,9 @@ import {getBusInfoById} from '@/api/dataActuary.js'
 			}
 		},
 		methods: {
-			async getAnalysisData() {
-				const res = await getBusInfoById({busid: this.checkId, siteid: localStorage.getItem('siteId') })
+			async getAnalysisData(selected) {
+				let pramse = (selected || selected===0 ||selected==='0')?{busid: this.checkId, siteid: localStorage.getItem('siteId'),selected:selected }:{busid: this.checkId, siteid: localStorage.getItem('siteId') }
+				const res = await getBusInfoById(pramse)
 				if(res.code == 1){
 					if (res.data.phone) this.testWay.push('手机号')
 					if (res.data.idcardtake) this.testWay.push('身份证')
@@ -136,8 +137,8 @@ import {getBusInfoById} from '@/api/dataActuary.js'
 					}
 				}
 			},
-			handleChange(){
-				this.getAnalysisData()
+			handleChange(e){
+				this.getAnalysisData(e)
 			}
 		},
 	}

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue

@@ -12,28 +12,20 @@
           v-model="checkboxVALUE"
           @change="checkboxonChange"
         />
-        <a-input
-          allowClear
-          v-model="Query.workman_name"
-          placeholder="请输入工作人员姓名查询 "
-        >
+        <a-input allowClear v-model="Query.workman_name" placeholder="请输入工作人员姓名查询 ">
           <a-icon slot="prefix" type="search" />
         </a-input>
         <a-select v-model="Query.window_id" placeholder="请选择窗口">
-          <a-select-option value=""> 全部 </a-select-option>
+          <a-select-option value>全部</a-select-option>
           <a-select-option
             v-for="(item, index) of windowData"
             :key="index"
             :value="item.id"
-          >
-            {{ item.englishName }} - {{ item.fromnum }}
-          </a-select-option>
+          >{{ item.englishName }} - {{ item.fromnum }}</a-select-option>
         </a-select>
         <a-select v-model="Query.warn_alert" placeholder="请选择类型">
-          <a-select-option value=""> 全部 </a-select-option>
-          <a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i">
-            {{ item }}
-          </a-select-option>
+          <a-select-option value>全部</a-select-option>
+          <a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i">{{ item }}</a-select-option>
         </a-select>
 
         <a-range-picker
@@ -41,12 +33,9 @@
           valueFormat="yyyy-MM-DD"
           class="range_picker_style"
           v-model="Query.time"
-        >
-        </a-range-picker>
+        ></a-range-picker>
 
-        <a-button type="primary" class="addclass" @click="onGetKqalert"
-          >搜索</a-button
-        >
+        <a-button type="primary" class="addclass" @click="onGetKqalert">搜索</a-button>
       </span>
     </div>
     <div class="main">
@@ -66,9 +55,7 @@
         :dataSource="tableSourceData"
       >
         <template slot="operation" slot-scope="text, record">
-          <a-button type="link" @click="openDetails"
-            >查看详情{{ record.id }}</a-button
-          >
+          <a-button type="link" @click="openDetails">查看详情{{ record.id }}</a-button>
         </template>
       </a-table>
     </div>
@@ -86,7 +73,7 @@ const warn_alert = {
   2: "离开",
   4: "玩手机",
   5: "扶头",
-  6: "趴桌",
+  6: "趴桌"
 };
 const tHeader = [
   "序号",
@@ -110,7 +97,7 @@ const filterVal = [
   "out_time",
   "duration",
   "isaccuracy",
-  "have_process_name",
+  "have_process_name"
 ];
 export default {
   mixins: [table],
@@ -124,15 +111,15 @@ export default {
         warn_alert: "", //1离岗，2离开 4:玩手机 5:扶头 6:趴桌
         window_id: "", //窗口ID
         workman_name: "", //工作人员姓名
-        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
+        time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")] // 时间区间
       }, //查询条件
       checkboxVALUE: [],
       BegindAndEndTime: [],
       checkboxOptions: [
         {
           label: "只看未处理",
-          value: "0",
-        },
+          value: "0"
+        }
       ],
       tableHeaders: [
         {
@@ -141,54 +128,54 @@ export default {
           width: "60px",
           key: "index",
           align: "center",
-          customRender: (text, record, index) => `${index + 1}`,
+          customRender: (text, record, index) => `${index + 1}`
         },
         {
           title: "报警类型",
           dataIndex: "warn_alert",
-          customRender: (text, record) => warn_alert[text],
+          customRender: (text, record) => warn_alert[text]
         },
         {
           title: "发生窗口",
           dataIndex: "window_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "工作人员",
           dataIndex: "workman_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "所属部门",
           dataIndex: "section_name",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "手机号",
           dataIndex: "workman_phone",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "发生时间",
           dataIndex: "out_time",
           customRender: (text, record) =>
-            text ? this.timestampToTime(text) : "--",
+            text ? this.timestampToTime(text) : "--"
         },
         {
           title: "时长",
           dataIndex: "duration",
-          customRender: (text, record) => (text ? text : "--"),
+          customRender: (text, record) => (text ? text : "--")
         },
         {
           title: "是否准确",
           dataIndex: "isaccuracy",
-          customRender: (text, record) => (text == 1 ? "准确" : "--"),
+          customRender: (text, record) => (text == 1 ? "准确" : "--")
         },
         {
           title: "是否处理",
           dataIndex: "have_process_name",
-          customRender: (text, record) => (text ? text : "--"),
-        },
+          customRender: (text, record) => (text ? text : "--")
+        }
         // {
         // 	title: "操作",
         // 	align: "center",
@@ -199,7 +186,7 @@ export default {
         // 	},
         // },
       ],
-      searchName: undefined,
+      searchName: undefined
     };
   },
   components: {},
@@ -211,7 +198,7 @@ export default {
   methods: {
     // 时间戳转换为日期
     timestampToTime(timestamp) {
-      var date = new Date(timestamp*1000);
+      var date = new Date(timestamp * 1000);
       var Y = date.getFullYear() + "-";
       var M =
         (date.getMonth() + 1 < 10
@@ -235,34 +222,38 @@ export default {
           await getKqalert({
             ...this.Query,
             page: 1,
-            size: -1,
+            size: -1
           })
         );
         data = datas.data.data;
-        data.forEach((text, i) => {
-          text.index = i + 1;
-          text.isaccuracy = text.isaccuracy == 1 ? "准确" : "--";
-          text.out_time = text.out_time
-            ? this.timestampToTime(text.out_time)
-            : "--";
-        });
-        if (!data.length) return;
-
-        export2Excel(
-          tHeader,
-          filterVal,
-          data,
-          "AI效能监察异常行为数据报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
       }
+      data.forEach((text, i) => {
+        text.index = i + 1;
+        text.isaccuracy = text.isaccuracy == 1 ? "准确" : "--";
+        text.out_time = text.out_time
+          ? this.timestampToTime(text.out_time)
+          : "--";
+      });
+      
+      // debugger
+        
+        console.log(data,11111);
+      if (!data.length) return;
+
+      export2Excel(
+        tHeader,
+        filterVal,
+        data,
+        "AI效能监察异常行为数据报表" + this.$moment().format("YYYYMMDDHHmmss")
+      );
     },
     // 报表接口
     onGetKqalert() {
       getKqalert({
         ...this.Query,
         page: this.tablePagination.current,
-        size: this.tablePagination.pageSize,
-      }).then((res) => {
+        size: this.tablePagination.pageSize
+      }).then(res => {
         const { code, data } = res;
         if (code == 1) {
           this.tableSourceData = data.data;
@@ -275,8 +266,8 @@ export default {
       windowList({
         page: 1,
         size: -1,
-        siteId: JSON.parse(localStorage.getItem("siteId")),
-      }).then((res) => {
+        siteId: JSON.parse(localStorage.getItem("siteId"))
+      }).then(res => {
         const { code, data } = res;
         if (code == 1) {
           this.windowData = data.data;
@@ -308,8 +299,8 @@ export default {
         default:
           return "type0";
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue

@@ -49,7 +49,7 @@
                 <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
                 <span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
                 <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
-                <span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':'现场注册':'现场注册'}}</span>
+                <span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':queEvaData.register_type:'现场注册'}}</span>
                 <span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
               </div>
             </div>

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue

@@ -173,7 +173,7 @@ export default {
         {
           title: "评价设备",
           align: "center",
-          dataIndex: "pj_name",
+          dataIndex: "devicenum",
           customRender: (text) => {
             return text ? text : "--";
           },
@@ -336,7 +336,7 @@ export default {
         option_id,
         pjxt,
         time: this.BegindAndEndTime,
-        info: "%"+this.searchName+"%",
+        info: this.searchName,
         hallid:this.hallid,
         sectionid:this.sectionid,
         ...search,

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

@@ -342,7 +342,7 @@ export default {
         option_id,
         pjxt,
         time: this.BegindAndEndTime,
-        info: "%"+this.searchName+"%",
+        info: this.searchName,
         hallid: this.hallid,
         sectionid: this.sectionid,
         ...search,

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -2,29 +2,48 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="primary" class="addclass" @click="handleExportTable" :loading="btnLoading">
+        <a-button
+          type="primary"
+          class="addclass"
+          @click="handleExportTable"
+          :loading="btnLoading"
+        >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
-        <b>叫号次数：<i>{{ tablePagination.total }}</i> 次</b>
+        <b
+          >叫号次数：<i>{{ tablePagination.total }}</i> 次</b
+        >
         <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
       </div>
       <span>
         <a-space>
           <a-select v-model="searchForm.hallid">
             <a-select-option value=""> 全部大厅 </a-select-option>
-            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+            <a-select-option
+              v-for="item in datingList"
+              :key="item.id"
+              :value="item.id"
+            >
               {{ item.hallName }}
             </a-select-option>
           </a-select>
           <a-select v-model="searchForm.sectionid">
             <a-select-option value=""> 全部部门 </a-select-option>
-            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+            <a-select-option
+              v-for="item in bumenList"
+              :key="item.id"
+              :value="item.id"
+            >
               {{ item.name }}
             </a-select-option>
           </a-select>
           <a-select v-model="searchForm.id">
             <a-select-option value=""> 全部设备 </a-select-option>
-            <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
+            <a-select-option
+              v-for="item in deviceData"
+              :key="item.id"
+              :value="item.id"
+            >
               {{ item.name }}
             </a-select-option>
           </a-select>
@@ -36,20 +55,36 @@
           </a-select>
           <a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time">
           </a-range-picker>
-          <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
+          <a-input
+            v-model="searchForm.flownum"
+            placeholder="请输入排队编号搜索"
+            @pressEnter="handleSearch"
+          >
             <a-icon slot="prefix" type="search" />
           </a-input>
-          <a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
+          <a-button type="primary" class="addclass" @click="handleSearch"
+            >搜索</a-button
+          >
           <a-button @click="resetBtn">重置</a-button>
         </a-space>
       </span>
     </div>
     <div class="main">
-      <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
-        selectedRowKeys: tableSelectedKeys,
-        onChange: onSelectChange,
-      }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="changeTablePage" :loading="tableLoading"
-        :columns="tableHeaders" :dataSource="tableList">
+      <a-table
+        size="small"
+        bordered
+        :row-key="(record) => record.id"
+        :row-selection="{
+          selectedRowKeys: tableSelectedKeys,
+          onChange: onSelectChange,
+        }"
+        :scroll="{ y: 590 }"
+        :pagination="tablePagination"
+        @change="changeTablePage"
+        :loading="tableLoading"
+        :columns="tableHeaders"
+        :dataSource="tableList"
+      >
         <!-- 序号 -->
         <span slot="num" slot-scope="text, record, index">{{
           (tablePagination.current - 1) * tablePagination.pageSize + index + 1
@@ -71,7 +106,11 @@
         </template>
         <!-- 办理业务 -->
         <template slot="business" slot-scope="text">
-          <a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a>
+          <a
+            v-if="text.business"
+            @click="openBusiness(text.business, text.businessid)"
+            >{{ text.business }}</a
+          >
           <span v-else>--</span>
         </template>
         <!-- 办理开始时间 -->
@@ -91,8 +130,8 @@
         <template slot="window_name" slot-scope="text">
           {{
             text.window_name
-            ? text.window_name + "-" + text.window_fromnum
-            : "--"
+              ? text.window_name + "-" + text.window_fromnum
+              : "--"
           }}
         </template>
         <!-- 工作人员 -->
@@ -112,11 +151,13 @@
         </template>
         <!-- 状态 -->
         <template slot="style" slot-scope="text">
-          <span :class="{
-            'stand-line': text.style === 0,
-            'on-transact': text.style === 1,
-            'on-end': text.style === 4,
-          }">
+          <span
+            :class="{
+              'stand-line': text.style === 0,
+              'on-transact': text.style === 1,
+              'on-end': text.style === 4,
+            }"
+          >
             {{ $codeMap.queueState[text.style] }}
           </span>
         </template>
@@ -280,7 +321,7 @@ export default {
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
         hallid: "",
-        sectionid: ""
+        sectionid: "",
       },
       // 大厅列表
       datingList: [],
@@ -354,7 +395,7 @@ export default {
     this.getCalllistArr();
     this.getCallQueListArr();
   },
-  mounted() { },
+  mounted() {},
   methods: {
     // 获取大厅列表
     async getDatingListArr() {
@@ -379,7 +420,7 @@ export default {
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
         hallid: "",
-        sectionid: ""
+        sectionid: "",
       };
       this.getCallQueListArr();
     },
@@ -408,7 +449,7 @@ export default {
         let { data, total } = res.data;
         this.tableList = data;
         this.tablePagination.total = total;
-        console.log(this.tableList)
+        console.log(this.tableList);
         return data;
       }
     },

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/siteArrange/siteArrange.vue

@@ -19,7 +19,7 @@
       <div class="img_box img3"></div>
     </a-carousel>
     <div class="title">
-      <h3 style="text-align: center;font-size: 50px;">宜人·宜宾·宜办事</h3>
+      <h3 style="text-align: center; font-size: 50px">宜人·宜宾·宜办事</h3>
       <!-- <p>“互联网+政务服务”整体解决方案提供商和服务商</p> -->
     </div>
     <div class="classification">
@@ -28,9 +28,9 @@
           class="mod_max"
           v-for="item of siteModelList"
           :key="item.id"
-          @click="openWindow(item.modelUrl)"
+          @click="openWindow(item)"
         >
-          <div class="picture" :style="{background: item.color}">
+          <div class="picture" :style="{ background: item.color }">
             <img
               width="40"
               height="35"
@@ -76,38 +76,38 @@ export default {
       this.siteId = Storage.get(2, "siteId");
       let res = await appsListInterface({ siteId: this.siteId });
       let { data } = res.data;
-      let color = []
-      let colorArr = ['#546DFF','#1E6FFF','#3CBFFF','#00AA5B','#FFAB00']
-      color = colorArr.concat(colorArr,colorArr,colorArr,colorArr,colorArr,colorArr)
-      this.siteModelList = data.map((v,i)=>{
-        v['color'] = color[i]
-        return v
+      let color = [];
+      let colorArr = ["#546DFF", "#1E6FFF", "#3CBFFF", "#00AA5B", "#FFAB00"];
+      color = colorArr.concat(
+        colorArr,
+        colorArr,
+        colorArr,
+        colorArr,
+        colorArr,
+        colorArr
+      );
+      this.siteModelList = data.map((v, i) => {
+        v["color"] = color[i];
+        return v;
       });
     },
-    openWindow(href) {
+    openWindow(row) {
       let token = Storage.get(2, "Authorization");
       let siteid = Storage.get(2, "siteId") ? Storage.get(2, "siteId") : 0;
       let siteName = Storage.get(2, "siteName")
         ? Storage.get(2, "siteName")
         : "";
-      let reg = /^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/;
       let info = Storage.get(2, "userInfo");
       let userInfo = JSON.stringify({
         id: info.id,
         name: info.loginName,
       });
-
+      let { modelUrl, modelName, modelIcon } = row;
+      let path = this.$route.path;
       window.open(
-        `${href}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}`,
+        `${modelUrl}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}&path=${path}`,
         "_blank"
       );
-
-      /*      if (reg.test(href)) {
-        window.open(
-          `${href}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}`,
-          "_blank"
-        );
-      }*/
     },
   },
 };

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,
-        rgba(59, 135, 255, 1) 24%,
-        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(59, 135, 255, 1) 24%,
-        rgba(108, 53, 247, 1) 85%);
+    background: -moz-linear-gradient(
+      174deg,
+      rgba(59, 135, 255, 1) 24%,
+      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(59, 135, 255, 1) 24%,
+      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/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/menuManagement/menuManagement.vue

@@ -108,4 +108,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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) {
@@ -310,4 +323,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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,
@@ -301,4 +312,4 @@ export default {
     }
   }
 }
-</style>
+</style>
\ No newline at end of file

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);
@@ -734,4 +739,4 @@ export default {
 /deep/.ant-drawer-body {
   margin-bottom: 100px;
 }
-</style>
+</style>
\ No newline at end of file

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;

smart-gateway/pom.xml

@@ -84,14 +84,14 @@
         <profile>
             <id>product</id>
             <properties>
-                <profiles.active>product</profiles.active>
-                <profiles.server.ip>192.168.0.251</profiles.server.ip>
+                <profiles.active>yibin</profiles.active>
+                <profiles.server.ip>192.168.0.250</profiles.server.ip>
                 <profiles.server.port>17214</profiles.server.port>
                 <profiles.nginx.port>11078</profiles.nginx.port>
                 <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
                 <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
-                <profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
-                <profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
+                <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
+                <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
                 <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
                 <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
                 <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
@@ -99,7 +99,6 @@
                 <profiles.log.level>INFO</profiles.log.level>
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
-
             </properties>
         </profile>