Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table

src/components/pages/components/worksDetail2.vue

@@ -189,7 +189,7 @@
           :visible.sync="dialogVisible3"
           :append-to-body="true"
           :before-close="handleClose"
-          width="1000px"
+          width="1200px"
           class="dialog_diy2"
         >
           <div class="zyBoxC">
@@ -273,11 +273,16 @@
                   </div>
                 </div>
               </div>
-              <div style="width: 310px; margin-right: 10px">
+              <div style="width: 610px; margin-right: 10px">
                 <div
                   class="sd_score"
                   style="box-sizing: border-box; width: 100%; box-shadow: none"
                 >
+                  <div class="title" style="margin-bottom: 10px">
+                    <span style="font-size: 18px; width: unset; display: unset"
+                      >量规评分</span
+                    >
+                  </div>
                   <div
                     class="score_box"
                     v-for="(item, index) in worksDetail.eList"
@@ -292,6 +297,7 @@
                       <span>{{ item.value }}</span>
                     </el-tooltip>
                     <el-rate
+                      class="rate_size"
                       style="min-width: 120px"
                       v-model="worksDetail.rateList[item.value]"
                     ></el-rate>
@@ -319,7 +325,7 @@
                 </div>
                 <div class="data_body">
                   <div class="title">
-                    <span style="font-size: 18px">量规评分</span>
+                    <span style="font-size: 18px">雷达图</span>
                   </div>
                   <div style="width: 100%">
                     <!-- <img src="../../../assets/dataimage/1.png" style="width:90%" /> -->
@@ -632,6 +638,7 @@ export default {
           top: "bottom",
         },
         radar: {
+          radius: ["0%", "70%"],
           shape: "circle",
           center: ["50%", "50%"],
           axisName: {
@@ -640,16 +647,10 @@ export default {
               color: "#58a5e6",
             },
             formatter: function (value, indicator) {
-              value = value.replace(/\S{3}/g, function (match) {
-                return match + "\n";
-              });
-              // return "{a|" + value + "}";
-              return "";
-            },
-            rich: {
-              a: {
-                fontSize: 12,
-              },
+              // value = value.replace(/\S{2}/g, function (match) {
+              //   return match + "\n";
+              // });
+              return value;
             },
           },
           indicator: [
@@ -874,8 +875,10 @@ export default {
           setTimeout(() => {
             var _ooption = JSON.parse(JSON.stringify(this.ooption));
             // var _option = JSON.parse(JSON.stringify(this.option));
-            var _option = JSON.parse(JSON.stringify(this.radarOption));
-
+            // var _option = JSON.parse(JSON.stringify(this.radarOption));
+            var _option = this.radarOption;
+            _option.radar.indicator = [];
+            _option.series[0].data[0].value = [];
             for (var i = 0; i < _ooption.length; i++) {
               _option.radar.indicator.push({ name: _ooption[i].name, max: 5 });
               _option.series[0].data[0].value.push(_ooption[i].value);
@@ -1069,8 +1072,10 @@ export default {
             }
           }
 
-          var _option = JSON.parse(JSON.stringify(this.radarOption));
-
+          // var _option = JSON.parse(JSON.stringify(this.radarOption));
+          var _option = this.radarOption;
+          _option.radar.indicator = [];
+          _option.series[0].data[0].value = [];
           for (var i = 0; i < _ooption.length; i++) {
             _option.radar.indicator.push({ name: _ooption[i].name, max: 5 });
             _option.series[0].data[0].value.push(_ooption[i].value);
@@ -1635,16 +1640,28 @@ export default {
   border-radius: 5px;
   width: 90%;
   box-shadow: 2px 2px 5px #909090;
-  height: 220px;
+  height: 238px;
   overflow: auto;
 }
 .sd_score .score_box {
   display: flex;
   align-items: center;
-  margin-bottom: 18px;
+  justify-content: center;
+  margin-bottom: 15px;
+  /* margin-left: 30px; */
+}
+.sd_score .score_box:last-child {
+  margin-bottom: 0;
+}
+
+.rate_size >>> .el-rate__icon {
+    font-size: 25px;
+}
+.rate_size >>> .el-icon-star-off{
+  font-size: 22px;
 }
 .sd_score span {
-  width: 100px;
+  width: 130px;
   text-align: justify;
   text-align-last: justify;
   display: block;
@@ -1652,6 +1669,7 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  font-size: 16px;
 }
 .moreSay {
   margin: 0px 0 5px 20px;