Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang

src/components/ImageUpload/index.vue

@@ -135,9 +135,10 @@ export default {
         const result = regex.test(file.name)
 
         if (result === true) {
-          this.fileList = []
+          // this.fileList = []
           // this.$refs.imageUpload.clearFiles()
           this.$modal.msgError('文件名称不正确，请上传不包含特殊字符名称的图片')
+          return false
         } else if (result === false) {
           let isImg = false
           if (this.fileType.length) {
@@ -145,9 +146,10 @@ export default {
 
             if (file.name.lastIndexOf('.') > -1) {
               fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
+              console.log('21212',fileExtension)
             }
             isImg = this.fileType.some(type => {
-              if (file.type.indexOf(type) > -1) return true
+              // if (file.type.indexOf(type) > -1) return true
               if (fileExtension && fileExtension.indexOf(type) > -1) return true
               return false
             })

src/views/echartHome/confidentialityTasks.vue

@@ -64,7 +64,7 @@ export default {
             fontSize: 16
           }
         },
-        color: ['#8C79EA', '#12BEDF', '#F6B24B', '#1A6FD7'],
+        color: ['#12BEDF', '#8C79EA', '#1A6FD7', '#F6B24B'],
         tooltip: {
           trigger: 'item'
         },
@@ -88,11 +88,11 @@ export default {
               rich: {
                 b: {
                   fontSize: 16,
-                  fonWweight: 700,
+                  fontWeight: 700,
                   color: ' #303133'
                 },
                 d: {
-                  fontSsize: 14,
+                  fontSize: 14,
                   fontWeight: 400,
                   color: ' #606266'
                 }

src/views/echartHome/standardClassification.vue

@@ -67,7 +67,7 @@ export default {
         legend: {
           top: 'bottom'
         },
-        color: ['#F6B24B', '#1A6FD7', '#13BE24'],
+        color: ['#F6B24B', '#13BE24', '#1A6FD7'],
         series: [
           {
             name: 'Nightingale Chart',

src/views/echartHome/useCaseTest.vue

@@ -48,7 +48,7 @@ export default {
         },
         yAxis: {
           type: 'category',
-          data: ['自动', '半自动', '手工']
+          data: ['手工', '半自动', '自动']
         },
         series: [
           {
@@ -56,9 +56,9 @@ export default {
             type: 'bar',
             barWidth: '20',
             data: [
-              { itemStyle: { color: '#13BE24' }, value: 120 },
               { itemStyle: { color: '#7F69E8' }, value: 200 },
-              { itemStyle: { color: '#1A6FD7' }, value: 150 }
+              { itemStyle: { color: '#1A6FD7' }, value: 150 },
+              { itemStyle: { color: '#13BE24' }, value: 120 }
             ]
           }
         ]

src/views/index.vue

@@ -140,7 +140,15 @@
                   :stroke-width="10"
                   :show-text="false"
                 ></el-progress>
-                <div style="margin-top: 10px; text-align: center">
+                <div
+                  style="
+                    margin-top: 10px;
+                    text-align: center;
+                    font-size: 14px;
+                    font-weight: 700;
+                    color: #303133;
+                  "
+                >
                   {{
                     quantityStatisticsForm.completedTaskProportion
                       ? quantityStatisticsForm.completedTaskProportion
@@ -170,7 +178,15 @@
                   :stroke-width="10"
                   :show-text="false"
                 ></el-progress>
-                <div style="margin-top: 10px; text-align: center">
+                <div
+                  style="
+                    margin-top: 10px;
+                    text-align: center;
+                    font-size: 14px;
+                    font-weight: 700;
+                    color: #303133;
+                  "
+                >
                   {{
                     quantityStatisticsForm.executeTaskProportion
                       ? quantityStatisticsForm.executeTaskProportion
@@ -249,7 +265,7 @@
                     <div
                       style="color: #1a6fd7; font-weight: 700; font-size: 16px"
                     >
-                      {{ item.standardNumber }}
+                      标准：{{ item.standardNumber }}
                     </div>
                   </div>
                   <AverageTest