yangfeng преди 4 години
родител
ревизия
93fabf6da4

+ 2 - 11
src/components/chart/DuoToneChart.vue

@@ -1,16 +1,11 @@
 <template>
   <div class="progess-chart">
     <div class="client-list">
-      <!-- <div class="c-thead">
-        <strong class="c-name"></strong>
-        <span class="c-count">项目数量</span>
-        <span class="c-time text-right">参评项目数量(个)</span>
-      </div> -->
       <div class="progress-bar-container">
         <div class="progress-bar-item" v-for="(item,index) in datas" :key="index">
           <div class="item-label">
             <span class="item-name">{{item.name}}</span>
-            <span class="item-count text-right">{{item.count}}个</span>
+            <span class="item-count text-right">{{item.value}}</span>
           </div>
           <div class="item-progress">
             <span class="item-progress-count" :class="index > 2 ? 'blue-progress' : 'yellow-progress'" :style="{width: item.parent}"></span>
@@ -23,11 +18,7 @@
 <script>
 export default {
   name: 'progess-chart',
-  props: {
-    from: String,
-    // 传入的数据
-    datas: Array
-  },
+  props: ['datas'],
   data () {
     return {}
   },

+ 2 - 2
src/components/chart/MapChart.vue

@@ -63,8 +63,8 @@ export default {
           padding: [8, 12],
           extraCssText: 'box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.08)',
           formatter: (params, ticket, callback) => {
-            if (params.data === null) {
-              return params.name + ':0'
+            if (params.data === null || params.data === undefined || isNaN(params.data)) {
+              return // eslint-disable-line
             } else {
               return params.name + ':' + params.value
             }

+ 1 - 1
src/components/report-data/ProjectTop.vue

@@ -172,7 +172,7 @@ export default {
           font-size: 13px;
           font-weight: 500;
           color: #9B9CA3;
-          background-color: #fff;
+          background-color: transparent;
         }
         .list_index_one{
           background: #FB483D;

Файловите разлики са ограничени, защото са твърде много
+ 526 - 536
src/views/reportData/pageMonth.vue


+ 1 - 0
src/views/reportData/pageWeek.vue

@@ -257,6 +257,7 @@ export default {
       if (!data) return
       data.forEach((v, i) => {
         v.name = v.item
+        v.value = v.count + '个'
         v.parent = v.count / data[0].count * 100 + '%'
       })
       return data

+ 6 - 8
src/views/subscribe/components/SubConfig.vue

@@ -5,26 +5,25 @@
       <div class="item">
         <div class="item-label item-label-required">区域:</div>
         <div class="item-value" @click="dialog.area = true">
-          <el-input class="my custom-long-input" v-model="datas.areaStr" disabled></el-input>
+          <el-input class="custom-long-input" v-model="datas.areaStr" disabled></el-input>
         </div>
       </div>
       <div class="item">
         <div class="item-label item-label-required">采购单位行业:</div>
         <div class="item-value" @click="dialog.buyClass = true">
-          <el-input class="my custom-long-input" v-model="datas.buyClassStr" disabled></el-input>
+          <el-input class="custom-long-input" v-model="datas.buyClassStr" disabled></el-input>
         </div>
       </div>
       <div class="item">
         <div class="item-label item-label-required">信息类型:</div>
         <div class="item-value"  @click="dialog.infoType = true">
-          <el-input class="my custom-long-input" v-model="datas.infoTypeStr" disabled></el-input>
+          <el-input class="custom-long-input" v-model="datas.infoTypeStr" disabled></el-input>
         </div>
       </div>
       <div class="item-other">
         <div class="item-label">项目匹配:</div>
         <div class="item-value item-other-value">
           <el-switch
-            class="my"
             :disabled="projectSwitch.disabled"
             v-loading="projectSwitch.loading"
             @change="switchProjectMatch($event)"
@@ -44,7 +43,6 @@
         <div class="item-label">"其他"采购单位:</div>
         <div class="item-value item-other-value">
           <el-switch
-            class="my"
             :disabled="unitSwitch.disabled"
             v-loading="unitSwitch.loading"
             @change="switchOtherUnit($event)"
@@ -65,10 +63,10 @@
         <div class="item-value item-other-value">
           <el-radio-group v-model="datas.mathway" @change="chooseMathWay($event)">
             <div class="radio-item">
-              <el-radio class="my" name="matchway" :label="1">按标题匹配</el-radio>
+              <el-radio name="matchway" :label="1">按标题匹配</el-radio>
             </div>
             <div>
-              <el-radio class="my" name="matchway" :label="0">按全文匹配</el-radio>
+              <el-radio  name="matchway" :label="0">按全文匹配</el-radio>
             </div>
           </el-radio-group>
           <p class="math-tips">会产生无效信息,请根据需要选择</p>
@@ -332,7 +330,7 @@ export default {
   }
   // element-ui样式修改
   ::v-deep {
-    .el-input__inner{
+    .custom-long-input .el-input__inner{
       font-size: 14px;
       color: #2cb7ca;
       white-space: nowrap;

Някои файлове не бяха показани, защото твърде много файлове са промени