From 159eceec84f68a9af387b80e56732ea5ed0486ef Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Thu, 28 Jul 2022 17:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E8=82=B2=E4=B8=AD=E5=BF=83=E5=AE=B6?=
 =?UTF-8?q?=E9=95=BF=E6=9C=8D=E5=8A=A1=EF=BC=9B=E8=AF=81=E4=BB=B6=E7=85=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/homePages/menuTop/interConfig.js    |  17 ++
 .../pages/homePages/menuTop/personInfo.vue    |  21 ++-
 .../homePages/menuTop/personMsgModal.vue      | 167 +++++++++++++++---
 .../parentalServices/principalMailbox.vue     |   8 +-
 .../parentalServices/recipes.vue              |   1 +
 5 files changed, 178 insertions(+), 36 deletions(-)
 create mode 100644 src/views/screenAdaptation/pages/homePages/menuTop/interConfig.js

diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/interConfig.js b/src/views/screenAdaptation/pages/homePages/menuTop/interConfig.js
new file mode 100644
index 0000000..54d9862
--- /dev/null
+++ b/src/views/screenAdaptation/pages/homePages/menuTop/interConfig.js
@@ -0,0 +1,17 @@
+export default {
+    /*
+    *获得某个单位的本单位机构树
+    * org_id 必填 number 机构ID
+    * */
+    "changeModifyPhoto": {
+        //url:"admin/new_base/depinfo_getOrgTree",
+        url: "intellioa/java/sys/cloudPlatform/plupload",
+        method: "post",
+        isTestLogin: true
+    },
+    "personTx": {
+        url: "intellioa/sys/cloudPlatform/getPersonTxByYw",
+        method: "get",
+        isTestLogin: true
+    },
+}
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
index 6e1c74c..b94c5e2 100644
--- a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
+++ b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="login-perosn-info-style">
-        <Portrait :personId="personId"/>
-        <!--        <Portrait :personId="personId" @showMessage="showMessage"/>-->
+        <!--        <Portrait :personId="personId"/>-->
+        <Portrait :personId="personId" @showMessage="showMessage"/>
         <span>{{personName}}</span>
         <div v-if="operateType === 1" class="back-style" title="退出" @click="signOut">
             <a-icon type="rollback"/>
@@ -9,7 +9,9 @@
         <div v-else class="back-style" title="回到首页" @click="toMainPage">
             <a-icon type="home" theme="filled"/>
         </div>
-        <PersonMsgModal :visible="visible" @cancelModal="cancelModal"></PersonMsgModal>
+        <PersonMsgModal :visible="visible" @cancelModal="cancelModal" :full_name="full_name" :user_name="user_name"
+                        :identity="identity" :company="company" :area="area" :id_number="id_number"
+                        :phone_number="phone_number"></PersonMsgModal>
     </div>
 </template>
 <script>
@@ -23,6 +25,16 @@
                 personId: this.$store.state.userStore.user.personId,
                 personName: this.$store.state.userStore.user.personName,
                 visible: false,
+                full_name: '',
+                user_name: '',
+                identity: '',
+                company: '',
+                area: '',
+                id_number: '',
+                phone_number: '',
+                // TEL 手机号
+                // identity_num   身份证号
+
             }
         },
         props: ['operateType'],//1 退出 2 回到首页
@@ -31,7 +43,8 @@
         },
         methods: {
             getData() {
-                // console.log('个人信息', this.$store.state.userStore)
+                this.user_name = this.$store.state.userStore.user.personName
+                console.log('个人信息', this.$store.state.userStore)
             },
             showMessage() {
                 this.visible = true
diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue b/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue
index a5f206d..e4b1c8a 100644
--- a/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue
+++ b/src/views/screenAdaptation/pages/homePages/menuTop/personMsgModal.vue
@@ -7,13 +7,19 @@
             <a-row class="perMsgBox" type="flex">
                 <a-col :span="11" class="perMsg colLeft">
                     <div class="titleLogo">基本信息</div>
-                    <p><span class="title">姓名</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">用户名</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">身份</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">所属单位</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">所属地区</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">身份证号</span> <span class="line"></span><span class="info">{{}}</span></p>
-                    <p><span class="title">手机</span> <span class="line"></span><span class="info">{{}}</span></p>
+                    <p><span class="title">姓名</span> <span class="line"></span><span class="info">{{full_name}}</span>
+                    </p>
+                    <p><span class="title">用户名</span> <span class="line"></span><span class="info">{{user_name}}</span>
+                    </p>
+                    <p><span class="title">身份</span> <span class="line"></span><span class="info">{{identity}}</span>
+                    </p>
+                    <p><span class="title">所属单位</span> <span class="line"></span><span class="info">{{company}}</span>
+                    </p>
+                    <p><span class="title">所属地区</span> <span class="line"></span><span class="info">{{area}}</span></p>
+                    <p><span class="title">身份证号</span> <span class="line"></span><span class="info">{{id_number}}</span>
+                    </p>
+                    <p><span class="title">手机</span> <span class="line"></span><span
+                            class="info">{{phone_number}}</span></p>
                 </a-col>
                 <a-col :span="12" offset="1" class="perMsg colRight">
                     <div class="colRightTbox">
@@ -31,15 +37,20 @@
                         <a-upload maxCount="1" accept=".jpg,.jpeg,.png,.bmp" list-type="picture"
                                   class="fixBtnChange" @change="picFileChange">更换图片
                         </a-upload>
-                        <a-buton class="fixBtnSave" type="primary">保存头像</a-buton>
+                        <a-button class="fixBtnSave" type="primary">保存头像</a-button>
                         <span>仅支持.jpg.jpeg.png.bmp图片格式</span>
                     </div>
                     <div class="colRightBbox">
                         <div class="titleLogo">证件照信息</div>
                         <div class="mypicture">
-                            <img src="./images/cat.jpg" alt="" style="display:inline-block;width: 100%;height: 100%;">
+                            <img src="" ref="IDphoto" alt="" style="display:inline-block;width: 100%;height: 100%;">
                         </div>
-                        <a-buton class="fixBtn" type="primary">修改证件照</a-buton>
+                        <!--<a-upload maxCount="1" accept=".jpg,.jpeg,.png,.bmp" list-type="picture" class="fixBtn"-->
+                        <!--@change="modifyIDphoto">修改证件照-->
+                        <!--</a-upload>-->
+                        <Uploader :type="2" :canUpload="true" :option="{}" :multiple="false" title="修改证件照"
+                                  @uploadComplete="uploadComplete" class="Uploader" :fileData="fileList"
+                        ></Uploader>
                     </div>
                 </a-col>
             </a-row>
@@ -49,9 +60,13 @@
 
 <script>
     import {Modal, Row, Col, Button, Icon, Upload} from 'ant-design-vue';
-
+    import InterConfig from './interConfig'
+    import GUID_UUID from '../../../../../global-llibs/guid-uuid'
+    import BaseConfig from '../../../../../global-llibs/base-config'
+    import Uploader from '../../../../../components/common/uploader/Upload.vue'
     export default {
         name: "PersonMsgModal",
+        props: ['full_name', 'user_name', 'identity', 'company', 'area', 'id_number', 'phone_number', 'visible'],
         data() {
             return {
                 bodyStyle: {
@@ -59,12 +74,12 @@
                 },
                 leftRight: 0,//旋转角度
                 plusMinus: 1,//缩放
-                // imgSrc1: require(this.imgSrcUrl),
-                // imgSrc2: require(''),
+                name: '',
+                key: '',
+                file: '',
+                fileList: [],
             }
         },
-        props: ['visible'],
-        name: "PersonMsgModal",
         components: {
             AModal: Modal,
             ARow: Row,
@@ -72,6 +87,11 @@
             AButton: Button,
             AIcon: Icon,
             AUpload: Upload,
+            Uploader,
+        },
+        created() {
+            this.getPersonTx()
+            this.uploadComplete()
         },
         methods: {
             cancelModal() {
@@ -95,9 +115,54 @@
                 this.$refs.imgChange.style.transform = 'scale(' + this.plusMinus + ')'
             },
             picFileChange(val) {
-                console.log('val',val)
-                console.log('图片路径', val.fileList[0].thumbUrl)
-                this.$refs.imgChange.src = val.fileList[0].thumbUrl
+                this.$refs.imgChange.src = val.file.thumbUrl
+            },
+            modifyIDphoto(val) {
+                console.log('图片信息', val)
+                this.name = val.file.name
+                let split = this.name.split('.');
+                let guid = GUID_UUID.guid();
+                this.key = BaseConfig.url_path_suffix + guid.substring(0, 2) + "/" + guid + "." + split[1]
+                this.file = val;
+                this.$refs.IDphoto.src = val.file.thumbUrl
+                this.getChangeModifyPhoto()
+            },
+            uploadComplete: function (file) {
+                this.fileList = file
+//console.log('filess', this.fileList)
+            },
+            getChangeModifyPhoto() {
+                let param = {
+                    name: this.name,
+                    key: this.key,
+                    chunk: 0,
+                    chunks: 1,
+                    file: this.file,
+                }
+                this.InterfaceConfig.callInterface([{
+                    url: InterConfig.changeModifyPhoto.url,
+                    params: param,
+                    method: InterConfig.changeModifyPhoto.method,
+                    isTestLogin: InterConfig.changeModifyPhoto.isTestLogin,
+                }], (result) => {
+                    console.log('1', result)
+                })
+            },
+            getPersonTx() {
+                let param = {
+                    person_id: BaseConfig.userInfo.person_id_cookie,
+                    identity_id: BaseConfig.userInfo.identity_id_cookie
+                }
+                this.InterfaceConfig.callInterface([{
+                    url: InterConfig.personTx.url,
+                    params: param,
+                    method: InterConfig.personTx.method,
+                    isTestLogin: InterConfig.personTx.isTestLogin,
+                }], (result) => {
+                    if (result[0].data.file_id.length !== 0) {
+                        // this.$refs.imgChange.src =
+                    }
+                })
             }
         }
     }
@@ -113,6 +178,10 @@
         }
     }
 
+    /deep/ .ant-upload {
+        color: #fff !important;
+    }
+
     /deep/ .ant-upload-list-picture .ant-upload-list-item-error, .ant-upload-list-picture-card .ant-upload-list-item-error {
         display: none !important;
     }
@@ -121,6 +190,11 @@
         margin-top: 50px !important;
     }
 
+    /deep/ .ant-progress-inner {
+        width: 110px !important;
+        height: 110px !important;
+    }
+
     /deep/ .ant-modal-content {
         background: none !important;
         border: 3px solid #03EFFD !important;
@@ -296,6 +370,11 @@
 
                         .fixBtnSave {
                             top: 51%;
+                            background: none;
+                            span {
+                                right: 30px;
+                                bottom: 0;
+                            }
                         }
 
                         span {
@@ -321,19 +400,51 @@
                             border: 1px solid #03EFFD;
                             overflow: hidden;
                         }
-
-                        .fixBtn {
+                        .Uploader {
                             position: absolute;
-                            width: 110px;
+                            width: 110px !important;
                             height: 39px;
-                            line-height: 39px;
+                            /*line-height: 39px;*/
                             top: 50%;
-                            right: 65px;
-                            margin-top: -20px;
-                            display: inline-block;
-                            border: 1px solid #03EFFD;
-                            border-radius: 5px;
-                            cursor: pointer;
+                            right: 70px;
+                            margin-top: -24px;
+                            /*display: inline-block;*/
+                            /*border: 1px solid #03EFFD;*/
+                            /*border-radius: 5px;*/
+                            /*cursor: pointer;*/
+                            .img-style {
+                                border: none;
+                                top: -37px;
+                                left: -208px;
+                                img {
+                                    display: inline-block !important;
+                                    border-radius: 50% !important;
+                                    border: 2px solid #25e1ff !important;
+                                    width: 100% !important;
+                                    height: 100% !important;
+                                }
+                                .ant-progress {
+                                    font-size: 30px;
+
+                                }
+                            }
+                            .upload-btn {
+                                /*display: block !important;*/
+                                .upload-Image-style {
+                                    width: 118px !important;
+                                    height: 47px !important;
+                                    background: none !important;
+                                    border: 1px solid #03EFFD !important;
+                                    .icon-style {
+                                        color: rgba(0, 0, 0, 0) !important;
+                                    }
+                                    .ant-upload-text {
+                                        color: #fff !important;
+                                        margin-top: -1.5rem !important;
+                                    }
+                                }
+                            }
+
                         }
                     }
                 }
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
index e5764f1..21f5ef6 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/principalMailbox.vue
@@ -10,7 +10,7 @@
                                 <p>校长信箱</p>
                             </div>
                             <div class="col-cricle2">
-                                <i class="col-cricle2-p1" v-if="total != ''">{{total}}</i>
+                                <i class="col-cricle2-p1">{{total}}</i>
                                 <p class="col-cricle2-p2">内容总数</p>
                             </div>
                         </div>
@@ -49,9 +49,9 @@
         data() {
             return {
                 spinning: false,
-                today_total: null,
-                reply_total: null,
-                total: null,
+                today_total: 0,
+                reply_total: 0,
+                total: 0,
 
 
             }
diff --git a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
index ee663f6..7418f11 100644
--- a/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
+++ b/src/views/screenAdaptation/pages/moralEducationCenter/parentalServices/recipes.vue
@@ -205,6 +205,7 @@
                 /deep/ .ant-select {
                     width: 300px !important;
                     border: 1px solid #01DFF4;
+                    border-radius: 5px;
 
                     .ant-select-selection--single {
                         background: rgba(0, 0, 0, 0) !important;