merge

kimi

2020-01-23 11317bf89e4d4194f84229c3d89a786b323c6be4

 src/views/Overview.vue

@@ -23,7 +23,9 @@
         </div>
         <div class="z_shadow" style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #e4eef9;">
            <el-row :gutter="20">
              <el-col :span="6"  v-for="(user, index) in userList" :key="index">111</el-col>
              <el-col :span="6"  v-for="(oneUser, index) in userList" :key="index"><div class="grid-content bg-purple">
              <i class="el-icon-user-solid"></i>
              <span>{{oneUser.name}}</span></div></el-col>
            </el-row>
         </div>
         <div class="z_shadow" style="float: left; margin: 10px; padding: 10px; box-sizing: border-box; width: 46%; height: 43%; border: 1px solid #e4eef9;">
@@ -44,10 +46,15 @@
            </div>
         </div>
      </div>
      <div class="z_shadow" style="float: right; margin-right: 1%; width: 28%; height: 70vh; border: 1px solid #e4eef9;"></div>



      <div class="z_shadow" style="float: right; margin-right: 1%; padding: 10px; box-sizing: border-box; width: 28%; height: 70vh; border: 1px solid #e4eef9; overflow: auto;">
         <h3 style="margin: 0px;">项目概览</h3>
         <div v-for="(type_itm, k_) in task_itm" :key="k_">
            <h3>{{k_+1}}、{{type_itm.name}} <span style="font-size: 12px; color: #409EFF;">{{type_itm.state}} </span></h3> 
            <div>
               <span>{{type_itm.desp}}</span>
            </div>
         </div>
      </div>

   </div>
</template>
@@ -63,6 +70,19 @@
            dialog_1: false,
            fileLevel: 0,
            fileList: [],
	
            task_itm: [
                {'id': "111_1", 'name': "立题服务", desp: "描述看到静安寺", 'state': "进行中"}, //
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
                {'id': "111_2", 'name': "方案开发服务", desp: "描述看到静安寺", 'state': "进行中"}, 
					
            ],
            myChart: undefined,
            userList: [],
            grandPa:"",
@@ -192,13 +212,25 @@
                  result.record = result.record.map(el => {
                     var imoment = this.$moment(el.createTime);
                     // 格式化成，年月日
                     let iformat = imoment.format('YYYY-MM-DD');
                     let iformat = imoment.format('YYYY-MM-DD HH:mm:ss');
                     el.createTime = iformat;
                     if(!el.desp) {
                        el.desp = "暂无描述";
                     }
                     return el;
                  });
                  result.scheme = result.scheme.map(el => {
                     if(el.finish) {
                        el.state="已结束";
                     }else if(el.delay) {
                        el.state="已延期";
                     }else if(el.edit) {
                        el.state="待启动";
                     }else {
                        el.state="进行中";
                     }
                     return el;
                  });
                  me.fileList = result.paths;
                  me.scheme = result.scheme;
                  me.deals = result.record;