Selaa lähdekoodia

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-OKR

朱鑫波 4 vuotta sitten
vanhempi
commit
366f8d4784
3 muutettua tiedostoa jossa 48 lisäystä ja 51 poistoa
  1. BIN
      dist.zip
  2. 46 49
      src/views/OKRpage.vue
  3. 2 2
      vue.config.js

BIN
dist.zip


+ 46 - 49
src/views/OKRpage.vue

@@ -95,14 +95,15 @@
       <div class="okrBox first">
         <div class="okrBox-title">
           <p class="top-title">本周工作</p>
+          <!-- :disabled="
+              time.year != time.currentYear ||
+              time.quarter != time.currentQuarter
+            " -->
           <el-button
             type="text"
             class="createTask"
             @click="createTask(1)"
-            :disabled="
-              time.year != time.currentYear ||
-              time.quarter != time.currentQuarter
-            "
+            
           >
             <i class="el-icon-plus"></i>新建任务
           </el-button>
@@ -151,12 +152,13 @@
                   </span>
                 </span>
               </el-popover>
-              <div
-                class="list-opt"
-                v-show="
+              <!--  v-show="
                   time.year == time.currentYear &&
                   time.quarter == time.currentQuarter
-                "
+                " -->
+              <div
+                class="list-opt"
+               
               >
                 <!-- <el-progress :percentage="30"  ></el-progress> -->
                 <!-- <div style="width:30%">
@@ -193,14 +195,15 @@
       <div class="okrBox second">
         <div class="okrBox-title">
           <p class="top-title">OKR</p>
+          <!-- :disabled="
+              time.year != time.currentYear ||
+              time.quarter != time.currentQuarter
+            " -->
           <el-button
             type="text"
             @click="openCreateKR"
             class="createTask"
-            :disabled="
-              time.year != time.currentYear ||
-              time.quarter != time.currentQuarter
-            "
+            
           >
             <i class="el-icon-plus"></i>新建KR
           </el-button>
@@ -211,12 +214,13 @@
             <span class="O-content" @click="changeObject(item.objectInfo)">
               {{ item.objectInfo.objectInfo }}
               <!-- <el-button type="warning" icon="el-icon-edit" size='mini' circle></el-button> -->
-              <span
-                class="edit"
-                v-show="
+              <!-- v-show="
                   time.year == time.currentYear &&
                   time.quarter == time.currentQuarter
-                "
+                " -->
+              <span
+                class="edit"
+                
               >
                 <i class="el-icon-edit"></i>
               </span>
@@ -252,7 +256,7 @@
                   <div style="max-height: 200px; overflow: auto">
                     <ul>
                       <li
-                        v-for="(list, indexOne) in Alignment"
+                        v-for="(list, indexOne) in Alignment" :key="indexOne"
                         style="display: flex; justify-content: space-between"
                       >
                         <p
@@ -291,8 +295,7 @@
                   <h2>对齐我的KR</h2>
                   <div style="max-height: 200px; overflow: auto">
                     <ul>
-                      <li
-                        v-for="(list, indexOne) in otherAligned"
+                      <li  v-for="(list, indexOne) in otherAligned" :key="indexOne"
                         style="display: flex; justify-content: space-between"
                       >
                         <p
@@ -341,7 +344,10 @@
                     </span>
                   </span>
                 </el-popover>
-
+                <!-- v-show="
+                      time.year == time.currentYear &&
+                      time.quarter == time.currentQuarter
+                    " -->
                 <span class="KR-opt">
                   <span style="width: 50%">
                     <el-progress
@@ -355,11 +361,12 @@
                     size="mini"
                     circle
                     @click="setAlignment(ele)"
-                    v-show="
+                    
+                  ></el-button>
+                  <!-- v-show="
                       time.year == time.currentYear &&
                       time.quarter == time.currentQuarter
-                    "
-                  ></el-button>
+                    " -->
                   <el-button
                     type="warning"
                     icon="el-icon-edit"
@@ -367,10 +374,7 @@
                     circle
                     @click="editKR(ele)"
                     style="margin-right: 5px"
-                    v-show="
-                      time.year == time.currentYear &&
-                      time.quarter == time.currentQuarter
-                    "
+                    
                   ></el-button>
                   <el-popconfirm
                     icon="el-icon-info"
@@ -379,16 +383,17 @@
                     @onConfirm="deleteKR(ele)"
                   >
                     <!-- <el-button slot="reference">删除</el-button> -->
+                    <!-- v-show="
+                        time.year == time.currentYear &&
+                        time.quarter == time.currentQuarter
+                      " -->
                     <el-button
                       type="danger"
                       slot="reference"
                       icon="el-icon-delete"
                       size="mini"
                       circle
-                      v-show="
-                        time.year == time.currentYear &&
-                        time.quarter == time.currentQuarter
-                      "
+                      
                     ></el-button>
                   </el-popconfirm>
                 </span>
@@ -400,14 +405,15 @@
       <div class="okrBox third">
         <div class="okrBox-title">
           <p class="top-title">未来四周计划</p>
+          <!-- :disabled="
+              time.year != time.currentYear ||
+              time.quarter != time.currentQuarter
+            " -->
           <el-button
             type="text"
             class="createTask"
             @click="createTask(2)"
-            :disabled="
-              time.year != time.currentYear ||
-              time.quarter != time.currentQuarter
-            "
+            
           >
             <i class="el-icon-plus"></i>新建任务
           </el-button>
@@ -457,10 +463,7 @@
               </el-popover>
               <div
                 class="list-opt"
-                v-show="
-                  time.year == time.currentYear &&
-                  time.quarter == time.currentQuarter
-                "
+                
               >
                 <!-- <el-progress :percentage="30"  ></el-progress> -->
                 <!-- <div style="width:30%">
@@ -501,10 +504,7 @@
             type="text"
             class="createTask"
             @click="createStatus"
-            :disabled="
-              time.year != time.currentYear ||
-              time.quarter != time.currentQuarter
-            "
+            
           >
             <i class="el-icon-plus"></i>新建状态指标
           </el-button>
@@ -1166,7 +1166,7 @@
         style="overflow: auto; height: 500px"
       >
         <el-checkbox-group v-model="checkedCities">
-          <li v-for="(item, index) in alignmentList" class="infinite-list-item">
+          <li v-for="(item, index) in alignmentList" :key="index" class="infinite-list-item">
             <el-checkbox :key="item.id" :label="item.id">
               <el-card class="box-card">
                 <h3>
@@ -1888,16 +1888,13 @@ export default {
     },
     editSatus(item) {
       // console.log(item);
-      if (
-        this.time.year == this.time.currentYear &&
-        this.time.quarter == this.time.currentQuarter
-      ) {
+       
         this.statusTitle = "修改状态指标";
         this.statusName = item.content;
         this.statusType = item.type;
         this.statusId = item.id;
         this.statusVisible = true;
-      }
+      
     },
     // 创建状态指标提交
     statusOk() {

+ 2 - 2
vue.config.js

@@ -3,8 +3,8 @@ module.exports = {
         port: 3001,
         proxy: {
             "/api": {
-                target: 'http://192.168.1.188:8910', // 要访问的接口域名
-                // target: 'http://okrapi.c-top.com.cn', // 要访问的接口域名
+                // target: 'http://192.168.1.188:8910', // 要访问的接口域名
+                target: 'http://okrapi.c-top.com.cn', // 要访问的接口域名
                 ws: true, // 是否启用websockets
                 changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
                 pathRewrite: {