发包

public/index.html

@@ -35,10 +35,10 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>
-      // window.SITE_CONFIG['apiURL'] = 'https://transcend.ringzle.com/chuangheng-admin';
-      window.SITE_CONFIG['apiURL'] = 'http://172.16.0.3:443/chuangheng-admin';//生产内网地址
+      window.SITE_CONFIG['apiURL'] = 'https://transcend.ringzle.com/chuangheng-admin';
+      // window.SITE_CONFIG['apiURL'] = 'http://172.16.0.3:443/chuangheng-admin';//生产内网地址
       // window.SITE_CONFIG['apiURL'] = 'https://wxapp.transcend-intl.cn/chuangheng-admin';
-      // window.SITE_CONFIG['apiURL'] = 'http://192.168.2.19:9021/chuangheng-admin';
+      // window.SITE_CONFIG['apiURL'] = 'http://192.168.2.16:9021/chuangheng-admin';
       window.SITE_CONFIG['apiURL1'] = 'http://gpu.ringzle.com:8082/iot';
       window.SITE_CONFIG['apiURL2'] = 'http://gpu.ringzle.com:8082/witcarbon-gica';
       // 李勇本机地址

src/components/reportPdf/pdf.vue

@@ -56,7 +56,6 @@
                         <img src="@/assets/images/report/intro_r.png">
                         <div class="jbp_title" style="line-height: 30px;">关系</div>
                         <p style="margin-top: 0;">团队成员之间是否相互信任和尊重？</p>
-                        <p>团队成员之间是否相互信任和尊重？</p>
                         <p>团队成员之间的关系是否有助于实现真正紧密的协作？</p>
                     </div>
                     <div class="jb_pre jp4">

src/views/modules/agent/questionnaire/detail.vue

@@ -21,11 +21,14 @@
                     <div class="cr_list">
                         <div class="crl_item" v-for="(item, index) in dataList" :key="index" :ref="el => { sectionRefs[index] = el }">
                             <div class="ci_title adfac"><span>*</span>{{ (index+1)+'.'+item.question }}</div>
-                            <div class="ci_answer adfac" v-for="(answer, idx) in item.questionOption" :key="idx">
-                                <template v-if="item.questionType==='2'">
-                                    <img src="@/assets/images/agent/notselect_mini.png">
-                                    <span>{{ answer.questionOption }}</span>
-                                </template>
+                            <div class="ci_box" v-for="(qo, qi) in item.questionOption" :key="qi" >
+                                <div class="cib_text">{{ assessmentMethodCfg[qo.assessmentMethod] }}</div>
+                                <div class="ci_answer adfac" v-for="(answer, idx) in qo.questionOption" :key="idx">
+                                    <template v-if="item.questionType==='2'">
+                                        <img src="@/assets/images/agent/notselect_mini.png">
+                                        <span>{{ answer.questionOption }}</span>
+                                    </template>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -52,6 +55,10 @@
         2: '中级',
         3: '高级'
     }
+    const assessmentMethodCfg = {
+        '1':'您对团队当前在此项陈述上所描述的实际表现的同意程度为：',
+		'2':'此项陈述对该团队当前的重要性： '
+    }
     const questionList = ref([])
     const dataList = ref([])
     const questionnaireId = ref('')
@@ -233,6 +240,15 @@
                                     margin-right: 8px;
                                 }
                             }
+                            .cib_text{
+                                padding: 7px 20px;
+                                font-family: PingFangSC, PingFang SC;
+                                font-weight: 400;
+                                font-size: 14px;
+                                color: #761E6A;
+                                background: rgba(118,30,106,0.12);
+                                margin-top: 16px;
+                            }
                             .ci_answer{
                                 position: relative;
                                 // img{

src/views/modules/agent/questionnaireList.vue

@@ -6,7 +6,7 @@
                 <p class="tip">创建和管理PERILL评估问卷</p>
             </div>
             <div class="t_r">
-                <el-button type="primary" icon="el-icon-plus" @click="show=true" v-hasPermi="['core:questionnaire:create']">新增问卷</el-button>
+                <el-button type="primary" icon="el-icon-plus" @click="showAdd" v-hasPermi="['core:questionnaire:create']">新增问卷</el-button>
             </div>
         </div>
         <div class="query adfacjb">
@@ -65,6 +65,12 @@
                         <el-option label="高级" :value="3"></el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="评估方法" prop="assessmentMethod">
+                    <el-select v-model="form.assessmentMethod" multiple placeholder="请选择评估方法" style="width: 100%;">
+                        <el-option label="同意度" :value="1"></el-option>
+                        <el-option label="重要性" :value="2"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
                 </el-form-item>
@@ -119,12 +125,14 @@
         id:'',
         title: '',
         type: '',
+        assessmentMethod:null,
         remark: '',
         file: ''
     })
     const rules = ref({
         title:[{required:true,message:'请输入问卷标题',trigger:'blur'}],
         type:[{required:true,message:'请选择问卷类型',trigger:'change'}],
+        assessmentMethod:[{required:true,message:'请选择评估方法',trigger:'change'}],
         file:[{required:true,message:'请上传附件',trigger:'change'}]
     })
 
@@ -151,7 +159,10 @@
         proxy.$refs.wjRef.validate(async valid => {
             if (valid) {
                 buttonLoading.value = true;
-                const res = await addQuestionnaire(form.value);
+
+                let dto = JSON.parse(JSON.stringify(form.value));
+                if(dto.assessmentMethod) dto.assessmentMethod = dto.assessmentMethod.join(',');
+                const res = await addQuestionnaire(dto);
                 if (res.code === 0) {
                     proxy?.$modal.msgSuccess('新增成功！');
                     buttonLoading.value = false;
@@ -164,12 +175,27 @@
         })
     }
 
+    const showAdd = () => {
+        show.value = true;
+        form.value = {
+            id:'',
+            title: '',
+            type: '',
+            assessmentMethod:null,
+            remark: '',
+            file: ''
+        }
+        fileList.value = [];
+        proxy?.$refs.wjRef.resetFields();
+    }
+
     const cancel = () => {
         show.value = false;
         form.value = {
             id:'',
             title: '',
             type: '',
+            assessmentMethod:'',
             remark: '',
             file: ''
         }