Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue

@@ -83,6 +83,32 @@
               :placeholder="`请选择${v.fieldName}`"
               valueFormat="YYYY-MM-DD"
             />
+            <!-- 年选择器 -->
+            <a-date-picker
+              mode="year"
+              v-else-if="v.fieldType == 'year'"
+              v-model="v.fieldValue"
+              :placeholder="`请选择${v.fieldName}`"
+              valueFormat="YYYY"
+              format="YYYY"
+              :open="isopen"
+              @openChange="handYearChange"
+              @panelChange="(value) => panelYearChange(value, v)"
+            />
+            <!-- 月选择器 -->
+            <a-month-picker
+              v-else-if="v.fieldType == 'month'"
+              v-model="v.fieldValue"
+              :placeholder="`请选择${v.fieldName}`"
+              valueFormat="M"
+            />
+            <!-- 周选择器 -->
+            <a-week-picker
+              v-else-if="v.fieldType == 'week'"
+              v-model="v.fieldValue"
+              :placeholder="`请选择${v.fieldName}`"
+              valueFormat="YYYY-WW"
+            />
             <!-- 多行文本输入框 -->
             <a-textarea
               v-else-if="v.fieldType == 'textarea'"
@@ -170,6 +196,8 @@ export default {
         appId: "",
         appInfoFieldList: [],
       },
+      isopen: false,
+      year: null,
     };
   },
   computed: {
@@ -269,6 +297,17 @@ export default {
     changeCheckBox(vals, row) {
       row.fieldValue = vals.join(",");
     },
+    handYearChange(open) {
+      if (open) {
+        this.isopen = true;
+      } else {
+        this.isopen = false;
+      }
+    },
+    panelYearChange(value, row) {
+      row.fieldValue = this.$moment(value).format("YYYY");
+      this.isopen = false;
+    },
   },
 };
 </script>

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue

@@ -98,6 +98,19 @@ const fieldTypeItem = [
     value: "date",
     label: "日期选择框",
   },
+  {
+    value: "year",
+    label: "年选择框",
+  },
+
+  {
+    value: "month",
+    label: "月选择框",
+  },
+  {
+    value: "week",
+    label: "周选择框",
+  },
   {
     value: "radio",
     label: "单选框",
@@ -136,15 +149,12 @@ export default {
         try {
           let Obj = JSON.parse(value);
           let isjson =
-            typeof Obj == "object" &&
             Object.prototype.toString.call(Obj).toLowerCase() ==
-              "[object object]" &&
-            Object.keys(Obj).length;
-          !value.length;
+              "[object object]" && Object.keys(Obj).length;
           if (isjson) {
             callback();
           } else {
-            callback(new Error("输入的JSON对象格式"));
+            callback(new Error("请输入JSON对象格式"));
           }
         } catch (err) {
           callback(new Error("输入的JSON数据格式有误"));

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoFieldVo.java

 package com.mortals.xhx.module.app.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
 import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
+import com.mortals.xhx.module.app.model.AppInfoFieldQuery;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
+
 /**
-* 自助终端应用信息字段视图对象
-*
-* @author zxfei
-* @date 2022-11-28
-*/
+ * 自助终端应用信息字段视图对象
+ *
+ * @author zxfei
+ * @date 2022-11-28
+ */
+@Data
 public class AppInfoFieldVo extends BaseEntityLong {
 
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppInfoFieldQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppInfoFieldQuery> andConditionList;
+
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppInfoTempleteFieldVo.java

 package com.mortals.xhx.module.app.model.vo;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.app.model.AppDatasetQuery;
 import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
+import com.mortals.xhx.module.app.model.AppInfoTempleteFieldQuery;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -9,6 +13,12 @@ import java.util.List;
 * @author zxfei
 * @date 2022-11-28
 */
+@Data
 public class AppInfoTempleteFieldVo extends BaseEntityLong {
 
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<AppInfoTempleteFieldQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<AppInfoTempleteFieldQuery> andConditionList;
 }
\ No newline at end of file

portal-manager-ui/admin/src/App.vue

@@ -69,4 +69,7 @@ export default {
 .ant-calendar-next-year-btn::after {
   border-color: rgba(0, 0, 0, 1) !important;
 }
+.ant-progress-text {
+  color: #fff !important;
+}
 </style>
\ No newline at end of file

portal-manager-ui/admin/src/api/user.js

@@ -20,9 +20,3 @@ export function changePassword(params) {
 export function editPassword(params) {
   return http.post(`${baseURL}/zwfw/user/reset/password`, params);
 }
-// 获取图形验证码
-export function createCode(params) {
-  return http.post(`${baseURL}/zwfw/securitycode/createCode`, params, {
-    responseType: "blob",
-  });
-}

portal-manager-ui/admin/src/assets/css/common.less

@@ -631,18 +631,20 @@ img {
     tr, th,td{
       border:none !important;
     }
-    // .ant-table-body-inner{
-    //   &::-webkit-scrollbar{
-    //     display: none;
-    //   }
-    // }
-    // :hover{
-    //   .ant-table-body-inner{
-    //     &::-webkit-scrollbar{
-    //       display: block;
-    //     }
-    //   }
-    // }
+   
+    // 表格鼠标移入显示滚动条
+    .ant-table-body,.ant-table-body-inner{
+      &::-webkit-scrollbar{
+        display: none;
+      }
+    }
+    :hover{
+      .ant-table-body,.ant-table-body-inner{
+        &::-webkit-scrollbar{
+          display:block;
+        }
+      }
+    }
   }
   .ant-table-thead th {
     background: linear-gradient(0deg, #f9fbff 0%, #cbddff 78%);
@@ -760,18 +762,18 @@ img {
   }
 }
 // 表格鼠标移入显示滚动条
-.ant-table {
+// .ant-table {
  
-  .ant-table-body,.ant-table-body-inner{
-    &::-webkit-scrollbar{
-      display: none;
-    }
-  }
-  :hover{
-    .ant-table-body,.ant-table-body-inner{
-      &::-webkit-scrollbar{
-        display:block;
-      }
-    }
-  }
-}
+//   .ant-table-body,.ant-table-body-inner{
+//     &::-webkit-scrollbar{
+//       display: none;
+//     }
+//   }
+//   :hover{
+//     .ant-table-body,.ant-table-body-inner{
+//       &::-webkit-scrollbar{
+//         display:block;
+//       }
+//     }
+//   }
+// }
\ No newline at end of file

portal-manager-ui/admin/src/directive/index.js

-import Storage from "@/utils/js/Storage";
+// import Storage from "@/utils/js/Storage";
 import store from "@/store";
 // 修改密码权限
 export const permission = {

portal-manager-ui/admin/src/request/request.js

@@ -39,7 +39,6 @@ axios.interceptors.response.use(
       // 取出数据
       let { code, msg } = response.data;
       if (code === -1) {
-        console.log(response.data);
         message.error({
           content: msg,
           maxCount: 1,
@@ -49,7 +48,14 @@ axios.interceptors.response.use(
           store.commit("user/reset");
           router.push("/");
         }
-      } else if (code === 401) {
+      } else if (
+        code === 401 ||
+        code === 201 ||
+        code === 101 ||
+        code === 102 ||
+        code === 9001 ||
+        code === 9002
+      ) {
         message.error({
           content: msg,
           maxCount: 1,

portal-manager-ui/admin/src/views/dataActuary/behaviour/pathanalyse/pathAnalyse.vue

 <template>
-	<!-- 路径分析 -->
-	<div class="page">
-		<a-form-model :model="queryform" :label-col="labelCol" :wrapper-col="wrapperCol" layout="inline">
-			<a-form-model-item>
-				<a-select v-model="queryform.productId" style="width: 200px" placeholder="选择产品">
-					<a-select-option :value="item.id" v-for="(item,index) in product" :key="index">
-						{{item.title}}
-					</a-select-option>
-				</a-select>
-			</a-form-model-item>
-			<a-form-model-item>
-				<a-range-picker valueFormat="yyyy-MM-DD" v-model="time" style="width: 300px" :allowClear="false"/>
-			</a-form-model-item>
-			<a-form-model-item>
-				<a-button type="primary" class="addclass"  @click="getData">
-					开始分析
-				</a-button>
-			</a-form-model-item>
-		</a-form-model>
-		<div id="path"></div>
-	</div>
+  <!-- 路径分析 -->
+  <div class="page">
+    <a-form-model
+      :model="queryform"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+      layout="inline"
+    >
+      <a-form-model-item>
+        <a-select
+          v-model="queryform.productId"
+          style="width: 200px"
+          placeholder="选择产品"
+        >
+          <a-select-option
+            :value="item.id"
+            v-for="(item, index) in product"
+            :key="index"
+          >
+            {{ item.title }}
+          </a-select-option>
+        </a-select>
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-range-picker
+          valueFormat="yyyy-MM-DD"
+          v-model="time"
+          style="width: 300px"
+          :allowClear="false"
+        />
+      </a-form-model-item>
+      <a-form-model-item>
+        <a-button type="primary" class="addclass" @click="getData">
+          开始分析
+        </a-button>
+      </a-form-model-item>
+    </a-form-model>
+    <div id="path"></div>
+  </div>
 </template>
 
 <script>
-	import * as echarts from 'echarts'
-	import product from "../mixins/product"
-	import {getWayAccessAnalyse} from '@/api/dataActuary.js'
-	import moment from 'moment';
-	export default {
-		mixins:[product],
-		data() {
-			return {
-				queryform: {
-					productId: 1,
-					dateTimeStart:moment().format('yyyy-MM-DD'),
-					dateTimeEnd:moment().format('yyyy-MM-DD')
-				},
-				time:[moment().format('yyyy-MM-DD'),moment().format('yyyy-MM-DD')],
-				product:[{
-					title:'排队机',
-					id:1
-				}],
-				labelCol: {
-					span: 1
-				},
-				wrapperCol: {
-					span: 14
-				},
-			}
-		},
-		mounted() {
-			this.getData()
-		},
-		methods: {
-			getData() {
-				this.queryform.dateTimeStart = this.time ? this.time[0] : null
-				this.queryform.dateTimeStart = this.time ? this.time[1] : null
-				getWayAccessAnalyse(this.queryform).then(res=>{
-					let data = res.data.data.map(item=>({name:item.name}))
-					let links = res.data.links.map(item=>({
-						source:item.sourceName,
-						target:item.targetName,
-						value:item.value,
-						lineStyle:{
-							color:'source'
-						}
-					}))
-					this.init(data,links)
-				})
-			},
-			uniqueFunc(arr, uniId){
-			  const res = new Map();
-			  return arr.filter((item) => !res.has(item[uniId]) && res.set(item[uniId], 1));
-			},
-			init(data,links) {
-				let chartDom = document.getElementById('path')
-				let myChart = echarts.init(chartDom);
-				myChart.setOption({
-					series: {
-						type: 'sankey',
-						layout: 'none',
-						emphasis: {
-							focus: 'adjacency'
-						},
-						color:['#FFCAC4','#6D86DE','#409AFE','#4DB3EA','#07CF8C'],
-						nodeWidth:10,
-						data: data,
-						links: links
-					}
-				})
-			}
-		}
-	};
+import * as echarts from "echarts";
+import product from "../mixins/product";
+import { getWayAccessAnalyse } from "@/api/dataActuary.js";
+import moment from "moment";
+export default {
+  mixins: [product],
+  data() {
+    return {
+      queryform: {
+        productId: 1,
+        dateTimeStart: moment().format("yyyy-MM-DD"),
+        dateTimeEnd: moment().format("yyyy-MM-DD"),
+      },
+      time: [moment().format("yyyy-MM-DD"), moment().format("yyyy-MM-DD")],
+      product: [
+        {
+          title: "排队机",
+          id: 1,
+        },
+      ],
+      labelCol: {
+        span: 1,
+      },
+      wrapperCol: {
+        span: 14,
+      },
+      myChart: null,
+    };
+  },
+  created() {
+    this.$nextTick(() => {
+      this.getData();
+    });
+  },
+  methods: {
+    getData() {
+      this.queryform.dateTimeStart = this.time ? this.time[0] : null;
+      this.queryform.dateTimeStart = this.time ? this.time[1] : null;
+      getWayAccessAnalyse(this.queryform).then((res) => {
+        let data = res.data.data.map((item, i) =>
+          item.code != "/sceneSignIn"
+            ? {
+                name: item.name,
+              }
+            : ""
+        );
+        let links = res.data.links.map((item) => ({
+          source: item.sourceName,
+          target: item.targetName,
+          value: item.value,
+            lineStyle: {
+              color: "source",
+            },
+        }));
+        data = data.filter((v) => v);
+        links = links.filter((v) => v.target != "首页");
+        this.init(data, links);
+      });
+    },
+    uniqueFunc(arr, uniId) {
+      const res = new Map();
+      return arr.filter(
+        (item) => !res.has(item[uniId]) && res.set(item[uniId], 1)
+      );
+    },
+    init(data, links) {
+      if (
+        this.myChart != null &&
+        this.myChart != "" &&
+        this.myChart != undefined
+      ) {
+        this.myChart.dispose(); //销毁
+      }
+      this.myChart = echarts.init(document.getElementById("path"));
+      this.myChart.setOption({
+        series: {
+          type: "sankey",
+          layout: "none",
+          emphasis: {
+            focus: "adjacency",
+          },
+          color: ["#FFCAC4", "#6D86DE", "#409AFE", "#4DB3EA", "#07CF8C"],
+          nodeWidth: 10,
+          data: data,
+          links: links,
+        },
+      });
+      window.addEventListener("resize", () => {
+        if (this.myChart) {
+          this.myChart.resize();
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
-	.page{
-		height: calc(100% - 50px);
-		display: flex;
-		flex-direction: column;
-		/deep/.ant-form {
-			padding: 15px;
-		}
-		#path{
-			flex: 1;
-			width: 70%;
-			margin: 0 auto;
-		}
-	}
-</style>
+.page {
+  height: calc(100% - 50px);
+  display: flex;
+  flex-direction: column;
+  /deep/.ant-form {
+    padding: 15px;
+  }
+  #path {
+    flex: 1;
+    width: 70%;
+    margin: 0 auto;
+  }
+}
+</style>
\ No newline at end of file

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

@@ -99,7 +99,7 @@ export default {
     handleJump(url) {
       if (url.includes("http") || url.includes("https")) {
         let siteid = Storage.get(2, "siteId") || 0;
-        location.href = `${url}?token=${this.token}&siteid=${siteid}`;
+        window.open(`${url}?token=${this.token}&siteid=${siteid}`, "_blank");
       } else {
         this.$router.push(url);
       }

portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue

@@ -308,6 +308,7 @@ export default {
 
     // 查看信息
     checkInfo(id) {
+      this.loading = true;
       getImpossibleInfo({
         id: id,
       }).then((res) => {
@@ -316,6 +317,7 @@ export default {
           this.$refs.FormDetails.fromData = data;
           this.visible = true;
         }
+        this.loading = false;
       });
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue

@@ -96,7 +96,7 @@ const filterVal = [
   "organization",
   "customerDesignPictures",
   "customerDesignVideos",
-  "memberLevel",
+  "levelName",
   "lastLoginTime",
   "status",
 ]; // 导出的表头字段名，需要导出表格字段名

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

@@ -383,6 +383,7 @@ export default {
     },
     // 详情
     async checkInfo(id) {
+      this.loading = true;
       let res = await getEvaData({ id });
       if (res.code == 1) {
         let { data } = res;
@@ -390,6 +391,7 @@ export default {
         this.detailsInfo = data;
         this.detailsVisible = true;
       }
+      this.loading = false;
     },
     // 删除
     handleDel(id) {

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

@@ -380,12 +380,14 @@ export default {
     },
     // 详情
     async checkInfo(id) {
+      this.loading = true;
       let res = await getQueEvaData({ id });
       if (res.code == 1) {
         let { data } = res;
         this.detailsInfo = data;
         this.detailsVisible = true;
       }
+      this.loading = false;
     },
     // 删除
     handleDel(id) {

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

@@ -381,6 +381,7 @@ export default {
     },
     // 详情
     async checkInfo(id) {
+      this.loading = true;
       let res = await getEvaData({ id });
       if (res.code == 1) {
         let { data } = res;
@@ -388,6 +389,7 @@ export default {
         this.detailsInfo = data;
         this.detailsVisible = true;
       }
+      this.loading = false;
     },
     // 删除
     handleDel(id) {

portal-manager-ui/admin/src/views/dataAdmin/components/fillRecordReport/fillForm.vue

@@ -209,31 +209,15 @@ export default {
     // 获取报表
     async getPrintList() {
       this.loading = true;
-      let pramse = {
-        page: this.current,
-        size: this.size,
-        siteId: this.siteId,
-        type: this.searchForm.status,
-        createTimeStart: this.searchForm.time[0],
-        createTimeEnd: this.searchForm.time[1],
-      };
-      if (this.searchForm.type == 1) {
-        pramse.matterName = `%${this.searchForm.searchName}%`;
-      } else {
-        pramse.materialName = `%${this.searchForm.searchName}%`;
-      }
-      let res = await getPrintList(pramse);
-      if (res.code == 1) {
-        let { data, total } = res.data;
-        this.total = total;
-        this.tableData = data;
-        this.$emit("update", { total, time: this.searchForm.time });
-      }
+      let { total, data } = await this.getDataList();
+      this.total = total;
+      this.tableData = data;
+      this.$emit("update", { total, time: this.searchForm.time });
       this.loading = false;
     },
 
-    // 获取导出数据
-    async getExportPrintList() {
+    // 获取数据函数
+    async getDataList(searchForm) {
       let list = [];
       let listTotal = 0;
       let pramse = {
@@ -243,6 +227,7 @@ export default {
         type: this.searchForm.status,
         createTimeStart: this.searchForm.time[0],
         createTimeEnd: this.searchForm.time[1],
+        ...searchForm,
       };
       if (this.searchForm.type == 1) {
         pramse.matterName = `%${this.searchForm.searchName}%`;
@@ -250,10 +235,10 @@ export default {
         pramse.materialName = `%${this.searchForm.searchName}%`;
       }
       let res = await getPrintList(pramse);
-      if (res.data.code == 1) {
-        let { data, total } = res.data.data;
-        list = data;
+      if (res.code == 1) {
+        let { data, total } = res.data;
         listTotal = total;
+        list = data;
       }
       return {
         data: list,
@@ -304,7 +289,7 @@ export default {
           "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       } else {
-        this.dataSection(this.getExportPrintList, {}, (data) => {
+        this.dataSection(this.getDataList, {}, (data) => {
           if (!data.length) {
             this.$message.warning("暂无数据");
             return;

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

@@ -383,11 +383,13 @@ export default {
     },
     // 详情
     async checkInfo({ id }) {
+      this.loading = true;
       let res = await getOrderinfo({ id });
       if (res.code == 1) {
         this.detailsInfo = res.data;
         this.visible = true;
       }
+      this.loading = false;
     },
   },
 };

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue

@@ -32,8 +32,8 @@ import { mapState } from "vuex";
 import storage from "@/utils/js/Storage";
 import { export2Excel } from "@/utils/js/exportExcel";
 import { getSys12345 } from "@/api/dataAdmin";
-const tHeader = ["序号", "微信号", "电话号码", "拨打位置", "拨打时间"]; // 导出的表头名信息
-const filterVal = ["index", "nickname", "phone", "address", "create_time"]; // 导出的表头字段名，需要导出表格字段名
+const tHeader = ["微信号", "电话号码", "拨打位置", "拨打时间"]; // 导出的表头名信息
+const filterVal = ["nickname", "phone", "address", "create_time"]; // 导出的表头字段名，需要导出表格字段名
 export default {
   components: {},
   data() {

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/letterRecordForm.vue

@@ -50,7 +50,6 @@ import FormDetails from "./components/FormDetails.vue";
 import { export2Excel } from "@/utils/js/exportExcel";
 import { adminList, letterInfo } from "@/api/dataAdmin";
 const tHeader = [
-  "序号",
   "工单编号",
   "信件标题",
   "信件类别",
@@ -64,7 +63,6 @@ const tHeader = [
   "办理部门",
 ]; // 导出的表头名信息
 const filterVal = [
-  "index",
   "LetterCode",
   "strTitle",
   "strType",
@@ -294,6 +292,18 @@ export default {
       if (this.selectedRowKeys.length && this.excelData.length) {
         // 深度克隆避免影响页面表格展示
         let data = this.$_.cloneDeep(this.excelData);
+        for (let item of data) {
+          item.strGender =
+            item.strGender == 0 ? "无" : item.strGender == 1 ? "男" : "女";
+          item.source =
+            item.source == 1
+              ? "微官网"
+              : item.source == 2
+              ? "自助服务系统"
+              : item.source == 3
+              ? "数字填单系统"
+              : "无";
+        }
         export2Excel(
           this.tHeader,
           this.filterVal,
@@ -306,6 +316,18 @@ export default {
             this.$message.warning("暂无数据");
             return;
           }
+          for (let item of data) {
+            item.strGender =
+              item.strGender == 0 ? "无" : item.strGender == 1 ? "男" : "女";
+            item.source =
+              item.source == 1
+                ? "微官网"
+                : item.source == 2
+                ? "自助服务系统"
+                : item.source == 3
+                ? "数字填单系统"
+                : "无";
+          }
           export2Excel(
             this.tHeader,
             this.filterVal,
@@ -343,12 +365,14 @@ export default {
     },
     // 查看信息
     checkInfo(id) {
+      this.loading = true;
       letterInfo({ id }).then((res) => {
         if (res.code == 1) {
           let { data } = res;
           this.$refs.FormDetails.fromData = data;
           this.visible = true;
         }
+        this.loading = false;
       });
     },
   },

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue

@@ -377,6 +377,7 @@ export default {
 
     // 查看信息
     checkInfo(id) {
+      this.loading = true;
       getWLLZInfo({
         id: id,
       }).then((res) => {
@@ -385,6 +386,7 @@ export default {
           this.$refs.FormDetails.fromData = data;
           this.visible = true;
         }
+        this.loading = false;
       });
     },
   },

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

@@ -372,6 +372,7 @@ export default {
 
     // 查看用户信息
     async checkUser(row) {
+      this.loading = true;
       let res = await getPeopleanalyse({
         idcard: row.people_idcard,
         peopleid: row.peopleid,
@@ -381,11 +382,13 @@ export default {
         let { data } = res;
         this.userInfo = { ...row, ...data };
       }
+      this.loading = false;
       this.userInfoVisible = true;
     },
 
     // 查看业务信息
     async checkBusiness(row) {
+      this.loading = true;
       let res = await getBusinessEvent({
         businessid: row.businessid,
         time: this.searchForm.time,
@@ -397,10 +400,12 @@ export default {
         this.businessInfo = data;
         this.analysisVisible = true;
       }
+      this.loading = false;
     },
 
     // 查看工作人员
     async checkWorkman(id) {
+      this.loading = true;
       let res = await getWorkmananalyse({
         workmanid: id,
         time: this.searchForm.time,
@@ -410,11 +415,13 @@ export default {
       });
       let { data } = res;
       this.workerInfo = { ...data, ...result.data };
+      this.loading = false;
       this.workerInfoVisible = true;
     },
 
     // 查看详细信息
     async checkInfo(id) {
+      this.loading = true;
       let res = await getQueueInfo({
         id,
       });
@@ -423,6 +430,7 @@ export default {
         this.detailsInfo = data;
         this.detailsVisible = true;
       }
+      this.loading = false;
     },
 
     // 勾选表格

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

@@ -365,6 +365,7 @@ export default {
 
     // 查看用户信息
     async checkUser(row) {
+      this.loading = true;
       let res = await getPeopleanalyse({
         idcard: row.people_idcard,
         peopleid: row.peopleid,
@@ -374,11 +375,13 @@ export default {
         let { data } = res;
         this.userInfo = { ...row, ...data };
       }
+      this.loading = false;
       this.userInfoVisible = true;
     },
 
     // 查看业务信息
     async checkBusiness(row) {
+      this.loading = true;
       let res = await getBusinessEvent({
         businessid: row.businessid,
         time: this.searchForm.time,
@@ -390,10 +393,12 @@ export default {
         this.businessInfo = data;
         this.analysisVisible = true;
       }
+      this.loading = false;
     },
 
     // 查看工作人员
     async checkWorkman(id) {
+      this.loading = true;
       let res = await getWorkmananalyse({
         workmanid: id,
         time: this.searchForm.time,
@@ -403,11 +408,13 @@ export default {
       });
       let { data } = res;
       this.workerInfo = { ...data, ...result.data };
+      this.loading = false;
       this.workerInfoVisible = true;
     },
 
     // 查看详细信息
     async checkInfo(id) {
+      this.loading = true;
       let res = await getQueueInfo({
         id,
       });
@@ -416,6 +423,7 @@ export default {
         this.detailsInfo = data;
         this.detailsVisible = true;
       }
+      this.loading = false;
     },
 
     // 勾选表格

portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue

@@ -37,8 +37,10 @@
         <div class="ellipsis" :title="text">
           {{ text ? text : "--" }}
         </div>
-        <div class="ellipsis" :title="record.materiaFullName">
-          样表全称：{{ record.materiaFullName ? record.materiaFullName : "--" }}
+        <div class="ellipsis" :title="record.materialFullName">
+          样表全称：{{
+            record.materialFullName ? record.materialFullName : "--"
+          }}
         </div>
       </template>
       <!-- 类型 -->
@@ -173,31 +175,15 @@ export default {
     // 获取报表
     async getBillList() {
       this.loading = true;
-      let pramse = {
-        page: this.current,
-        size: this.size,
-        siteId: this.siteId,
-        type: this.searchForm.status,
-        operTimeStart: this.searchForm.time[0],
-        operTimeEnd: this.searchForm.time[1],
-      };
-      if (this.searchForm.type == 1) {
-        pramse.matterName = `%${this.searchForm.searchName}%`;
-      } else {
-        pramse.materialName = `%${this.searchForm.searchName}%`;
-      }
-      let res = await getBillList(pramse);
-      if (res.code == 1) {
-        let { data, total } = res.data;
-        this.total = total;
-        this.tableData = data;
-        this.$emit("update", { total, time: this.searchForm.time });
-      }
+      let { total, data } = await this.getDataList();
+      this.total = total;
+      this.tableData = data;
+      this.$emit("update", { total, time: this.searchForm.time });
       this.loading = false;
     },
 
-    // 获取导出数据
-    async getExportPrintList() {
+    // 获取数据函数
+    async getDataList(searchForm) {
       let list = [];
       let listTotal = 0;
       let pramse = {
@@ -207,6 +193,7 @@ export default {
         type: this.searchForm.status,
         operTimeStart: this.searchForm.time[0],
         operTimeEnd: this.searchForm.time[1],
+        ...searchForm,
       };
       if (this.searchForm.type == 1) {
         pramse.matterName = `%${this.searchForm.searchName}%`;
@@ -216,8 +203,8 @@ export default {
       let res = await getBillList(pramse);
       if (res.code == 1) {
         let { data, total } = res.data;
-        list = data;
         listTotal = total;
+        list = data;
       }
       return {
         data: list,
@@ -257,7 +244,7 @@ export default {
           "样表记录报表" + this.$moment().format("YYYYMMDDHHmmss")
         );
       } else {
-        this.dataSection(this.getExportPrintList, {}, (data) => {
+        this.dataSection(this.getDataList, {}, (data) => {
           if (!data.length) {
             this.$message.warning("暂无数据");
             return;

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

@@ -11,22 +11,12 @@
             class="flex items-center justify-between flex-shrink-0 pl-[10px] pr-[10px]"
           >
             <div
-              :class="['tab-item', { active: active == 'CensusType_1' }]"
-              @click="changeCensusType('CensusType_1')"
+              v-for="v in CensusTypeList"
+              :key="v.type"
+              :class="['tab-item', { active: active == v.type }]"
+              @click="changeCensusType(v.type)"
             >
-              聚焦服务
-            </div>
-            <div
-              :class="['tab-item', { active: active == 'CensusType_2' }]"
-              @click="changeCensusType('CensusType_2')"
-            >
-              聚焦协同
-            </div>
-            <div
-              :class="['tab-item', { active: active == 'CensusType_3' }]"
-              @click="changeCensusType('CensusType_3')"
-            >
-              聚焦监管
+              {{ v.name }}
             </div>
           </div>
           <div
@@ -91,6 +81,20 @@ export default {
   data() {
     return {
       siteId: Storage.get(2, "siteId"),
+      CensusTypeList: [
+        {
+          type: "CensusType_1",
+          name: "聚焦服务",
+        },
+        {
+          type: "CensusType_2",
+          name: "聚焦协同",
+        },
+        {
+          type: "CensusType_3",
+          name: "聚焦监管",
+        },
+      ],
       CensusType_1: [], // 服务
       CensusType_2: [], // 协同
       CensusType_3: [], // 监管

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

@@ -41,7 +41,8 @@
 import { changePassWord } from "@/utils/js/validate";
 import { changePassword, LogoutInterface } from "@/api/user";
 import { mapMutations } from "vuex";
-import { encrypt } from "@/utils";
+// import { encrypt } from "@/utils";
+import storage from "@/utils/js/Storage";
 export default {
   props: {
     visibleEditPwd: {
@@ -98,10 +99,15 @@ export default {
       let _this = this;
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
+          // let obj = {
+          //   loginName: encrypt(this.form.loginName),
+          //   oldPwd: encrypt(this.form.oldPwd),
+          //   newPwd: encrypt(this.form.newPwd),
+          // };
           let obj = {
-            loginName: encrypt(this.form.loginName),
-            oldPwd: encrypt(this.form.oldPwd),
-            newPwd: encrypt(this.form.newPwd),
+            loginName: this.form.loginName,
+            oldPwd: this.form.oldPwd,
+            newPwd: this.form.newPwd,
           };
           let res = await changePassword(obj);
           let { code } = res;

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

@@ -236,6 +236,7 @@ export default {
 }
 
 .Container {
+  width: 100%;
   background: #f5f5f5;
 
   .content {

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

@@ -13,8 +13,8 @@
         :model="form"
         :rules="rules"
         ref="formData"
-        :label-col="{ span: 5 }"
-        :wrapper-col="{ span: 19 }"
+        :label-col="{ span: 6 }"
+        :wrapper-col="{ span: 18 }"
       >
         <a-form-model-item label="用户名" prop="loginName">
           <a-input
@@ -36,7 +36,9 @@
 
       <div slot="footer">
         <a-button style="margin-left: 10px" @click="handleClose">取消</a-button>
-        <a-button type="primary" class="addclass"  @click="handleOk">确定</a-button>
+        <a-button type="primary" class="addclass" @click="handleOk"
+          >确定</a-button
+        >
       </div>
     </a-modal>
   </div>
@@ -45,6 +47,7 @@
 <script>
 import { changeAccount, changePassWord } from "@/utils/js/validate";
 import { editPassword } from "@/api/user";
+// import { encrypt } from "@/utils";
 export default {
   props: {
     visibleEditPwd: {
@@ -98,7 +101,15 @@ export default {
     handleOk() {
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
-          let res = await editPassword(this.form);
+          // let obj = {
+          //   loginName: encrypt(this.form.loginName),
+          //   newPwd: encrypt(this.form.newPwd),
+          // };
+          let obj = {
+            loginName: this.form.loginName,
+            newPwd: this.form.newPwd,
+          };
+          let res = await editPassword(obj);
           if (res.code === 1) {
             this.$message.success("密码修改成功");
             this.handleClose();

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

@@ -69,6 +69,7 @@ import { getListByParentId } from "@/api/area.js";
 import { userSave } from "@/api/userManagement.js";
 import { TreeSelect } from "ant-design-vue";
 const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT,  SHOW_CHILD
+// import { encrypt } from "@/utils";
 export default {
   data() {
     return {
@@ -180,6 +181,7 @@ export default {
             ...this.form,
             areaNames: JSON.stringify(this.form.areaNames),
             areaCodes: this.form.areaNames.map((v) => v.areaCode).join(","),
+            // loginName: encrypt(this.form.loginName),
           });
           let { code, msg } = res;
           if (code === 1) {

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

@@ -80,7 +80,9 @@
       </a-form-model>
       <div slot="footer">
         <a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
-        <a-button type="primary" class="addclass"  @click="onSubmit">确定</a-button>
+        <a-button type="primary" class="addclass" @click="onSubmit"
+          >确定</a-button
+        >
       </div>
     </a-modal>
   </div>
@@ -91,6 +93,7 @@ import { changeAccount, changePassWord } from "@/utils/js/validate";
 import { getListByParentId } from "@/api/area.js";
 import { userSave } from "@/api/userManagement.js";
 import { TreeSelect } from "ant-design-vue";
+// import { encrypt } from "@/utils";
 const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT,  SHOW_CHILD
 export default {
   data() {
@@ -189,6 +192,8 @@ export default {
             ...this.form,
             areaCodes: this.form.areaCodes.join(","),
             areaNames: JSON.stringify(this.changeSelect),
+            // loginName: encrypt(this.form.loginName),
+            // loginPwd: encrypt(this.form.loginPwd),
           });
           let { code, msg } = res;
           if (code === 1) {