Merge remote-tracking branch 'origin/master'

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

@@ -40,7 +40,11 @@
           :columns="leftColumns"
           :expandIconColumnIndex="2"
           :data-source="businessData"
-          :row-selection="{ onChange: onSelectChange }"
+          :row-selection="{
+            selectedRowKeys: selectedLeftRowKeys,
+            onChange: onSelectChange,
+            onSelect: onSelectLeftRow,
+          }"
           :rowKey="(record) => record.id"
         >
           <template
@@ -219,6 +223,7 @@ export default {
       rightLoading: false,
       // businessType: 0, // 业务类型
       selectedRowKeys: [],
+      selectedLeftRowKeys: [],
       businessData: [], // 站点业务
       businessDataList: [], //业务列表数据
       deleteData: "", // 批量删除数据
@@ -333,9 +338,36 @@ export default {
       this.$refs.addprofession.onAdd();
       this.visible = true;
     },
-    // 批量删除id
-    onSelectChange(key, data) {
-      this.deleteData = data;
+    // 左边选中
+    onSelectChange(key, rows) {
+      this.selectedLeftRowKeys = key;
+      const res = new Map();
+      this.deleteData = [...this.deleteData, ...rows]
+        .filter((v) => {
+          return !res.has(v.id) && res.set(v.id, 1);
+        })
+        .filter((v) => {
+          return this.selectedLeftRowKeys.some((val) => v.id == val);
+        });
+    },
+    // 左边选中父默认勾选子
+    onSelectLeftRow(record, selected) {
+      if (selected && record.children && record.children.length) {
+        record.children.forEach((v) => {
+          this.selectedLeftRowKeys.push(v.id);
+          this.deleteData.push(v);
+        });
+      } else if (selected) {
+        this.selectedLeftRowKeys.push(record.id);
+        this.deleteData.push(record);
+      } else {
+        this.selectedLeftRowKeys = this.selectedLeftRowKeys.filter(
+          (v) => v != record.id
+        );
+        this.deleteData = this.deleteData.filter((v) => {
+          return this.selectedLeftRowKeys.some((val) => v.id == val);
+        });
+      }
     },
     // 批量删除
     handleDelAll() {

base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue

@@ -16,7 +16,7 @@
       :wrapper-col="{ span: 19 }"
     >
       <a-form-model-item label="业务级别：" prop="isBusiness">
-        <a-radio-group v-model="form.isBusiness">
+        <a-radio-group v-model="form.isBusiness" @change="changeIsBusiness">
           <a-radio :value="0">一级业务</a-radio>
           <a-radio :value="1">二级业务</a-radio>
         </a-radio-group>
@@ -164,13 +164,14 @@ export default {
       }
     },
     // 切换业务级别
-    // changeIsBusiness(e) {
-    //   if (e.target.value == 0) {
-    //     this.form.parentId = 0;
-    //   } else {
-    //     this.form.parentId = undefined;
-    //   }
-    // },
+    changeIsBusiness() {
+      this.form.parentId = undefined;
+      // if (e.target.value == 0) {
+      //   this.form.parentId = undefined;
+      // } else {
+      //   this.form.parentId = undefined;
+      // }
+    },
     // 重置
     handleReset() {
       this.$refs.formData.resetFields();

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.9.1. 查询API服务列表
 export function serviceApiList(params) {
-  return http.post("/zwfw/system/service/api/list", params);
+  return http.post(`${baseURL}/zwfw/system/service/api/list`, params);
 }
 // 1.9.2. 查看API服务
 export function serviceApiInfo(params) {
-  return http.get("/zwfw/system/service/api/info", params);
+  return http.get(`${baseURL}/zwfw/system/service/api/info`, params);
 }
 // 1.9.3. 保存更新API服务
 export function serviceApiSave(params) {
-  return http.post("/zwfw/system/service/api/save", params);
+  return http.post(`${baseURL}/zwfw/system/service/api/save`, params);
 }
 // 1.9.4. 删除API服务
 export function serviceApiDelete(params) {
-  return http.get("/zwfw/system/service/api/delete", params);
+  return http.get(`${baseURL}/zwfw/system/service/api/delete`, params);
 }

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

 // const BASE_URL = process.env.VUE_APP_API_BASE_URL
+let baseURL = process.env.VUE_APP_API_BASE_URL
 module.exports = {
-  fileCommonupload: `/zwfw/file/commonupload`, //1.2.4. 上传附件
+  fileCommonupload: `${baseURL}/zwfw/file/commonupload`, //1.2.4. 上传附件
 };

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.10.1. 查询应用服务列表
 export function serviceList(params) {
-  return http.post("/zwfw/system/service/list", params);
+  return http.post(`${baseURL}/zwfw/system/service/list`, params);
 }
 // 1.10.2. 查看应用服务
 export function serviceInfo(params) {
-  return http.get("/zwfw/system/service/info", params);
+  return http.get(`${baseURL}/zwfw/system/service/info`, params);
 }
 // 1.10.3. 保存更新应用服务
 export function serviceSave(params) {
-  return http.post("/zwfw/system/service/save", params);
+  return http.post(`${baseURL}/zwfw/system/service/save`, params);
 }
 // 1.10.4. 删除应用服务
 export function serviceDelete(params) {
-  return http.get("/zwfw/system/service/delete", params);
+  return http.get(`${baseURL}/zwfw/system/service/delete`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.14.1. 查询区域列表
 export function areaList(params) {
-  return http.post("/zwfw/area/list", params);
+  return http.post(`${baseURL}/zwfw/area/list`, params);
 }
 // 1.14.2. 查看区域
 export function areaInfo(params) {
-  return http.get("/zwfw/area/info", params);
+  return http.get(`${baseURL}/zwfw/area/info`, params);
 }
 // 1.14.3. 查看区域子信息
 export function getListByParentId(params) {
-  return http.get("/zwfw/area/getListByParentId", params);
+  return http.get(`${baseURL}/zwfw/area/getListByParentId`, params);
 }
 // 1.14.4. 获取所有区域信息
 export function areaTreeselect(params) {
-  return http.post("/zwfw/area/treeselect", params);
+  return http.post(`${baseURL}/zwfw/area/treeselect`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.4.1. 查询角色信息列表
 export function roleList(params) {
-  return http.post("/zwfw/role/list", params);
+  return http.post(`${baseURL}/zwfw/role/list`, params);
 }
 
 // 1.4.2. 查看角色信息
 export function roleInfo(params) {
-  return http.get("/zwfw/role/info", params);
+  return http.get(`${baseURL}/zwfw/role/info`, params);
 }
 
 // 1.4.3. 保存更新角色信息
 export function roleSave(params) {
-  return http.post("/zwfw/role/save", params);
+  return http.post(`${baseURL}/zwfw/role/save`, params);
 }
 
 // 1.4.4. 删除角色信息
 export function roleDelete(params) {
-  return http.get("/zwfw/role/delete", params);
+  return http.get(`${baseURL}/zwfw/role/delete`, params);
 }
 // 1.6.1. 分配菜单到角色
 export function assignMenuToRole(params) {
-  return http.post("/zwfw/role/auth/assignMenuToRole", params);
+  return http.post(`${baseURL}/zwfw/role/auth/assignMenuToRole`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
+let BASEURL = process.env.VUE_APP_API_PHP_URL
 // 1.15.1. 获取站点下的数据管理列表
 export function censusListInterface(params) {
-  return http.post("/zwfw/site/model/census/list", params);
+  return http.post(`${baseURL}/zwfw/site/model/census/list`, params);
 }
 
 
+//排号机列表数据
+export function getTaskList(params){
+  return http.get(`${BASEURL}/admin/take/takelist`,params)
+}
 //排队办理记录报表接口
 export function getQueueData(params){
-  return http.post("/inter/reportform/quelist",params)
+  return http.post(`${BASEURL}/inter/reportform/quelist`,params)
+}
+//排号记录详情
+export function getQueueInfo(params){
+  return http.post(`${BASEURL}/inter/reportform/queinfo`,params)
+}
+//业务事项关联
+export function getBusinessEvent(params){
+  return http.post(`${baseURL}/basics_api/base/business/matter/list`,params)
+}
+//查询业务人员信息
+export function getWorkerInfo(params){
+  return http.get(`${baseURL}/basics_api/base/workman/info`,params)
 }
\ No newline at end of file

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 查看操作日志列表
 export function getOperLogList(params) {
-  return http.post("/zwfw/oper/log/list", params);
+  return http.post(`${baseURL}/zwfw/oper/log/list`, params);
 }
 // 查看操作日志
 export function getOperLogInfo(params) {
-  return http.get("/zwfw/oper/log/info", params);
+  return http.get(`${baseURL}/zwfw/oper/log/info`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.7.1. 查询菜单信息业务列表
 export function menuList(params) {
-  return http.post("/zwfw/menu/list", params);
+  return http.post(`${baseURL}/zwfw/menu/list`, params);
 }
 
 // 1.7.2. 查看菜单信息业务
 export function menuInfo(params) {
-  return http.get("/zwfw/menu/info", params);
+  return http.get(`${baseURL}/zwfw/menu/info`, params);
 }
 
 // 1.7.3. 保存更新菜单信息业务
 export function menuSave(params) {
-  return http.post("/zwfw/menu/save", params);
+  return http.post(`${baseURL}/zwfw/menu/save`, params);
 }
 
 // 1.7.4. 删除菜单信息业务
 export function menuDelete(params) {
-  return http.get("/zwfw/menu/delete", params);
+  return http.get(`${baseURL}/zwfw/menu/delete`, params);
 }
 
 // 1.7.5. 查询所有可用菜单
 export function menuFindAll(params) {
-  return http.post("/zwfw/menu/findAll", params);
+  return http.post(`${baseURL}/zwfw/menu/findAll`, params);
 }
 
 // 1.3.8 查询菜单权限列表
 export function menuFindAllTree(params) {
-  return http.post("/zwfw/menu/list/tree", params);
+  return http.post(`${baseURL}/zwfw/menu/list/tree`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.16.1. 查询站点编排列表
 export function appsListInterface(params) {
-  return http.post("/zwfw/site/model/list", params);
+  return http.post(`${baseURL}/zwfw/site/model/list`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.2.1. 登录
 export function LoginInterface(params) {
-  return http.post("/zwfw/login/login", params);
+  return http.post(`${baseURL}/zwfw/login/login`, params);
 }
 // 1.2.2. 首页
 export function loginIndex(params) {
-  return http.post("/zwfw/login/index", params);
+  return http.post(`${baseURL}/zwfw/login/index`, params);
 }
 // 1.2.3. 登出
 export function LogoutInterface(params) {
-  return http.post("/zwfw/login/logout", params);
+  return http.post(`${baseURL}/zwfw/login/logout`, params);
 }
 // 1.2.4. 用户修改密码
 export function changePassword(params) {
-  return http.post("/zwfw/user/change/password", params);
+  return http.post(`${baseURL}/zwfw/user/change/password`, params);
 }
 // 管理员修改密码
 export function editPassword(params) {
-  return http.post("/zwfw/user/reset/password", params);
+  return http.post(`${baseURL}/zwfw/user/reset/password`, params);
 }

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

 import http from "../request/http";
-
+let baseURL = process.env.VUE_APP_API_BASE_URL
 // 1.3.1. 查询用户信息业务列表
 export function userList(params) {
-  return http.post("/zwfw/user/list", params);
+  return http.post(`${baseURL}/zwfw/user/list`, params);
 }
 // 1.3.2. 查看用户信息业务
 export function userInfo(params) {
-  return http.get("/zwfw/user/info", params);
+  return http.get(`${baseURL}/zwfw/user/info`, params);
 }
 // 1.3.3. 保存更新用户信息业务
 export function userSave(params) {
-  return http.post("/zwfw/user/save", params);
+  return http.post(`${baseURL}/zwfw/user/save`, params);
 }
 // 1.3.4. 删除用户信息业务
 export function userDelete(params) {
-  return http.get("/zwfw/user/delete", params);
+  return http.get(`${baseURL}/zwfw/user/delete`, params);
 }
 // 1.3.5. 用户站点授权
 export function userSiteAuth(params) {
-  return http.post("/zwfw/user/siteAuth", params);
+  return http.post(`${baseURL}/zwfw/user/siteAuth`, params);
 }

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

@@ -28,6 +28,9 @@ import * as filters from "@/filters";
 Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key]);
 });
+//引入字典
+import codeMap from "@/utils/codeMap"
+Vue.prototype.$codeMap = codeMap
 
 Vue.prototype.$bus = new Vue();
 

portal-manager-ui/admin/src/mixins/table.js

@@ -10,7 +10,7 @@ export default {
             tablePagination: {
                 current: 1,
                 pageSize: 10,
-                total: 20,
+                total: 0,
                 showQuickJumper: true, //是否可以快速跳转至某页
                 showSizeChanger: true, //是否可以改变 pageSize
                 showTotal: (total, range) => `共${total}条`,
@@ -108,10 +108,8 @@ export default {
             // console.log(this.tableSelectedKeys, this.tableSelectedRows);
         },
 
-        pagTableChange(pag, filters) {
-            // console.log(pag);
-            this.tablePagination = pag;
-            this.$nextTick(() => { });
+        pagTableChange(pagination) { 
+            this.tablePagination = pagination
         },
         
 

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

@@ -4,7 +4,7 @@ import axios from "axios";
 import { message } from "ant-design-vue";
 import Storage from "@/utils/js/Storage";
 const service = axios.create({
-  baseURL: process.env.VUE_APP_API_BASE_URL,
+  // baseURL: process.env.VUE_APP_API_BASE_URL,
   // timeout: 10000
 });
 service.interceptors.request.use(
@@ -18,9 +18,12 @@ service.interceptors.request.use(
       "Content-Type": "application/json;charset=utf-8",
     };
     const Authorization = JSON.parse(localStorage.getItem("Authorization"));
+    const siteid = JSON.parse(localStorage.getItem("siteId"))
+
     if (Authorization) {
       config.headers.Authorization = Authorization;
       config.headers.Authtoken = Authorization;
+      config.headers.siteid = siteid
     }
     return config;
   },

portal-manager-ui/admin/src/utils/codeMap.js

+export default{
+    //排队叫号字典
+    "queueState":{"0":"排队中","1":"办理中","4":"接待结束"},
+    "takeNumWay":{"0":"现场取号","1":"在线取号"},
+    "politicalStatus":{"0":"中共党员","1":"中共预备党员","2":"共青团员","3":"普通居民","4":"其它"}
+}
\ No newline at end of file

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

 <template>
   <div class="handling" ref="handling">
-    <a-drawer
-      :destroyOnClose="true"
-      :title="modalInfo.title"
-      :width="modalInfo.width"
-      :visible="modalInfo.visible"
-      @close="modalClose"
-      @getContainer="() => $refs.handling"
-    >
+    <a-drawer :destroyOnClose="true" :title="modalInfo.title" :width="modalInfo.width" :visible="modalInfo.visible"
+      @close="modalClose" @getContainer="() => $refs.handling">
       <div class="headerInfo">
+        <!-- 头部耗时部分 -->
         <p>
-          <span v-for="item of 3"
-            >总耗时：13分15秒<i class="fa fa-long-arrow-down"></i
-          ></span>
+          <span>总耗时：{{ dataList.alltime || "--" }}
+              <i v-show="dataList.alltime && compareTime(dataList.p_alltime,dataList.alltime)" class="fa fa-long-arrow-down"></i>
+          </span>
+          <span>等待时间：{{ dataList.waittime || "--" }}
+            <i v-show="dataList.waittime && compareTime(dataList.p_waittime,dataList.waittime)" class="fa fa-long-arrow-down"></i>
+          </span>
+          <span>办理时间：{{ dataList.bltime || "--" }}
+            <i v-show="dataList.bltime && compareTime(dataList.p_bltime , dataList.bltime)" class="fa fa-long-arrow-down"></i>
+          </span>
+        </p>
+        <p>
+          <span>平均耗时：{{ dataList.p_alltime }}</span>
+          <span>平均等待时间：{{ dataList.p_waittime }}</span>
+          <span>平均办理时间：{{ dataList.p_bltime }}</span>
         </p>
-        <p><span v-for="item of 3">平均耗时：14分0秒</span></p>
       </div>
-      <div class="state">接件结束</div>
-      <a-steps
-        direction="vertical"
-        size="small"
-        :current="approveLs.length"
-        class="steps_box"
-      >
-        <a-step
-          v-for="(item, index) of approveLs"
-          :key="item.id"
-          :disabled="true"
-          @click.stop="drawerchange(item.id)"
-          class="step_box"
-        >
+      <div :class="returnScolor">{{ $codeMap.queueState[dataList.style] }}</div>
+      <a-steps direction="vertical" size="small" :current="approveLs.length" class="steps_box">
+        <a-step :disabled="true" class="step_box">
           <div class="icon_box" slot="icon"></div>
           <div class="title_box" slot="title">
-            <span class="title_name">{{
-              item.status == 1
-                ? "办理中"
-                : item.status == 2
-                ? "接件结束"
-                : "排队中"
-            }}</span>
+            <span class="title_name">排队中</span>
           </div>
-          <div
-            class="description_box"
-            slot="description"
-            v-if="item.status == 0"
-          >
+          <div class="description_box" slot="description">
             <div class="details">
-              <span v-for="item of 8"><i class="lable">申报人：</i>张三</span>
+              <span><i class="lable">申报人：</i>{{ dataList.people_name || "--" }}</span>
+              <span><i class="lable">取号时间：</i>{{ dataList.taketime || "--" }}</span>
+              <span><i class="lable">排队编码：</i>{{ dataList.flownum || "--" }}</span>
+              <span><i class="lable">取号方式：</i>{{  $codeMap.takeNumWay[dataList.wy_signin] || "--" }}</span>
+              <span><i class="lable">注册方式：</i>{{ "--" }}</span>
+              <span><i class="lable">取号设备：</i>{{ dataList.take_name || "--" }}</span>
             </div>
           </div>
-          <div
-            class="description_box"
-            slot="description"
-            v-else-if="item.status == 1"
-          >
+        </a-step>
+        <a-step :disabled="true" class="step_box" v-if="dataList.style > 0">
+          <div class="icon_box" slot="icon"></div>
+          <div class="title_box" slot="title">
+            <span class="title_name">办理中</span>
+          </div>
+          <div class="description_box" slot="description">
             <div class="details">
-              <span v-for="item of 6"><i class="lable">办理窗口：</i>s003</span>
+              <span><i class="lable">办理窗口：</i>{{ dataList.window_name || "--" }}</span>
+              <span><i class="lable">办理开始时间：</i>{{ dataList.calltime || "--" }}</span>
+              <span><i class="lable">工作人员：</i>{{ dataList.workman_name || "--" }}</span>
+              <span><i class="lable">叫号设备：</i>{{ dataList.window_fromnum || "--" }}</span>
             </div>
           </div>
-          <div
-            class="description_box"
-            slot="description"
-            v-else-if="item.status == 2"
-          >
+        </a-step>
+        <a-step :disabled="true" class="step_box" v-if="dataList.style > 1">
+          <div class="icon_box" slot="icon"></div>
+          <div class="title_box" slot="title">
+            <span class="title_name">接件结束</span>
+          </div>
+          <div class="description_box" slot="description">
             <div class="details">
-              <span v-for="item of 2"
-                ><i class="lable">办理结束时间：</i>2021-01-15 12:00:00</span
-              >
+              <span><i class="lable">办理结束时间：</i>{{ dataList.endtime || "--" }}</span>
             </div>
           </div>
         </a-step>
       </a-steps>
     </a-drawer>
-  </div>
+</div>
 </template>
 
 <script>
-import modal from "../mixins/modal";
+
+
 export default {
-  mixins: [modal],
   name: "PortalAdminVueHandlingDetails",
 
   data() {
     return {
+      defaultInfoForm: {},
+      modalInfo: {
+        confirmLoading: false,
+        visible: false,
+        title: '用户信息',
+        width: '38%',
+      },
+      dataList: [],
       approveLs: [
         {
           id: "001",
@@ -99,33 +101,52 @@ export default {
       ],
     };
   },
-  filters: {
-    returnScolor(key) {
-      switch (key) {
+  computed: {
+    returnScolor() {
+      switch (this.dataList.style) {
         case 0:
-          return "state_colo1";
+          return "state1";
           break;
         case 1:
-          return "state_colo2";
-          break;
-        case 2:
-          return "state_colo3";
-          break;
-        case 3:
-          return "state_colo2";
-          break;
-        case 4:
-          return "state_colo3";
+          return "state2";
           break;
         default:
-          return "state_colo0";
+          return "state0";
           break;
       }
     },
   },
-  mounted() {},
+  mounted() { 
+  },
 
-  methods: {},
+  methods: {
+    modalClose() {
+      this.modalInfo.visible = false;
+    },
+    // 比较时间大小
+    compareTime(time1, time2) {
+      if (this.timeToSec(time1) - this.timeToSec(time2) > 0) {
+        return true;
+      }
+      return false;
+    },
+    // 转换时间为秒
+    timeToSec(time) {
+      if (time !== null && time !== undefined) {
+        var s = "";
+        if (time.includes("分钟") && time.includes("秒")) {
+          var min = time.split("分钟")[0];
+          var sec = time.split("分钟")[1].split("秒")[0];
+          s = Number(min * 60) + Number(sec);
+          return s;
+        }else{
+          sec = time.split("秒")[0]
+          return sec;
+        }
+
+      }
+    },
+  },
 };
 </script>
 
@@ -133,9 +154,11 @@ export default {
 /deep/.ant-steps-icon {
   top: -4px !important;
 }
+
 /deep/.ant-drawer-content {
   overflow-x: hidden !important;
 }
+
 /deep/.icon_box {
   margin-top: -20px !important;
   display: inline-block;
@@ -154,11 +177,13 @@ export default {
     color: #1d95fd !important;
   }
 }
+
 .headerInfo {
   border-left: 3px solid #0595fd;
   background: #e6f5ff;
   padding: 5px 15px;
   margin-bottom: 20px;
+
   p {
     &:first-child {
       color: #0037b0;
@@ -167,15 +192,18 @@ export default {
       justify-content: space-between;
       padding: 2px 0;
       font-size: 16px;
+
       span {
         display: inline-block;
         width: 32%;
+
         i {
           color: #63d7a5 !important;
           margin-left: 5px;
         }
       }
     }
+
     &:last-child {
       color: #0595fd;
       padding: 2px 0;
@@ -183,6 +211,7 @@ export default {
       font-size: 14px;
       align-items: center;
       justify-content: space-between;
+
       span {
         display: inline-block;
         width: 32%;
@@ -195,10 +224,12 @@ export default {
   .details {
     display: flex;
     flex-wrap: wrap;
+
     span {
       display: inline-block;
       width: 49%;
       padding: 4px 0;
+
       .lable {
         display: inline-block;
         font-style: normal;
@@ -209,7 +240,7 @@ export default {
   }
 }
 
-.state {
+.state0 {
   position: absolute;
   right: 10px;
   top: 150px;
@@ -222,11 +253,45 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  color: #BDBAB4;
+}
+
+.state1 {
+  position: absolute;
+  right: 10px;
+  top: 150px;
+  width: 85px;
+  height: 85px;
+  border: 5px solid #FCE2D9;
+  border-radius: 50%;
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #f7072f;
+}
+
+.state2 {
+  position: absolute;
+  right: 10px;
+  top: 150px;
+  width: 85px;
+  height: 85px;
+  border: 5px solid #D9F1E4;
+  border-radius: 50%;
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #05fd6c;
 }
 
 .state_colo0 {
   color: #bbb;
 }
+
 .state_colo1 {
   color: #fac;
 }
@@ -243,15 +308,18 @@ export default {
   left: 6px !important;
   top: 24px !important;
   border-left: 3px dashed #e6f5ff !important;
+
   &::after {
     background: none !important;
   }
 }
+
 /deep/.ant-steps-item {
-  & + .ant-steps-item {
+  &+.ant-steps-item {
     margin-top: 25px !important;
   }
 }
+
 .handling {
   .steps_box {
     height: 280px !important;

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

 <template>
   <div class="businessModal" ref="businessModal">
-    <a-modal
-      :title="modalInfo.title"
-      :width="modalInfo.width"
-      :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading"
-      @cancel="modalClose"
-      :centered="true"
-      :destroyOnClose="true"
-      :getContainer="() => $refs.businessModal"
-    >
+    <a-modal :title="modalInfo.title" width="400px" :visible="modalInfo.visible"
+      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
+      :getContainer="() => $refs.businessModal">
       <div class="content">
-        <h1>{{ defaultInfoForm.yewuming }}</h1>
-        <em
-          >关联事项（{{
-            defaultInfoForm.guanlianshixiang &&
-            defaultInfoForm.guanlianshixiang.length
-          }}）</em
-        >
-        <p
-          v-for="(item, index) of defaultInfoForm.guanlianshixiang"
-          :key="index"
-        >
-          {{ item.shixiangmingcheng }}
+        <h1>{{ title }}</h1>
+        <em>关联事项（{{ dataList.length }}）</em>
+        <p>
+          <!-- {{ item.shixiangmingcheng }} -->
         </p>
         <h4>
-          <span
-            >受理次数<br /><i>{{ defaultInfoForm.shoulicishu }}</i></span
-          >
-          <span
-            >办结次数<br /><i>{{ defaultInfoForm.banjiecishu }}</i></span
-          >
-          <span
-            >好评率<br /><i>{{ defaultInfoForm.haopinglv }}</i></span
-          >
+          <span>受理次数<br /><i>12</i></span>
+          <span>办结次数<br /><i>12</i></span>
+          <span>好评率<br /><i>99%</i></span>
         </h4>
       </div>
       <template slot="footer">
-        <a-button type="primary" ghost>查看业务分析</a-button>
+        <a-button type="primary" ghost @click="lookDetails">查看业务分析</a-button>
       </template>
     </a-modal>
-  </div>
+</div>
 </template>
 
 <script>
@@ -49,11 +28,18 @@ export default {
   mixins: [modal],
   name: "PortalAdminVueBusinessInfo",
   data() {
-    return {};
+    return {
+      title: '',
+      dataList: []
+    };
   },
 
-  mounted() {},
-  methods: {},
+  mounted() { },
+  methods: {
+    lookDetails() {
+      this.$message.warning('暂未开放');
+    },
+  },
 };
 </script>
 
@@ -65,6 +51,7 @@ export default {
       color: #139bfd;
       padding: 20px;
     }
+
     em {
       padding: 20px;
       font-style: normal;
@@ -72,6 +59,7 @@ export default {
       color: #999;
       margin-bottom: 10px;
     }
+
     p {
       padding: 3px 20px;
       font-size: 16px;
@@ -80,6 +68,7 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
     }
+
     h4 {
       margin-top: 10px;
       padding: 20px;
@@ -87,19 +76,23 @@ export default {
       justify-content: space-between;
       align-items: center;
       background: #f3faff;
+
       span {
         text-align: center;
+
         i {
           color: #0b97fd;
           font-style: normal;
         }
       }
+
       span,
       i {
         padding: 3px 0;
       }
     }
   }
+
   .ant-modal-body {
     padding: 0 !important;
     min-height: 300px !important;

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

@@ -11,7 +11,7 @@
       :getContainer="() => $refs.userModal"
     >
       <div class="content">
-        <h1>{{ defaultInfoForm.name }}</h1>
+        <h1>{{ useInfo.name }}</h1>
         <p>
           <span>{{ defaultInfoForm.Gender }}</span>
           <span>{{ defaultInfoForm.Age }}</span>
@@ -47,7 +47,9 @@ export default {
   mixins: [modal],
   name: "PortalAdminVueUserInfo",
   data() {
-    return {};
+    return {
+      useInfo:[]
+    };
   },
   components: {
     Blockchain,

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

 <template>
   <div class="workPeopleModal" ref="workPeopleModal">
-    <a-modal
-      :title="modalInfo.title"
-      :width="modalInfo.width"
-      :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading"
-      @cancel="modalClose"
-      :centered="true"
-      :destroyOnClose="true"
-      :getContainer="() => $refs.workPeopleModal"
-    >
+    <a-modal :title="modalInfo.title" width="500px" :visible="modalInfo.visible"
+      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
+      :getContainer="() => $refs.workPeopleModal">
       <div class="content">
         <div class="workInfo">
           <div class="left">
-            <img src="../../../../../assets/images/logo.png" alt="" />
+            <img :src="apis + infoData.photoPath" alt="" />
           </div>
           <div class="right">
-            <h1 class="title">刘明洋</h1>
+            <h1 class="title">{{ infoData.name }}</h1>
             <div class="details">
-              <span v-for="item of 3"><i class="lable">工号：</i>01</span>
-              <span v-for="item of 3"><i class="lable">测试工号：</i>01</span>
+              <span><i class="lable">工号：</i>{{ infoData.number || "--" }}</span>
+              <span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span>
+              <span><i class="lable">政治面貌：</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span>
+              <span><i class="lable">电话：</i>{{ infoData.phone || "--" }}</span>
+              <span><i class="lable">星级：</i>{{ infoData.starlevel || "--" }}</span>
             </div>
           </div>
         </div>
         <h2>
-          <span
-            >受理业务<br /><i>{{ defaultInfoForm.souliyewu }}</i></span
-          >
-          <span
-            >评价次数<br /><i>{{ defaultInfoForm.pingjiacishu }}</i></span
-          >
-          <span
-            >好评率<br /><i>{{ defaultInfoForm.haopinglv }}</i></span
-          >
+          <span>受理业务<br /><i>{{ "--" }}</i></span>
+          <span>评价次数<br /><i>{{ "--" }}</i></span>
+          <span>好评率<br /><i>{{ "--" }}</i></span>
         </h2>
       </div>
       <template slot="footer">
-        <a-button type="primary" ghost>查看TA的数据画像</a-button>
-        <a-button type="primary" ghost @click="openBlockchain"
-          >区块链信息</a-button
-        >
+        <a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
+        <a-button type="primary" ghost @click="openBlockchain">区块链信息</a-button>
       </template>
     </a-modal>
     <Blockchain ref="Blockchain" />
-  </div>
+</div>
 </template>
 
 <script>
@@ -53,16 +41,20 @@ export default {
   mixins: [modal],
   name: "PortalAdminVueUserInfo",
   data() {
-    return {};
+    return {
+      infoData: [],
+      apis: process.env.VUE_APP_API_IMG_URL
+    };
   },
   components: {
     Blockchain,
   },
 
-  mounted() {},
+  mounted() { },
   methods: {
     openBlockchain() {
-      this.$refs.Blockchain.modalInfo.visible = true;
+      // this.$refs.Blockchain.modalInfo.visible = true;
+      this.$message.warning('暂未开通')
     },
   },
 };
@@ -72,30 +64,37 @@ export default {
 .workPeopleModal {
   .content {
     .workInfo {
-      padding: 20px;
+      // padding: 20px;
       display: flex;
       justify-content: space-between;
+
       .left {
         width: 100px;
         padding: 0 10px;
+
         img {
           max-height: 120px;
           width: 100%;
         }
       }
+
       .right {
         flex: 1;
+
         .title {
           color: #149bfd;
           font-size: 17px;
         }
+
         .details {
           display: flex;
           flex-wrap: wrap;
+
           span {
             display: inline-block;
             width: 49%;
-            padding: 10px 0;
+            padding: 2px 0;
+
             .lable {
               display: inline-block;
               font-style: normal;
@@ -106,15 +105,20 @@ export default {
         }
       }
     }
+
     h2 {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      margin-top: 10px;
       padding: 20px;
       background: #f3faff;
+      border-radius: 4px;
+
       span {
         font-size: 15px;
         text-align: center;
+
         i {
           color: #3bacfd;
           font-style: normal;
@@ -122,6 +126,7 @@ export default {
       }
     }
   }
+
   .ant-modal-body {
     padding: 0 !important;
     min-height: 300px !important;

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/mixins/modal.js

@@ -34,13 +34,13 @@ export default {
                     yewuming: '公安户籍类',
                     guanlianshixiang: [
                         {
-                            shixiangmingcheng: '事项名称事项名称事项名称事项名称事项名称事项名称',
+                            shixiangmingcheng: '事项名称事项名称事项名称事项名称',
                         },
                         {
-                            shixiangmingcheng: '事项名称事项名称事项名称事项名称事项名称事项名称',
+                            shixiangmingcheng: '事项名称事项名称事项名称事项名称',
                         },
                         {
-                            shixiangmingcheng: '事项名称事项名称事项名称事项名称事项名称事项名称',
+                            shixiangmingcheng: '事项名称事项名称事项名称事项名称',
                         },
                     ],
                     shoulicishu: "12546",