Merge branch 'pre-prod' of https://git.spic.com.cn/scm/dsjsjeq/iam-spic-frontend-fixed into pre-prod

src_product/iam/audit/operationLog/xm-operation-log-list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-col :span="10" style="z-index:100">
+    <a-col :span="10" style="z-index: 100">
       <a-form-model v-bind="{ wrapperCol: { span: 24 } }">
         <a-form-model-item>
           <AuditGroupPicker
@@ -13,7 +13,7 @@
         </a-form-model-item>
       </a-form-model>
     </a-col>
-    <a-col :span="5" style="z-index:100">
+    <a-col :span="5" style="z-index: 100">
       <a-form-model v-bind="{ wrapperCol: { span: 24 } }">
         <a-form-model-item>
           <SdUserPicker
@@ -26,7 +26,7 @@
         </a-form-model-item>
       </a-form-model>
     </a-col>
-    <a-col :span="20" style="z-index:100">
+    <a-col :span="20" style="z-index: 100">
       <a-form-model v-bind="{ wrapperCol: { span: 24 } }">
         <a-form-model-item>
           日志时间:
@@ -48,6 +48,7 @@
           <a-button @click="changDate('day', -7)">近七天</a-button>
           <a-button @click="changDate('month', -1)">近一个月</a-button>
           <a-button @click="changDate('month', -3)">近三个月</a-button>
+          <a-button>导出数据</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-col>
@@ -98,11 +99,11 @@ export default {
   },
   mounted() {
     this.columns.push({ title: '姓名', dataIndex: 'userName', width: '120px' })
-    this.columns.push({ title: '公司', dataIndex: 'unitName' })
+    this.columns.push({ title: '公司', dataIndex: 'parentCompanyName' })
     this.columns.push({ title: '操作时间', dataIndex: 'time' })
     this.columns.push({ title: '操作模块', dataIndex: 'menuName' })
     this.columns.push({ title: '使用时长', dataIndex: 'holderDesc' })
-    // this.initAuditUnit()
+    this.initAuditUnit()
   },
   methods: {
     changeParam(param) {
@@ -111,9 +112,10 @@ export default {
       param.endDateRange = this.endDate
       if (this.unit.length !== 0) {
         param.unitCode = this.unit[0].code
+        param.unitId = this.unit[0].id
       }
       if (this.user.length !== 0) {
-        param.account = this.user[0].account
+        param.account = this.user[0].code
       }
     },
     chang() {

src_product/iam/audit/question/_import-components/audit-question-list-import.js

@@ -27,4 +27,3 @@ export default {
   SdGroupPicker,
   SdSelect,
 }
-console.warn('文件名 audit-question-list.vue 不符合命名规则，应该以 iam 开头')

src_product/iam/audit/question/audit-question-list.vue

@@ -628,7 +628,9 @@ export default {
             if (
               record.endType === '5' &&
               record.problemNature === 'wt' &&
-              record.auditedContactsAccount === getUserInfo().account
+              (record.auditedContactsAccount === getUserInfo().account ||
+                record.resppersonsAccount === getUserInfo().account ||
+                this.isQuestionRestarterAcmin)
             ) {
               return (
                 <span>
@@ -707,11 +709,18 @@ export default {
       rectTypeOpinions: [],
       cancellStatusOptions: [],
       confirmStatusOptions: [],
+      isQuestionRestarterAcmin: false,
     }
   },
   mounted() {
     // 初始化数据字典信息
     this.initDictionaryInfo()
+
+    const adminRole = getUserInfo().roles.find((item) => {
+      return item.code === 'G-1_Question_restart'
+    })
+    console.log(adminRole)
+    this.isQuestionRestarterAcmin = adminRole
   },
   methods: {
     yearChange(value) {
@@ -842,22 +851,27 @@ export default {
 
     // 问题重启
     questionReboot(record) {
-      axios({
-        url: 'api/xcoa-mobile/v1/spic-common/restart-feedback?id=' + record.questionId,
-        method: 'get',
-      }).then((res) => {
-        if (res.data) {
-          Modal.info({
-            title: '提示',
-            content: '重启成功!',
-          })
-          this.refresh()
-        } else {
-          Modal.warning({
-            title: '提示',
-            content: '重启失败，请联系管理员!',
+      Modal.confirm({
+        title: '确认重启问题吗？',
+        onOk: () => {
+          axios({
+            url: 'api/xcoa-mobile/v1/spic-common/restart-feedback?id=' + record.questionId,
+            method: 'get',
+          }).then((res) => {
+            if (res.data) {
+              Modal.info({
+                title: '提示',
+                content: '重启成功!',
+              })
+              this.refresh()
+            } else {
+              Modal.warning({
+                title: '提示',
+                content: '重启失败，请联系管理员!',
+              })
+            }
           })
-        }
+        },
       })
     },