Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/components/DbExam/index.vue

@@ -16,7 +16,7 @@
     <div class="exam-line"></div>
     <div class="exam-box">
       <a-card :bordered="false" ref="question">
-        <div class="exam-title">{{ data.courseName }}<template v-if="item.questionScore">（共{{item.questionCount}}题，每题{{item.questionScore}}分，共{{item.totalScore}}分）</template></div>
+        <div class="exam-title">{{ data.courseName }}</div>
         <div class="exam-main">
           <div v-for="(item, index) in data.question" :key="index">
             <div class="sub-title">{{ $getCapitalizeNumber(index) }}、{{ $getQuestionTypeText(item.questionType) }}<span v-if="type === 'exam'">（共{{ item.questionCount }}题，每题{{ item.questionScore }}分，共{{ item.totalScore }}分）</span></div>

src/views/person/PersonDetail.vue

@@ -203,6 +203,20 @@
         </a-col>
       </a-row>
 
+      <a-divider orientation="left">人脸识别图像</a-divider>
+      <a-row :gutter="24">
+        <a-col :md="12" :sm="24">
+          <a-form :form="form">
+            <a-form-item
+              label="人脸图像"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol">
+              <img alt="image" :src="avatar" style="width: 50%;" v-if="avatar"/>
+            </a-form-item>
+          </a-form>
+        </a-col>
+      </a-row>
+
       <a-divider orientation="left">变动信息</a-divider>
       <s-table
         ref="table"
@@ -249,6 +263,7 @@
         typeData: [],
         idPhotoFace: '',
         idPhotoBack: '',
+        avatar: '',
         // 查询参数
         queryParam: { },
         // 表头
@@ -301,8 +316,10 @@
            })
            this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: typeIntArr })
 
-           this.idPhotoFace = data.idPhotoFace
+           this.idPhotoFace = this.getImgPath(data.idPhotoFace)
-           this.idPhotoBack = data.idPhotoBack
+           this.idPhotoBack = this.getImgPath(data.idPhotoBack)
+           this.avatar = data.avatar
+
            this.form.setFieldsValue(
              {
                id: data.id,
@@ -328,7 +345,16 @@
         })
         this.confirmLoading = false
       },
-
+      getImgPath (imgInfo) {
+        let path
+        if (imgInfo) {
+          const fileArr = JSON.parse(imgInfo)
+          if (fileArr.length > 0) {
+            path = fileArr[0].url
+          }
+        }
+        return path
+      },
       /**
        * 获取字典数据
        */

src/views/person/PersonList.vue

@@ -77,8 +77,8 @@
             </template>
 
             <span slot="action" slot-scope="text, record">
-              <a v-if="hasPerm('person:detail')" @click="$refs.personDetail.detail(record)">详情</a>
+              <a v-if="hasPerm('person:get')" @click="$refs.personDetail.detail(record)">详情</a>
-              <a-divider type="vertical" v-if="hasPerm('person:detail')" />
+              <a-divider type="vertical" v-if="hasPerm('person:get')" />
               <a-dropdown v-if="hasPerm('person:edit') || hasPerm('person:resetPwd') || hasPerm('person:del')">
                 <a class="ant-dropdown-link">
                   更多