修改界面样式

src/components/ComparePlanProfession.vue

@@ -126,7 +126,7 @@
               compareOptions.planInfo2 !== '' &&
               compareOptions.planInfo2 !== null)
           "
-          style="width: 100%"
+          style="width: 100%;margin-bottom:10px"
         >
           <tr>
             <th class="first">组织</th>

src/components/ComparePlanUser.vue

@@ -7,7 +7,7 @@
       style="border-radius: 40px"
     >
       <div slot="title">
-        <p style="text-align: center; margin-bottom: 20px; font-weight: 700">用户列表</p>
+        <p style="text-align: center; margin-bottom: 20px;font-size: 20px; font-weight: 700">{{userInfo.planName}}的用户列表</p>
         <div class="table-content">
           <el-table
             :data="tableData"
@@ -120,9 +120,10 @@
         width="82%"
         style="border-radius: 40px"
       >
+      <!-- <span v-if="userData1.length > 0&&userData2.length > 0">({{multipleSelection[0].userName }}vs{{multipleSelection[1].userName}})</span> -->
         <div slot="title">
-          <p style="text-align: center; margin-bottom: 20px; font-weight: 700">
-            同一计划不同用户对比
+          <p style="text-align: center; margin-bottom: 20px;font-size: 20px; font-weight: 700">
+            同一计划不同用户对比 
           </p>
           <div class="compare_plan">
             <div class="compare_plan_out1">
@@ -570,6 +571,7 @@ export default {
   },
   methods: {
     open(val) {
+      debugger;
       this.planEndTime = val.planEndTime;
       this.userInfo = val;
       this.dialogVisible = true;

src/components/CompareUser.vue

@@ -7,7 +7,7 @@
       style="border-radius: 40px"
     >
       <div slot="title">
-        <p style="text-align: center; margin-bottom: 20px; font-weight: 700">计划列表</p>
+        <p style="text-align: center; margin-bottom: 20px;font-size: 20px; font-weight: 700">{{userInfo.userName}}的计划列表</p>
         <div class="table-content">
           <el-table
             :data="tableData"

src/components/PlanReport.vue

@@ -88,6 +88,7 @@
           </div>
           <div style="flex: 4" class="report_top_right_out" v-show="this.unComplete == 0">
             <img width="auto" src="../assets/img/report/task.png" />
+            <div style="text-align: center;margin-top:20px;font-size:16px">全部人员已完成测试</div>
           </div>
           <div style="flex: 4" class="report_top_right_out" v-show="this.unComplete == 0">
             &nbsp;

src/components/Report.vue

@@ -10,7 +10,7 @@
       >
         <div slot="title">
           <div label-width="150px" class="demo-ruleForm">
-            <p v-if="isView" class="dig_title">{{proDataLin.userName}}计划列表</p>
+            <p v-if="isView" class="dig_title">{{ proDataLin.userName }}的计划列表</p>
             <p v-if="!isView" class="dig_title">编辑计划</p>
             <div slot=""></div>
             <div slot="footer"></div>
@@ -107,7 +107,7 @@
                             align-items: center;
                             cursor: pointer;
                           "
-                          @click="radioClick(item)"
+                          @click="radioClick(item,scope.row)"
                         >
                           <img
                             style="width: 15px; margin-left: 10px"
@@ -189,7 +189,9 @@
         style="border-radius: 40px"
       >
         <div slot="title" style="border-radius: 40px">
-          <p style="text-align: center; font-weight: 700;font-size:20px">{{proDataLin.userName}}的报告</p>
+          <p style="text-align: center; font-weight: 700; font-size: 20px">
+            {{ proDataLin.userName }}的报告
+          </p>
           <div class="kply">
             <div class="kply_inner">
               <div style="padding: 20px 40px">
@@ -216,19 +218,47 @@
                       </div>
                     </div>
                     <div class="totol_result_des" v-if="reportData.length > 0">
+                      <div
+                      v-show="currentFlag == 'SHAPE_RANDOM'"
+                        class="progress_out"
+                        :style="{
+                          width: currentFlag != 'SHAPE_RANDOM' ? '100%' : '50%',
+                        }"
+                        style="display: flex; align-items: center"
+                        v-for="(item, index) in echarts_name_list"
+                        :key="index"
+                      >
+                        <span class="progress_out_name" style="width: 150px;font-size: 16px;font-weight: 700;">
+                          {{ item.name }}
+                        </span>
+
+                        <el-progress
+                          :percentage="echarts_data_list[index]"
+                          style="width: 100%"
+                          :stroke-width="18"
+                          :show-text="false"
+                          :color="colorPro"
+                        />
+                        <span class="progress_out_score">
+                          <span style="color: #ff1e00;font-size: 14px;font-weight: 700;" >{{ echarts_data_list[index] }}</span
+                          ><span style="color: #000000; font-size: 12px; opacity: 0.4"
+                            >/100</span
+                          ></span
+                        >
+                      </div>
+
                       结论：{{ reportData[0].dimensionSymptom }}，{{
                         reportData[0].dimensionImprovement
                       }}
                     </div>
                   </div>
-                  <div class="out_p">
+                  <div class="out_p"   v-show="currentFlag != 'SHAPE_RANDOM'">
                     <div
                       v-show="currentFlag != 'SHAPE_RANDOM'"
                       class="echrts_sty"
                       ref="echarts_ld"
                     ></div>
                     <div class="report_echarts_out">
-                      <!-- justify-content: space-around; -->
                       <div
                         style="
                           display: flex;
@@ -281,7 +311,15 @@
                     </div>
                     <div class="report_des_out">
                       <div class="score">
-                        分数：
+                        <div class="score_lin">
+                          <img
+                            src="../assets/img/report/score.png"
+                            style="width: 20px; height: 20px"
+                            alt=""
+                          />
+                          <span class="score_tt">分数：</span>
+                        </div>
+
                         <span
                           v-if="
                             item.dimensionSymptom == '重度' ||
@@ -296,6 +334,7 @@
                             item.dimensionSymptom == '无症状或轻度' ||
                             item.dimensionSymptom == '无或轻风险'
                           "
+                          style="color: #00bf78"
                         >
                           {{ item.dimensionScore }}</span
                         >
@@ -319,7 +358,16 @@
                       </div>
 
                       <div class="score">
-                        结论：
+                        <span class="score_tt">
+                          <div class="score_lin">
+                            <img
+                              src="../assets/img/report/result.png"
+                              style="width: 20px; height: 20px"
+                              alt=""
+                            />
+                            <span class="score_tt">结论：</span>
+                          </div>
+                        </span>
                         <span
                           v-if="
                             item.dimensionSymptom == '重度' ||
@@ -334,6 +382,7 @@
                             item.dimensionSymptom == '无症状或轻度' ||
                             item.dimensionSymptom == '无或轻风险'
                           "
+                          style="color: #00bf78"
                         >
                           {{ item.dimensionSymptom }}</span
                         >
@@ -349,16 +398,40 @@
                       </div>
                       <!-- <div class="score">分析：</div> -->
                       <div class="scoreAsy">
-                        <span class="scoreAsyTitle">分析：</span
+                        <span class="scoreAsyTitle">
+                          <div class="score_lin">
+                            <img
+                              src="../assets/img/report/asy.png"
+                              style="width: 20px; height: 20px"
+                              alt=""
+                            />
+                            <span class="score_tt">分析：</span>
+                          </div> </span
                         ><span class="scoreAsyDes">{{ item.dimensionImprovement }}</span>
                       </div>
                       <!-- <div class="des">{{ item.dimensionImprovement }}</div> -->
                       <div class="scoreAsy">
-                        <span class="scoreAsyTitle">说明：</span
+                        <span class="scoreAsyTitle">
+                          <div class="score_lin">
+                            <img
+                              src="../assets/img/report/sm.png"
+                              style="width: 20px; height: 20px"
+                              alt=""
+                            />
+                            <span class="score_tt">分析：</span>
+                          </div> </span
                         ><span class="scoreAsyDes">{{ item.dimensionDesc }}</span>
                       </div>
                       <div class="scoreAsy">
-                        <span class="scoreAsyTitle">建议：</span
+                        <span class="scoreAsyTitle">
+                          <div class="score_lin">
+                            <img
+                              src="../assets/img/report/sug.png"
+                              style="width: 20px; height: 20px"
+                              alt=""
+                            />
+                            <span class="score_tt">建议：</span>
+                          </div> </span
                         ><span class="scoreAsyDes">{{ item.dimensionSuggestion }}</span>
                       </div>
                       <!-- <div class="score">说明：</div>
@@ -473,7 +546,16 @@ export default {
       //出现选择了几个题目//需要显示--需要出现个弹出框进行选择
       this.topicVisible = true;
     },
-    radioClick(val) {
+    radioClick(val,planObj) {
+      if (this.userInfo.roleType != "5") {
+        if (planObj.enable == "0") {
+          this.$message({
+            type: "error",
+            message: "暂未授权",
+          });
+          return;
+        }
+      }
       //在数组中招待
       let params = {
         planId: val.planId,
@@ -901,20 +983,37 @@ input[aria-hidden="true"] {
     .des_zhishu {
       color: #222222;
       font-size: 20px;
+      background-color: #00bf78;
       letter-spacing: 3px;
+      color: #ffffff;
+      display: inline-flex;
+      border-radius: 26px;
+      padding: 5px 20px;
     }
 
     .report_des_out {
       margin-top: 10px;
-      background-color: #f7f7f7;
+      // background-color: #f7f7f7;
+      border: 4px solid #f2f2f2;
       padding: 20px 40px;
       border-radius: 40px;
 
       .score {
-        color: #48d68e;
+        // color: #48d68e;
         font-size: 16px;
         line-height: 30px;
         letter-spacing: 2px;
+        margin-bottom: 20px;
+        display: flex;
+        .score_lin {
+          display: flex;
+
+          align-items: center;
+          .score_tt {
+            font-weight: 700;
+            margin-left: 5px;
+          }
+        }
       }
 
       .des {
@@ -926,17 +1025,28 @@ input[aria-hidden="true"] {
       .scoreAsy {
         display: flex;
         flex-direction: row;
+        margin-bottom: 20px;
         .scoreAsyTitle {
-          color: #48d68e;
+          // color: #48d68e;
           font-size: 16px;
           line-height: 30px;
           letter-spacing: 2px;
+
+          .score_lin {
+            display: flex;
+            align-items: center;
+            .score_tt {
+              font-weight: 700;
+              margin-left: 5px;
+            }
+          }
         }
         .scoreAsyDes {
           flex: 1;
           font-size: 16px;
           line-height: 30px;
           letter-spacing: 2px;
+          color: #555555;
         }
       }
     }

src/views/manage/channelInfo/invite.vue

@@ -245,7 +245,7 @@
               <span  v-if=" view.status=='未开始'" style="color: #ff7800"> {{ view.status }}</span>
               <span  v-if=" view.status=='已完成'" style="color: #333333"> {{ view.status }}</span> -->
               <div
-                style="display: flex; justify-content: center; align-items: center"
+                style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '已完成'"
               >
                 <img
@@ -253,10 +253,10 @@
                   src="../../../assets/img/home/isCom.png"
                   alt=""
                 />&nbsp;&nbsp;
-                <div style="color: #333333">已完成</div>
+                <div style="color: #00955e">已完成</div>
               </div>
               <div
-                style="display: flex; justify-content: center; align-items: center"
+                style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '进行中'"
               >
                 <img
@@ -267,7 +267,7 @@
                 <div style="color: #f6cb00">进行中</div>
               </div>
               <div
-                style="display: flex; justify-content: center; align-items: center"
+                style="display: flex; justify-content: start; align-items: center"
                 v-if="view.status == '未开始'"
               >
                 <img
@@ -797,6 +797,7 @@ export default {
 }
 
 .user_out_subNext {
+  text-align: left;
   padding-left: 10px;
   flex: 3;
 }

src/views/manage/channelManagement/channelManagement.vue

@@ -726,6 +726,16 @@ export default {
       this.centerDialogVisible = true;
     },
     addUser(val) {
+
+      if (this.userInfo.roleType != "5") {
+        if (val.enable == "0") {
+          this.$message({
+            type: "error",
+            message: "暂未授权",
+          });
+          return;
+        }
+      }
       this.addRegisterUser(val);
     },
     clearSearch() {

src/views/manage/channelManagement/contract.vue

@@ -197,7 +197,7 @@
                   src="../../../assets/img/home/isCom.png"
                   alt=""
                 />  
-                <div style="color: #333333">已完成</div>
+                <div style="color: #00955e">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"
@@ -557,9 +557,19 @@ export default {
       this.centerDialogVisible = true;
     },
     planUser(val) {
+      if (this.userInfo.roleType != "5") {
+        if (val.enable == "0") {
+          this.$message({
+            type: "error",
+            message: "暂未授权",
+          });
+          return;
+        }
+      }
       this.$refs.planUser.open(val);
     },
     addUser(val) {
+      debugger;
       this.addRegisterUser(val);
     },
     clearSearch() {
@@ -647,6 +657,26 @@ export default {
 
     // 专业报告对比
     compareReport(val) {
+      //查看当前用户---角色
+      //如果当前角色运维管理员
+      if (this.userInfo.roleType != "5") {
+        if (val.enable == "0") {
+          this.$message({
+            type: "error",
+            message: "暂未授权",
+          });
+          return;
+        }
+      }
+      // if(val.enable=='0'){
+      //   this.$message({
+      //     type:'error',
+      //     message:'暂未授权'
+      //   })
+      //   return
+      // }
+      //查看传输参数
+
       sessionStorage.setItem("comparePlanInfo", JSON.stringify(val));
       this.$router.push("/manage/comparePlanProfession");
     },

src/views/manage/generalSituation.vue

@@ -140,18 +140,20 @@
                 <div class="detail">
                   <!-- {{ planStatusFun(item) }} -->
                   <div
-                    style="display: flex; justify-content: center; align-items: center"
+                    style="display: flex; justify-content: center; align-items: center;height:100%"
                     v-if="item.enable == '1'"
                   >
-             
-                    <div style="color: #00955e">已授权</div>
+
+                  <!-- <img src="../../assets/img/home/isA.png" /> -->
+                    <div style="color: #00955e;border:1px solid #577BFF;line-height: 24px;padding:0px 15px;border-radius:20px;background:#F0F6FE;color:#3061FF">已授权</div>
                   </div>
                   <div
-                    style="display: flex; justify-content: center; align-items: center"
+                    style="display: flex; justify-content: center; align-items: center;height:100%"
                     v-if="item.enable == '0'"
                   >
-                   
-                    <div style="color: #d52121">未授权</div>
+                  <div style="color: #00955e;border:1px solid #FDB1B1;line-height: 24px;padding:0px 15px;border-radius:20px;background:#FEF0F0;color:#E14545">未授权</div>
+                     <!-- <img src="../../assets/img/home/isA.png" style="width: 80px;"/> -->
+                    <!-- <div style="color: #d52121">未授权</div> -->
                   </div>
                 </div>
               </div>
@@ -549,7 +551,7 @@ export default {
       let url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}&orgNo=${this.userInfo.orgNo}`;
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
-          debugger;
+
           this.tableData = res.data.content;
           //   this.total = res.data.totalElements;
         } else {