魏志佳 4 år sedan
förälder
incheckning
0dea86d4fa
9 ändrade filer med 262 tillägg och 114 borttagningar
  1. BIN
      dist.zip
  2. 5 5
      src/Layout.vue
  3. 1 1
      src/utils/api/login.js
  4. 10 10
      src/utils/api/request.js
  5. 2 2
      src/views/Login.vue
  6. 66 27
      src/views/OKRList.vue
  7. 176 67
      src/views/OKRpage.vue
  8. 1 1
      src/views/TransferLocal.vue
  9. 1 1
      vue.config.js

BIN
dist.zip


+ 5 - 5
src/Layout.vue

@@ -84,11 +84,11 @@ import Vue from 'vue'
           }
         },
         mounted() {
-          let userInfo=JSON.parse(localStorage.getItem('Login_Userinfo'))
-          if(userInfo){
-            this.userName=userInfo.value.name
-            this.img=userInfo.value.thumbAvatar
-          }
+            let userInfo=JSON.parse(localStorage.getItem('Login_Userinfo'))
+            if(userInfo){
+              this.userName=userInfo.value.name
+              this.img=userInfo.value.thumbAvatar
+            }
         },
     }
 </script>

+ 1 - 1
src/utils/api/login.js

@@ -49,7 +49,7 @@ export function getInfo() {
 
 export function logout(logoutToken) {
   return axios({
-    url: '/api/okr/sys/logout',
+    url: '/okr/sys/logout',
     method: 'post',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8',

+ 10 - 10
src/utils/api/request.js

@@ -7,17 +7,17 @@ import {ACCESS_TOKEN} from "@/store/mutation-types"
 
 // 创建 axios 实例
 
-// if (process.env.NODE_ENV == 'development') { 
-//     axios.defaults.baseURL = '/jeecg-boot'
-// } 
-// else if (process.env.NODE_ENV == 'debug') { 
-// } 
-// else if (process.env.NODE_ENV == 'production') { 
-//     // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
-// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot';
-// }
+if (process.env.NODE_ENV == 'development') { 
+    axios.defaults.baseURL = '/api'
+} 
+else if (process.env.NODE_ENV == 'debug') { 
+} 
+else if (process.env.NODE_ENV == 'production') { 
+    // axios.defaults.baseURL = 'http://192.168.1.251/jeecg-boot';
+  axios.defaults.baseURL = 'http://okrapi.c-top.com.cn';
+}
 const service = axios.create({
-//   baseURL: '/jeecg-boot', // api base_url
+  // baseURL: '/jeecg-boot', // api base_url
   timeout: 6000000 // 请求超时时间
 })
 

+ 2 - 2
src/views/Login.vue

@@ -21,7 +21,7 @@
                 var url = '';
                 // console.log(process.env)
                 if (process.env.NODE_ENV === 'development') {
-                    url = 'http://192.168.1.105:3001'
+                    url = 'http://192.168.1.105:3000'
                 } else if (process.env.NODE_ENV === 'production') {
                     url = 'http://okr.c-top.com.cn'
                 }
@@ -30,7 +30,7 @@
                     id: 'wx_reg',
                     appid: 'ww24b8a47826f5875f',
                     agentid: '1000004',
-                    redirect_uri: 'http://okr.c-top.com.cn/okr/callback/qywexin',
+                    redirect_uri: 'http://okrapi.c-top.com.cn/okr/callback/qywexin',
                     state: url + '/transfer-local',
                     href: ''
                 })

+ 66 - 27
src/views/OKRList.vue

@@ -149,7 +149,7 @@
                                         <span class="KR-tip">KR{{index+1}}</span>
                                         <span class="KR-content">{{ele.krInfo}}</span>
                                         <span class="KR-opt"> 
-                                            <span style="width:35%">
+                                            <span style="width:80%">
                                                 <el-progress :percentage="ele.completion"  color='#cc9966'></el-progress>
                                             </span>                                
                                             
@@ -190,12 +190,17 @@
                         <div class="okrBox-title">
                             <p class="top-title">状态指标</p>
                         </div>
-                        <div class="status-list">
+                        <div class="status-list">                  
+                            <li v-for="item in status" :key='item.id' class="status">
+                                <span class="itemStatus"  :style="'background-color:'+item.color"  >{{item.content}}</span>
+                            </li>
+                        </div>
+                        <!-- <div class="status-list">
                         
                         <span v-for="item in status" :key='item.id' :style="'background-color:'+item.color" class="status" @click="editSatus(item)">
                             {{item.content}}
                         </span>
-                        </div>
+                        </div> -->
                     </div>
                 </div>
             </div>
@@ -301,7 +306,7 @@ export default {
         getList(){
             this.isCurrentQuarter=2;
             this.list=[];
-            postAction('/api/okr/okr/getSyncUserListByMemberId',{
+            postAction('/okr/okr/getSyncUserListByMemberId',{
                 year:this.yearValue,
                 quarter:this.cycleValue,
                 name:this.nameValue
@@ -321,7 +326,7 @@ export default {
             if(this.isCurrentQuarter!=1){
                 this.currentData=item
             }else{
-                postAction('/api/okr/okr/getOkrInfo',{
+                postAction('/okr/okr/getOkrInfo',{
                     userId:item.object.userId
                 }
                 ).then((res)=>{
@@ -350,7 +355,7 @@ export default {
         },
     },
     mounted() {
-        postAction('/api/okr/okr/getSyncUserListByMemberId',{
+        postAction('/okr/okr/getSyncUserListByMemberId',{
             
         }).then((res)=>{
             console.log(res);
@@ -359,7 +364,7 @@ export default {
             this.yearValue=res.result.year;
             this.cycleValue=res.result.quarter
         })
-        postAction('/api/okr/okr/getObjectYear ',{           
+        postAction('/okr/okr/getObjectYear ',{           
         }).then((res)=>{
             console.log(res);
             this.yearsOptions=[]
@@ -376,6 +381,7 @@ export default {
 
 <style lang="less" scoped>
 .OKRList{
+     max-height: 300px;
     .topBox{
         height: 41px;
     }
@@ -703,7 +709,8 @@ ul,li{
         color: #000;
         .okrBox{
             width: 49.5%;
-            height: 49%;
+            // height: 49%;
+            height: 320px;
             min-height: 280px;
             margin-right: 1%;
             background: #fff;
@@ -727,7 +734,7 @@ ul,li{
             }
             .okrbox-list{
                 overflow: auto;
-                max-height: 80%;
+                max-height: 250px;
                 // margin-top: 10px;
                 text-align: left;
                 font-size: 14px;
@@ -777,30 +784,44 @@ ul,li{
                     display: flex;
                 }
             }
-            .status-list{
-                padding: 20px;
-                display: flex;
-                flex-wrap:  wrap ;
-                height: 80%;
-                justify-content: space-around;
+           .status-list{
+                overflow: auto;
+                max-height: 250px;
+                // margin-top: 10px;
+                text-align: left;
+                font-size: 14px;
+                color: #333;
                 box-sizing: border-box;
                 // align-content: center;
                 .status{
-                    display: inline-block;
-                    width: 20%;
+                    display: block;
+                    // width: 20%;
+                    width: auto;
                     min-width: 120px;
-                    height: 65px; 
-                    padding: 10px 10px;
+                    height: 60px; 
+                    // padding: 10px 10px;
                     box-sizing: border-box;
-                    margin-right: 2%;
-                    border-radius: 20px;
-                    cursor: pointer;
+                    justify-content: center;
+                    display: flex;
+                    
+                    // margin-bottom: 10px;
+                    .itemStatus{
+                        display: inline-block;
+                        height: 40px;
+                        line-height: 40px;
+                        padding: 0 15px;
+                        border-radius: 10px;
+                        margin: 0 auto;
+                        cursor: pointer;
+                    }
                 }
             }
             .objectList{              
                 text-align: left;
                 overflow: auto;
-                min-height: 75%;
+                max-height: 85%;
+                height: 80%;
+                
                 .OBox{
                     background: #fafbfc;
                     height: 62px;
@@ -846,12 +867,14 @@ ul,li{
                     background: #fafbfc;
                     font-size: 14px;
                     ul{
-                        li{
+                       li{
                             width: 100%;
-                            height: 30px;
+                            height: 40px;
                             padding: 5px 20px;
                             position: relative;
                             box-sizing:border-box;
+                            line-height: 40px;
+                            position: relative;
                             .KR-tip{
                                 height: 20px;
                                 line-height: 20px;
@@ -861,9 +884,18 @@ ul,li{
                                 background: rgba(46, 156, 255, 0.1);
                                 border-radius: 11.5px;
                                 padding: 3px 9px;
+                                position: absolute;
+                                top: 8px;
                             }
                             .KR-content{
-
+                                width:60% ;
+                                display: inline-block;
+                                overflow:hidden;
+                                white-space:nowrap;
+                                text-overflow:ellipsis;
+                                height:100%;
+                                line-height: 30px;
+                                padding-left: 45px;
                             }
                             .KR-opt{
                                 position: absolute;                              
@@ -871,7 +903,7 @@ ul,li{
                                 top:5px;
                                 display: flex;
                                 // display: none;
-                                width: 50%;
+                                width: 30%;
                                 position: absolute;
                                 justify-content:flex-end;
                                 align-items:center
@@ -1057,6 +1089,13 @@ ul,li{
                     background: none;
                 }
             }
+            .el-input--suffix .el-input__inner {
+                padding-right: 66px;
+            }
+           
+        }
+        .el-input--suffix .el-input__inner {
+            padding-right: 50px;
         }
     }
     .editKRBody{

+ 176 - 67
src/views/OKRpage.vue

@@ -68,8 +68,19 @@
                                 <!-- <div style="width:30%">
                                     <el-progress :percentage="50" color='#cc9966'></el-progress>
                                 </div> -->
-                                <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)"></el-button>
-                                <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteTask(item)"></el-button>
+                                <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)" style='margin-right:5px'></el-button>
+                                <el-popconfirm
+                                    
+                                    icon="el-icon-info"
+                                    iconColor="red"
+                                    title="确定删除吗?"
+                                    @onConfirm="deleteTask(item)"
+                                    >
+                                    <!-- <el-button slot="reference">删除</el-button> -->
+                                    <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
+                                </el-popconfirm>
+
+                                
                             </div>
                             
                         </li>
@@ -92,14 +103,34 @@
                     <div class="KRBox">
                         <ul>
                             <li v-for="(ele,index) in item.krList" :key="index">
-                                <span class="KR-tip">KR{{index+1}}</span>
-                                <span class="KR-content">{{ele.krInfo}}</span>
+                                <span class="KR-tip">KR</span>
+                                <el-popover
+                                    placement="top-start"
+                                    
+                                    width="300"
+                                    trigger="hover"
+                                    :content="'KR:'+ele.krInfo">  
+                                    
+                                    <span slot="reference" class="content">
+                                        <span class="KR-content">{{ele.krInfo}}</span>
+                                    </span>                            
+                                </el-popover>
+                                
                                 <span class="KR-opt"> 
                                     <span style="width:35%">
                                          <el-progress :percentage="ele.completion"  color='#cc9966'></el-progress>
                                     </span>                                
-                                    <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editKR(ele)"></el-button>
-                                    <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteKR(ele)"></el-button>                                   
+                                    <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editKR(ele)" style='margin-right:5px'></el-button>
+                                    <el-popconfirm                                   
+                                        icon="el-icon-info"
+                                        iconColor="red"
+                                        title="确定删除吗?"
+                                        @onConfirm="deleteKR(ele)"
+                                        >
+                                        <!-- <el-button slot="reference">删除</el-button> -->
+                                        <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
+                                    </el-popconfirm>
+                                                                   
                                 </span>
                             </li>
                         </ul>
@@ -133,8 +164,17 @@
                                 <!-- <div style="width:30%">
                                     <el-progress :percentage="50" color='#cc9966'></el-progress>
                                 </div> -->
-                                <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)"></el-button>
-                                <el-button type="danger" icon="el-icon-delete" size='mini' circle @click="deleteTask(item)"></el-button>
+                                <el-button type="warning" icon="el-icon-edit" size='mini' circle @click="editTask(item)" style="margin-right:5px"></el-button>
+                                <el-popconfirm                                   
+                                        icon="el-icon-info"
+                                        iconColor="red"
+                                        title="确定删除吗?"
+                                        @onConfirm="deleteTask(item)"
+                                        >
+                                        <!-- <el-button slot="reference">删除</el-button> -->
+                                        <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
+                                </el-popconfirm>
+                                
                             </div>
                         </li>
                     </ul>
@@ -145,11 +185,10 @@
                     <p class="top-title">状态指标</p>
                     <el-button type="text" class="createTask" @click="createStatus"><i class="el-icon-plus"></i>新建状态指标</el-button>
                 </div>
-                <div class="status-list">
-                   
-                   <span v-for="item in status" :key='item.id' :style="'background-color:'+item.color" class="status" @click="editSatus(item)">
-                       {{item.content}}
-                   </span>
+                <div class="status-list">                  
+                    <li v-for="item in status" :key='item.id' class="status">
+                        <span class="itemStatus"  :style="'background-color:'+item.color"  @click="editSatus(item)">{{item.content}}</span>
+                    </li>
                 </div>
             </div>
         </div>
@@ -186,7 +225,7 @@
                     </div>
                    
                     <div class="targetKR" v-for="(item,index) in KRList" :key='index'>
-                        <span class="tip"><span class="sc-bQduHL kArEgh"></span> KR{{index}}</span>
+                        <span class="tip"><span class="sc-bQduHL kArEgh"></span> KR</span>
                         <span class="info">
                             <el-input
                                 type="text"
@@ -196,8 +235,8 @@
                                 ></el-input>
                         </span>
                         <span class="progress">
-                            <span class="progressBar">
-                                <span>KR的完成进度:</span>
+                            <span class="progressBar creatOxia">
+                                <span class="krtitle">KR的完成进度:</span>
                                 <el-slider
                                     v-model="item.completion"
                                     show-input
@@ -205,13 +244,22 @@
                                 </el-slider>
                             </span>
                             <span >
+                                <!-- <el-popconfirm                                   
+                                        icon="el-icon-info"
+                                        iconColor="red"
+                                        title="确定删除吗?"
+                                        @onConfirm="deleteTask(item)"
+                                        >
+                                        
+                                        <el-button type="danger" slot="reference" icon="el-icon-delete" size='mini' circle ></el-button>
+                                </el-popconfirm> -->
                                 <el-button icon="el-icon-delete" circle class="delete" size='mini' @click="createdeleteKR(item,index)"></el-button>
                                 <!-- <i class="el-icon-delete"></i> -->
                             </span>
                         </span>
                     </div>
                     <div class="addKR">
-                        <el-button type="text" style="font-size:16px" @click="addKR"><i class="el-icon-plus"></i>添加关键成果</el-button>
+                        <el-button type="text" style="font-size:16px" @click="addKR"><i class="el-icon-plus"></i>添加关键果</el-button>
                     </div>
                 </div>
                 <span slot="footer" class="dialog-footer">
@@ -221,7 +269,7 @@
             </el-dialog>
         </div>
 
-        <!-- 创建的模态框 -->
+        <!-- 创建任务的模态框 -->
         <div class="openTaskBox">
             <el-dialog
                 :title="taskTitle"
@@ -234,7 +282,7 @@
                         <!-- <span class="item-name">名称:</span> -->
                         <el-input
                             type="text"
-                            placeholder="请输入名称"
+                            placeholder="请输入任务名称"
                             v-model="taskName"
                             maxlength="20"
                             show-word-limit
@@ -243,7 +291,7 @@
                             @blur='checkTaskName'
                             >
                         </el-input>
-                        <span style="font-size:12px;color:#CC6666; margin-left:15px" v-if='taskNameOk'>名称是必须得填写的哦!</span>
+                        <span style="font-size:12px;color:#CC6666; margin-left:15px" v-if='taskNameOk'>任务名称是必须得填写的哦!</span>
                     </div>
                     <div class="task-item">
                         <!-- <span class="item-name">描述</span> -->
@@ -262,9 +310,7 @@
                         <span class="item-name" >选择等级:</span>
                         <el-radio-group v-model="taskRange" size="small" >
                             <el-radio label="1" border>P1</el-radio>
-                            <el-radio label="2" border>P2</el-radio>
-                            <el-radio label="3" border>P3</el-radio>
- 
+                            <el-radio label="2" border>P2</el-radio>                           
                         </el-radio-group>
                     </div>
                     <!-- 完成的进度 -->
@@ -281,8 +327,8 @@
                 <span slot="footer" class="dialog-footer">
                     
                     <el-button @click="taskVisible = false">取 消</el-button>
-                    <el-button type="warning" @click="taskOk" v-if="taskTitle=='创建'">创 建</el-button>
-                    <el-button type="warning" @click="editTaskOk" v-if="taskTitle=='修改'">修 改</el-button>
+                    <el-button type="warning" @click="taskOk" v-if="taskTitle=='创建任务'">创 建</el-button>
+                    <el-button type="warning" @click="editTaskOk" v-if="taskTitle=='修改任务'">修 改</el-button>
                 </span>
             </el-dialog>
         </div>
@@ -313,7 +359,7 @@
                     <div class="task-item">
                         <span class="item-name" >选择状态:</span>
                         <el-radio-group v-model="statusType" size="small" >
-                            <el-radio label="1" border class="first">危险</el-radio>
+                            <el-radio label="1" border class="first">较差</el-radio>
                             <el-radio label="2" border class="second">一般</el-radio>
                             <el-radio label="3" border class="third">良好</el-radio>
                             
@@ -321,6 +367,15 @@
                     </div>
                     <div class="task-item" v-if="statusTitle=='修改状态指标'">
                         <div style="width:200px;height:30px;margin:0 auto;text-align:center;margin-top:30px">
+                            <!-- <el-popconfirm                                   
+                                icon="el-icon-info"
+                                iconColor="red"
+                                title="确定删除吗?"
+                                @onConfirm="deleteStatusOk"
+                                >
+                                
+                                <el-button type="warning" slot="reference"  >删除本条状态指标</el-button>
+                            </el-popconfirm> -->
                             <el-button type="warning" @click="deleteStatusOk"  >删除本条状态指标</el-button>
                         </div>
                         
@@ -384,7 +439,7 @@
                                 <el-slider
                                     v-model="KRProgress"
                                     show-input
-                                    style="width:80%;margin-left:10px">
+                                    style="width:70%;margin-left:10px">
                                 </el-slider>
                             </span>
                         </span>
@@ -426,7 +481,7 @@
                                 type="text"
                                 placeholder="请输入目标名称"
                                 v-model="ObjectName"
-                                maxlength="50"
+                                maxlength="30"
                                 show-word-limit
                                 clearable
                                 @blur="checkedObjectName"
@@ -530,7 +585,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 this.okrVisible=true;
                  this.syncPeopleOptions=[];
                  //请求所有的公司人
-                postAction('/api/okr/qywx/getUserListByName',{
+                postAction('/okr/qywx/getUserListByName',{
 
                 }).then((res)=>{                    
                     // console.log(res)
@@ -547,7 +602,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                     
                 })
                 //请求已经同步的人
-                postAction('/api/okr/okr/getMemberListByUserId',{
+                postAction('/okr/okr/getMemberListByUserId',{
 
                 }).then((res)=>{
                     this.selectedPeople=[]
@@ -561,7 +616,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 })
             },
             syncOK(){
-                postAction('/api/okr/okr/saveOkrMember',{
+                postAction('/okr/okr/saveOkrMember',{
                     userIdList:this.syncPeopleValue
                 }).then((res)=>{
                     // console.log(res)
@@ -601,7 +656,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 // console.log(item)
                 this.checkedTargetName()
                 if(!this.targetNameOk){
-                    postAction('/api/okr/okr/insertObjectAndKrList',{
+                    postAction('/okr/okr/insertObjectAndKrList',{
                         objectInfo:{
                             objectInfo:this.targetName,
                             completion:0
@@ -632,7 +687,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 
                 this.checkedObjectName();
                 if(!this.ObjectNameOk){
-                    postAction('/api/okr/okr/updateObject',{
+                    postAction('/okr/okr/updateObject',{
                         objectInfo:{
                             id:this.currentObjId,
                             objectInfo:this.ObjectName,
@@ -657,9 +712,9 @@ import {postAction , getAction} from '@/utils/api/http.js'
             targeOKROk(){
                  this.targetVisible=false;
             },
-            // 创建
+            // 创建任务
             createTask(val){
-                this.taskTitle='创建'
+                this.taskTitle='创建任务'
                 this.taskVisible=true;
                 this.currentTask=val;
                 this.taskName='';
@@ -674,7 +729,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 this.taskNameOk=this.taskName? false:true;
                 if(!this.taskNameOk){
                     
-                    postAction('/api/okr/okr/insertTaskInfo',{
+                    postAction('/okr/okr/insertTaskInfo',{
                         taskInfo:{
                             taskTitle:this.taskName,
                             taskInfo:this.taskDesc,
@@ -691,7 +746,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 }
 
             },
-            // 检查名字是否输入
+            // 检查任务名字是否输入
             checkTaskName(){
                 this.taskNameOk=this.taskName? false:true
             },
@@ -702,7 +757,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             // 删除task
             deleteTask(val){
                 // console.log(val)
-                postAction('/api/okr/okr/deleteTaskInfoById',{
+                postAction('/okr/okr/deleteTaskInfoById',{
                     taskInfo:{
                         id:val.id
                     }
@@ -718,10 +773,10 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 })
             },
 
-            // 编辑
+            // 编辑任务
             editTask(val){
                 // console.log(val)
-                this.taskTitle='修改';
+                this.taskTitle='修改任务';
                 
                 // this.currentTask=val;
                 this.taskName=val.taskTitle;
@@ -737,7 +792,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 this.taskNameOk=this.taskName? false:true;
                 if(!this.taskNameOk){
                     
-                    postAction('/api/okr/okr/updateTaskInfo',{
+                    postAction('/okr/okr/updateTaskInfo',{
                         taskInfo:{
                             id:this.taskId,
                             taskTitle:this.taskName,
@@ -748,11 +803,16 @@ import {postAction , getAction} from '@/utils/api/http.js'
                         // console.log(res)
                         if(res.success){
                             this.$message({
-                                message: '修改成功啦!',
+                                message: '任务修改成功啦!',
                                 type: 'success'
                             });
                            this.taskVisible=false;
                             this.getOkrPageList();
+                        }else{
+                            this.$message({
+                                message: '任务修改失败',
+                                type: 'error'
+                            });
                         }
                     })
                 }
@@ -776,7 +836,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             statusOk(){
                 this.checkStatusName();
                 if(!this.statusNameOk){
-                    postAction('/api/okr/okr/insertContentStatus',{
+                    postAction('/okr/okr/insertContentStatus',{
                         content:{
                             content:this.statusName,
                             type:this.statusType,
@@ -796,7 +856,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             editStatusOk(){
                 this.checkStatusName();
                 if(!this.statusNameOk){
-                    postAction('/api/okr/okr/updateContentStatus',{
+                    postAction('/okr/okr/updateContentStatus',{
                         content:{
                             id:this.statusId,
                             content:this.statusName,
@@ -818,7 +878,12 @@ import {postAction , getAction} from '@/utils/api/http.js'
                 }
             },
             deleteStatusOk(){
-                postAction('/api/okr/okr/deleteContentStatusById',{
+                this.$confirm('即将删除本状态, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    postAction('/okr/okr/deleteContentStatusById',{
                         content:{
                             id:this.statusId,          
                         }
@@ -834,11 +899,19 @@ import {postAction , getAction} from '@/utils/api/http.js'
                         this.getOkrPageList()
                         }
                     })
+                    
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });          
+                });
+                
             },
 
             deleteKR(item){
                 console.log(item);
-                postAction('/api/okr/okr/deleteKrById',{
+                postAction('/okr/okr/deleteKrById',{
                     krInfo:{
                         id:item.id
                     }
@@ -866,7 +939,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             KROk(){
                 this.checkKRName();
                 if(!this.KRNameOk){
-                    postAction('/api/okr/okr/insertOkrKrInfo ',{
+                    postAction('/okr/okr/insertOkrKrInfo ',{
                         krInfo:{
                             completion:this.KRProgress,
                             krInfo:this.KRName,
@@ -893,7 +966,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             editKROk(){
                 this.checkKRName();
                 if(!this.KRNameOk){
-                    postAction('/api/okr/okr/updateKr',{
+                    postAction('/okr/okr/updateKr',{
                         krInfo:{
                             completion:this.KRProgress,
                             krInfo:this.KRName,
@@ -912,7 +985,7 @@ import {postAction , getAction} from '@/utils/api/http.js'
             
             // 获取页面展示的list
             getOkrPageList(){
-                postAction('/api/okr/okr/getOkrInfo',{}
+                postAction('/okr/okr/getOkrInfo',{}
                 ).then((res)=>{
                     console.log(res);
                     if(res.success){
@@ -1058,29 +1131,42 @@ ul,li{
                 }
             }
             .status-list{
-                padding: 20px;
-                display: flex;
-                flex-wrap:  wrap ;
-                height: 80%;
-                justify-content: space-around;
+                overflow: auto;
+                max-height: 80%;
+                // margin-top: 10px;
+                text-align: left;
+                font-size: 14px;
+                color: #333;
                 box-sizing: border-box;
                 // align-content: center;
                 .status{
-                    display: inline-block;
-                    width: 20%;
+                    display: block;
+                    // width: 20%;
+                    width: auto;
                     min-width: 120px;
-                    height: 65px; 
-                    padding: 10px 10px;
+                    height: 60px; 
+                    // padding: 10px 10px;
                     box-sizing: border-box;
-                    margin-right: 2%;
-                    border-radius: 20px;
-                    cursor: pointer;
+                    justify-content: center;
+                    display: flex;
+                    
+                    // margin-bottom: 10px;
+                    .itemStatus{
+                        display: inline-block;
+                        height: 40px;
+                        line-height: 40px;
+                        padding: 0 15px;
+                        border-radius: 10px;
+                        margin: 0 auto;
+                        cursor: pointer;
+                    }
                 }
             }
             .objectList{              
                 text-align: left;
                 overflow: auto;
-                min-height: 75%;
+                height: 75%;
+                max-height: 85%;
                 .OBox{
                     background: #fafbfc;
                     height: 62px;
@@ -1128,10 +1214,12 @@ ul,li{
                     ul{
                         li{
                             width: 100%;
-                            height: 30px;
+                            height: 40px;
                             padding: 5px 20px;
                             position: relative;
                             box-sizing:border-box;
+                            line-height: 40px;
+                            position: relative;
                             .KR-tip{
                                 height: 20px;
                                 line-height: 20px;
@@ -1141,9 +1229,18 @@ ul,li{
                                 background: rgba(46, 156, 255, 0.1);
                                 border-radius: 11.5px;
                                 padding: 3px 9px;
+                                position: absolute;
+                                top: 8px;
                             }
                             .KR-content{
-
+                                width:60% ;
+                                display: inline-block;
+                                overflow:hidden;
+                                white-space:nowrap;
+                                text-overflow:ellipsis;
+                                height:100%;
+                                line-height: 30px;
+                                padding-left: 40px;
                             }
                             .KR-opt{
                                 position: absolute;                              
@@ -1151,7 +1248,7 @@ ul,li{
                                 top:5px;
                                 display: flex;
                                 // display: none;
-                                width: 50%;
+                                width: 30%;
                                 position: absolute;
                                 justify-content:flex-end;
                                 align-items:center
@@ -1311,12 +1408,16 @@ ul,li{
                     width: 70%;
                     display: flex;
                 }
+                .creatOxia{
+                    width: 85%;
+                }
                 .delete{
                     // width: 25px;
                     // height: 25px;
                     // font-size: 12px;
                     position:absolute;
                     right: 5px;
+                    top: 5px;
                 }
             }
         }
@@ -1339,7 +1440,7 @@ ul,li{
                 .krtitle{
                     line-height: 40px;
                     display: inline-block;
-                    width: 20%;
+                    width: 35%;
                 }
             }
         }
@@ -1473,6 +1574,13 @@ ul,li{
                     background: none;
                 }
             }
+            .el-input--suffix .el-input__inner {
+                padding-right: 66px;
+            }
+           
+        }
+        .el-input--suffix .el-input__inner {
+            padding-right: 50px;
         }
     }
     .editKRBody{
@@ -1515,5 +1623,6 @@ ul,li{
             color:#fff
         }
     }
-   
+
+    
 </style>

+ 1 - 1
src/views/TransferLocal.vue

@@ -150,7 +150,7 @@ export default {
       var json = {}
       json[arr[0]] = arr[1]
       var params = qs.stringify(json)
-      postAction('/api/okr/sys/wxlogin', params).then(res => {
+      postAction('/okr/sys/wxlogin', params).then(res => {
         console.log(res)
         if (res.success) {
           this.login(res)

+ 1 - 1
vue.config.js

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