Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue

@@ -44,6 +44,16 @@
           (current - 1) * size + index + 1
         }}</span>
 
+        <!-- 主题封面 -->
+        <template slot="cover" slot-scope="text">
+          <img
+            class="cover"
+            v-if="text.cover"
+            :src="api2 + text.cover"
+            @click="handlePreview(api2 + text.cover)"
+          />
+          <span v-else>--</span>
+        </template>
         <!-- 创建时间 -->
         <template slot="createTime" slot-scope="text">
           {{ text.createTime | dateFormat }}
@@ -65,6 +75,11 @@
       :addVisile.sync="addVisile"
       @addSuccess="getCategoryList"
     ></AddTheme>
+    <!-- 预览 -->
+    <PrevieModal
+      :previewData="previewData"
+      :previewVisible.sync="previewVisible"
+    ></PrevieModal>
   </div>
 </template>
 
@@ -73,6 +88,7 @@ import { getCategoryList, deleteCategory } from "@/services/market";
 import AddTheme from "../modal/AddTheme";
 import local from "@/utils/local";
 import { pageSizeOptions } from "@/config/pageConfig.js";
+import PrevieModal from "@/components/PrevieModal.vue";
 const columns = [
   {
     title: "序号",
@@ -94,6 +110,12 @@ const columns = [
     title: "主题编码",
     dataIndex: "categoryCode",
   },
+  {
+    title: "主题封面",
+    scopedSlots: {
+      customRender: "cover",
+    },
+  },
   {
     title: "排序",
     dataIndex: "sort",
@@ -113,12 +135,15 @@ const columns = [
 export default {
   components: {
     AddTheme,
+    PrevieModal,
   },
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       api2: process.env.VUE_APP_API_IMG_URL,
       columns,
+      previewData: {}, // 预览
+      previewVisible: false,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,
@@ -227,8 +252,21 @@ export default {
         },
       });
     },
+    // 预览封面
+    handlePreview(url) {
+      this.previewData = {
+        type: "img",
+        url: url,
+      };
+      this.previewVisible = true;
+    },
   },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.cover {
+  width: 50px;
+  cursor: pointer;
+}
+</style>

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

@@ -48,26 +48,6 @@
                 <div class="ant-upload-text">选择图标</div>
               </div>
             </a-upload>
-
-            <!-- <a-upload
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              :action="api + 'base/file/commonupload'"
-              :before-upload="iconBeforeUpload"
-              @change="handleChangeIcon"
-            >
-              <img
-                class="icon"
-                v-if="form.appIconPath"
-                :src="api2 + form.appIconPath"
-              />
-              <div v-else>
-                <a-icon :type="loading ? 'loading' : 'plus'" />
-                <div class="ant-upload-text">选择图标</div>
-              </div>
-            </a-upload> -->
           </a-form-model-item>
           <a-form-model-item label="应用简介" prop="summary">
             <a-textarea
@@ -102,6 +82,7 @@
               <a-radio :value="1"> 应用程序 </a-radio>
               <a-radio :value="2"> URL </a-radio>
               <a-radio :value="3" v-if="form.type != 1"> 微信小程序 </a-radio>
+              <a-radio :value="4" v-if="form.type != 2"> 天府通办 </a-radio>
             </a-radio-group>
           </a-form-model-item>
           <a-form-model-item

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

@@ -25,10 +25,32 @@
         <a-form-model-item label="主题编码" prop="categoryCode">
           <a-input v-model="form.categoryCode" placeholder="请输入主题编码" />
         </a-form-model-item>
+        <a-form-model-item label="主题封面" prop="cover">
+          <a-upload
+            name="file"
+            list-type="picture-card"
+            :action="api + 'base/file/commonupload'"
+            :file-list="fileList"
+            @change="handleChangeCover"
+            :accept="accept"
+            :before-upload="beforeUpload"
+            @preview="handlePreview"
+          >
+            <div v-if="fileList.length < 1">
+              <a-icon type="plus" />
+              <div class="ant-upload-text">选择封面</div>
+            </div>
+          </a-upload>
+        </a-form-model-item>
         <a-form-model-item label="排序" prop="sort">
           <a-input-number v-model="form.sort" :min="1" />
         </a-form-model-item>
       </a-form-model>
+      <!-- 预览 -->
+      <PrevieModal
+        :previewData="previewData"
+        :previewVisible.sync="previewVisible"
+      ></PrevieModal>
     </a-modal>
   </div>
 </template>
@@ -36,6 +58,7 @@
 <script>
 import { saveCategory } from "@/services/market";
 import local from "@/utils/local";
+import PrevieModal from "@/components/PrevieModal.vue";
 export default {
   props: {
     addVisile: {
@@ -48,15 +71,25 @@ export default {
       default: "新增分类",
     },
   },
-  components: {},
+  components: {
+    PrevieModal,
+  },
   data() {
     return {
+      accept: "image/jpeg,image/png",
+      api: process.env.VUE_APP_API_BASE_URL + "/",
+      api2: process.env.VUE_APP_API_IMG_URL,
+      fileList: [],
+      previewData: {}, // 预览
+      previewVisible: false,
       form: {
         siteId: local.getLocal("siteId"), // 站点id
         siteName: local.getLocal("siteName"), // 站点名称
         categoryName: "", // 分类名称
         categoryCode: "", // 分类编码
         sort: 99, // 排序
+        cover: "", // 封面
+        remark: "", // 备注
       },
       rules: {
         categoryName: [
@@ -88,9 +121,21 @@ export default {
     // 编辑
     onEdit(data) {
       this.form = { ...data };
+      if (this.form.cover) {
+        this.fileList = [
+          {
+            uid: "-2",
+            name: this.form.cover,
+            status: "done",
+            url: this.api2 + this.form.cover,
+            url2: this.form.cover,
+          },
+        ];
+      }
     },
     // 关闭弹窗
     handleClose() {
+      this.fileList = [];
       this.$refs.form.resetFields();
       this.Visible = false;
     },
@@ -108,6 +153,43 @@ export default {
         }
       });
     },
+    // 上传之前
+    beforeUpload(file) {
+      const isJpgOrPng =
+        file.type === "image/jpeg" || file.type === "image/png";
+      if (!isJpgOrPng) {
+        this.$message.error("请上传jpeg、png格式图片!");
+      }
+      const isLt10M = file.size / 1024 / 1024 < 10;
+      if (!isLt10M) {
+        this.$message.error("图片大小不能超过 10MB!");
+      }
+      return isJpgOrPng && isLt10M;
+    },
+    // 上传封面
+    handleChangeCover({ fileList }) {
+      this.fileList = [...fileList].slice(-1);
+      this.fileList = this.fileList.map((v) => {
+        if (v.response) {
+          v.url2 = v.response.url;
+          v.url = this.api2 + v.response.url;
+        }
+        return v;
+      });
+      if (this.fileList[0]) {
+        this.form.cover = this.fileList[0].url2;
+      } else {
+        this.form.cover = "";
+      }
+    },
+    // 预览
+    handlePreview(info) {
+      this.previewData = {
+        type: "img",
+        url: info.url,
+      };
+      this.previewVisible = true;
+    },
     // 重置
     handleReset() {
       this.$refs.form.resetFields();

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -671,6 +671,7 @@ export default {
 
     // 业务下拉
     handleChange(val, node) {
+      this.$refs.formData.validateField("siteBusinessId");
       if (node) {
         let { text } = node.componentOptions.children[0];
         this.siteBusiness.siteBusinessName = text;

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

@@ -98,6 +98,7 @@ const tHeader = [
   "发生时间",
   "时长",
   "是否准确",
+  "是否处理"
 ];
 const filterVal = [
   "index",

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

@@ -45,11 +45,11 @@
               slot="description"
             >
               <div class="details">
-                <span><i class="lable">申报人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
+                <span><i class="lable">评价人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
                 <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>--</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.take_name?queEvaData.take_name:'--'}}</span>
               </div>
             </div>
@@ -145,7 +145,7 @@
                   <!-- <span v-if="queEvaData.content.length==0">--</span> -->
                 </span>
                 <span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
-                <span><i class="lable">评价设备：</i>--</span>
+                <span><i class="lable">评价设备：</i>{{queEvaData.devicenum?queEvaData.devicenum:'--'}}</span>
                 <span><i class="lable">评价状态：</i>{{!queEvaData.evaluatestatus?'--':queEvaData.evaluatestatus==1?'等待评价':queEvaData.evaluatestatus==2?'完成':queEvaData.evaluatestatus==3?'截图有误':queEvaData.evaluatestatus==4?'用户截图签名超时':queEvaData.evaluatestatus==5?'用户评价超时':'收到图片等待签名'}}</span>
                 <span>
                   <i class="lable">评价人照片：</i>

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

@@ -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/matterEvaluation.vue

@@ -338,7 +338,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/makeRecordReport/makeRecordReport.vue

@@ -255,7 +255,7 @@ export default {
         },
       },
       {
-        title: "业务名称",
+        title: "业务/事项名称",
         align: "center",
         dataIndex: "business_name",
       },

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

@@ -29,7 +29,7 @@
               }}
             </p>
             <p>
-              <span>预约方式：</span>{{ orderInfo.up_type=='phone'?'微官网':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }}
+              <span>预约方式：</span>{{ orderInfo.up_type=='phone'?'小程序':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }}
             </p>
             <p>
               <span>预约事项：</span>--
@@ -62,17 +62,13 @@
         <div class="box2">
           <h1>办理地点</h1>
           <h2>
-            <span
+            <span style="width: 33.3%;display: block;"
               >办理地点:{{
                 orderInfo.siteinfo && orderInfo.siteinfo.siteName
               }}</span
             >
-            <span
-              >办理窗口:{{
-                (orderInfo.window && orderInfo.window.join(",")) || "--"
-              }}</span
-            >
-            <span
+            <span style="display: block;width: 33.3%;word-wrap: break-word;">办理窗口: {{(orderInfo.window && orderInfo.window.join(",")) || "--"}}</span>
+            <span style="width: 33.3%;display: block;"
               >服务热线:{{
                 orderInfo.siteinfo && orderInfo.siteinfo.siteTel
               }}</span
@@ -80,14 +76,25 @@
           </h2>
           <h2>
             <span
+              
               >办理时间:{{
                 orderInfo.siteinfo &&
-                Number(orderInfo.siteinfo.amWorkStartTime) | times
+                Number(orderInfo.siteinfo.amWorkStartTime*1000) | times
+              }}
+              ~
+              {{
+                orderInfo.siteinfo &&
+                Number(orderInfo.siteinfo.amWorkEndTime*1000) | times
+              }}
+              <span style="position: relative;top:-2px">--</span>
+              {{
+                orderInfo.siteinfo &&
+                Number(orderInfo.siteinfo.pmWorkStartTime*1000) | times
               }}
               ~
               {{
                 orderInfo.siteinfo &&
-                Number(orderInfo.siteinfo.pmWorkEndTime) | times
+                Number(orderInfo.siteinfo.pmWorkEndTime*1000) | times
               }}</span
             >
             <span
@@ -116,7 +123,7 @@
       <h1>操作信息</h1>
       <h2>
         <span>操作时间：{{ orderInfo.create_time }}</span>
-        <span>预约方式：-- </span>
+        <span>预约方式：{{ orderInfo.up_type=='phone'?'小程序':orderInfo.up_type=='app'?'自助终端':orderInfo.up_type=='tftb'?'天府通办':'--' }} </span>
         <span>操作站点：{{orderInfo.siteinfo?orderInfo.siteinfo.siteName:'--'}} </span>
       </h2>
     </div>

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

@@ -8,11 +8,13 @@
     >
       <div class="drawerMain">
         <div class="drawerMain-top">
-          <a-avatar :size="64" icon="user" />
+          <!-- <a-avatar :size="64" icon="user" /> -->
+          <a-avatar v-if="!userInfo.icon" :size="64" icon="user" />
+          <img v-else :src="imgBase+userInfo.icon" style="width: 60px;height: 60px;">
           <div class="drawer-user">
             <span>{{ userInfo.nickname || "--" }}</span>
             <span class="userTips">实名认证</span>
-            <div class="userInfo">{{ userInfo.idcard_Sex }}，四川，成都</div>
+            <div class="userInfo">{{ userInfo.idcard_Sex?userInfo.idcard_Sex:'--' }}，{{ userInfo.province?userInfo.province:'--'}}，{{userInfo.city?userInfo.city:'--'}}</div>
           </div>
           <div class="someUserInfo">
             <div class="infoBox">
@@ -45,14 +47,14 @@
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证人像面：</span>
               <span class="infoContent">
-                <thumbImage v-if="userInfo.z_img" :src="imgBase+'/'+userInfo.z_img" fileType="img" />
+                <thumbImage v-if="userInfo.z_img" :src="userInfo.z_img" fileType="img" />
                 <span v-else>--</span>
               </span>
             </div>
             <div class="infoBox">
               <span class="infoTitle imgBox">身份证国徽面：</span>
               <span class="infoContent">
-                <thumbImage v-if="userInfo.b_img" :src="imgBase+'/'+userInfo.b_img" fileType="img" />
+                <thumbImage v-if="userInfo.b_img" :src="userInfo.b_img" fileType="img" />
                 <span v-else>--</span>
               </span>
             </div>

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

@@ -31,9 +31,23 @@ import {getSys12345} from "@/api/dataAdmin"
 import {
 		export2Excel
 } from "@/utils/js/exportExcel";
+    const tHeader=[
+        "序号",
+        "微信号",
+        "电话号码",
+        "拨打位置",
+        "拨打时间"
+    ];
+    const filterVal=[
+        "index",
+        "nickname",
+        "phone",
+        "address",
+        "create_time"
+    ];
 export default {
     mixins: [table],
-    name: "callRecordForm",
+    name:"callRecordForm",
     data() {
         return {
             tableHeaders: [
@@ -76,7 +90,8 @@ export default {
             BegindAndEndTime: [],
             searchName: undefined,
             visible: false,
-			total:0
+			total:0,
+
         };
     },
     components: {
@@ -155,8 +170,8 @@ export default {
 				}
 			}
 			export2Excel(
-				this.tHeader,
-				this.filterVal,
+				tHeader,
+				filterVal,
 				data,
 				"12345拨打记录报表" + this.$moment().format("YYYYMMDDHHmmss")
 			);

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

@@ -144,6 +144,11 @@ export default {
             return text.type == 1 ? "取件码取件" : "身份证取件";
           },
         },
+        {
+          title: "取件柜名称",
+          align: "center",
+          customRender: (text, record, index) => text.qjg_name || "--",
+        },
         {
           title: "取件柜编号",
           align: "center",

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

@@ -3,13 +3,7 @@
     <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>
@@ -28,21 +22,12 @@
           <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>
@@ -55,7 +40,8 @@
           <a-descriptions-item label="请求路径">{{
             detailsForm.requestUrl
           }}</a-descriptions-item>
-          <br />
+          <a-descriptions-item label="流控信息">--</a-descriptions-item>
+          <a-descriptions-item label="授权信息">--</a-descriptions-item>
           <a-descriptions-item label="描述" span="{3}">{{
             detailsForm.description
           }}</a-descriptions-item>
@@ -63,11 +49,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" disabled>
             <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>
@@ -78,15 +60,8 @@
             <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>
 
@@ -97,15 +72,8 @@
             <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>
 
@@ -123,6 +91,11 @@
                   </pre>
         </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>
+      </a-card>
     </div>
   </div>
 </template>
@@ -175,6 +148,23 @@ export default {
           width: 200,
         },
       ],
+      table_columns_gb: [
+        {
+          title: "版本号",
+          align: "center",
+          dataIndex: "name",
+        },
+        {
+          title: "变更说明",
+          align: "center",
+          dataIndex: "name",
+        },
+        {
+          title: "变更时间",
+          align: "center",
+          dataIndex: "name",
+        },
+      ],
       allResData: null,
       errJson: { msg: "请选择待查看产品接口信息", code: -1 },
     };
@@ -286,7 +276,7 @@ export default {
         margin-bottom: 1rem;
       }
 
-      & + .card_box {
+      &+.card_box {
         margin-top: 1rem;
       }
     }
@@ -298,21 +288,15 @@ 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);
   }
 }