back/src/components/ren-process-detail/src/ren-process-detail.vue

@@ -11,7 +11,7 @@
     <!-- <h4>{{ $t('process.flowImage') }}</h4>
     <img :src="getResourceURL()" class="image"> -->
     <!-- 流转详情 -->
-    <div class="title">{{ $t('process.circulation') }}</div>
+    <h4>{{ $t('process.circulation') }}</h4>
     <div class="mod-sys__dict">
       <el-table
         v-loading="dataListLoading"
@@ -92,20 +92,3 @@ export default {
   }
 }
 </script>
-<style scoped>
-::v-deep .el-card__body{
-  padding: 0px;
-}
-::v-deep .el-card{
- border:0px !important;
-}
-.title{
-  padding-left: 20px;
-    color: #212121;
-    font-size: 16px;
-    margin-bottom: 10px; 
-    margin-top: 10px;
-    background: url("~@/assets/img/biaoti.png") no-repeat;
-    background-position-y: 2px;
-}
-</style>

back/src/views/modules/abilityStatistics/components/abilityDetails.vue

@@ -281,14 +281,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .el-step__title .is-finish {
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    word-break: break-all;
-    color: #0058e1;
-}
 .title {
   font-size: 22px;
   color: #000;
@@ -470,5 +462,4 @@ export default {
     }
   }
 }
-
 </style>

back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

@@ -2,133 +2,38 @@
   <div class="wrapper">
     <el-form :model="dataView">
       <div v-for="(item, index) in dataView.children" :key="item">
-  
+        <!-- <div class="dataTitle">{{ item.name }}</div> -->
         <div v-for="itemson in item.children" :key="itemson.name">
           <div class="dataTitleSon">
             {{ itemson.name }}
           </div>
-          <div class="info-content" v-if="itemson.name ==='基本信息'">
+          <div class="dataContent" v-if="
-            <div class="info-left">
+            itemson.name !== '算法优势' &&
-          
+            itemson.name !== '应用场景' &&
-              <template v-for="itemsonson in itemson.children">
+            itemson.name !== '功能介绍'
-                <div class="left-inner" v-if="itemsonson.type !== 'video' && itemsonson.type !== 'image'">
+          ">
-                  <span style="font-size:14px;color:#212121;">{{itemsonson.name}}</span>:
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
-                  <el-tooltip placement="top" v-if="(itemsonson.note1 && itemsonson.note1.length>18)">
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-                    <div slot="content">{{itemsonson.note1}}</div>
+            " v-show="
-                    <span style="font-size:14px;color:#212121;font-weight: bold;">{{itemsonson.note1}}</span>
+  !(
-                  </el-tooltip>
+    itemsonson.name === '平台地址' ||
-                  <span style="font-size:14px;color:#212121;font-weight: bold;" v-else>{{ itemsonson.note1 }}</span>
+    itemsonson.name === 'SDK安装包' ||
-                 
+    itemsonson.name === '接口请求方式' ||
-                </div>
+    itemsonson.name === '服务接口'
-              </template>
+  )
-            </div>
+">
-            <div class="info-right">
+              <div class="videoAndImgCss" v-if="
-              <div id="lib_Tab1_sx" class="lib_tabborder_sx">
+                itemsonson.type === 'video' || itemsonson.type === 'image'
-                <div class="lib_Menubox_sx ">
+              " @click="videoAndImg(itemsonson.note1)">
-                  <ul>
+                浏览
-                    <li id="one1" @click="setTab('one',1,5)" class="hover">图片</li>
-                    <li id="one2" @click="setTab('one',2,5)">视频</li>
-                  </ul>
-                </div>
-          
-                <div class="lib_Contentbox_sx ">
-                  <div id="con_one_1">
-                    <template v-for="itemsonson1 in itemson.children">
-                      <div v-if="(itemsonson1.type === 'image' )">
-                        <img v-if=" itemsonson1.note1" @click="videoAndImg(itemsonson1.note1)" :src="itemsonson1.note1"
-                          style="height:270px;width:490px;" />
-                        <div v-else style="height: 270px;line-height: 270px;text-align: center;color:grey">暂无图片</div>
-                      </div>
-          
-                    </template>
-                  </div>
-                  <div id="con_one_2" style="display:none">
-                    <template v-for="itemsonson1 in itemson.children">
-                      <div v-if="(itemsonson1.type === 'video' )">
-                        <video v-if=" itemsonson1.note1" @click="videoAndImg(itemsonson1.note1)" :src="itemsonson1.note1"
-                          style="height:270px;width:490px;" />
-                        <div v-else style="height: 270px;line-height: 270px;text-align: center;;color:grey">暂无视频</div>
-                      </div>
-                 
-                    </template>
-                    
-                  </div>
-                </div>
               </div>
-            </div>
+              <div class="videoAndImgCss" v-if="
-          </div>
+                itemsonson.name === '上传附件'
-          <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
+              " @click="videoAndImg(itemsonson.note1)">
-            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+                下载
-              <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
-                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon1" >
-                  <div class="Son1-left">
-                    
-                    <img v-if="itemDataFormValue.img" @click="videoAndImg(itemDataFormValue.img)" :src="itemDataFormValue.img"
-                          style="height:270px;width:490px;" />
-                   <div v-else style="height: 270px;line-height: 270px;text-align: center;">暂无图片</div>
-                    
-          
-                  </div>
-                  <div class="textAndImgSon">
-                  <div >{{ itemDataFormValue.name }}</div>
-                  <el-tooltip placement="top" v-if="(itemDataFormValue.desc && itemDataFormValue.desc.length>50)">
-                    <div slot="content">{{ itemDataFormValue.desc }}</div>
-                    <div>功能介绍：{{ itemDataFormValue.desc }}</div>
-                  </el-tooltip>
-                  <div v-else>功能介绍：{{ itemDataFormValue.desc }}</div>
-                </div>
-                  <!-- <div @click="videoAndImg(itemDataFormValue.img)">浏览</div> -->
-                </div>
               </div>
-            </div>
+              <div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
-          </div>
+                <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
-          <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
-            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-              <div v-if="itemDataForm.attrType === '应用场景'"  class="textAndImg">
-                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-                class="textAndImgSon1" >
-                  <div class="Son1-left">
-         
-                     <img v-if="itemDataFormValue.img" @click="videoAndImg(itemDataFormValue.img)" :src="itemDataFormValue.img"
-                          style="height:270px;width:490px;" />
-                   <div v-else style="height: 270px;line-height: 270px;text-align: center;">暂无图片</div>
-                    
-          
-                  </div>
-              <div  class="textAndImgSon" >
-                    <div>{{ itemDataFormValue.name }}</div>
-                  <el-tooltip placement="top" v-if="(itemDataFormValue.desc && itemDataFormValue.desc.length>50)">
-                    <div slot="content">{{ itemDataFormValue.desc }}</div>
-                    <div>应用描述：{{ itemDataFormValue.desc }}</div>
-                  </el-tooltip>
-                  <div v-else>应用描述：{{ itemDataFormValue.desc }}</div>
-                </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div v-else-if="itemson.name === '算法优势'" style="margin-top: 20px">
-            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-              <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
-                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon" >
-                  <div>{{ itemDataFormValue.name }}</div>
-                  <el-tooltip placement="top" v-if="(itemDataFormValue.desc && itemDataFormValue.desc.length>100)">
-                    <div slot="content">{{ itemDataFormValue.desc }}</div>
-                    <div>算法描述：{{ itemDataFormValue.desc }}</div>
-                  </el-tooltip>
-                  <div v-else>算法描述：{{ itemDataFormValue.desc }}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="other-content" v-else>
-            <div class="other-info">
-              <template v-for="itemsonson in itemson.children">
-                <div v-if="itemsonson.type === ' multipleAdditions'" class="textAndImg">
-                <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem"
-                class="textAndImgSon" >
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
@@ -168,50 +73,70 @@
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
-              <div class="info-inner" v-else-if="
+              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null ? false : true"
-                          (
+                :content="itemsonson.note1">
-                            itemsonson.name === '上传附件'||
+                <!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> -->
-                            itemsonson.name === '技术文档'  )
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
-                          ">
+              </el-tooltip>
-            <span style="font-size:14px;color:#212121;" >{{itemsonson.name}}</span>:
+            </el-form-item>
-            <span style="color: #0058e1;font-weight: bold;text-decoration: underline;cursor: pointer;"
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
-            v-if="itemsonson.note1"  @click="videoAndImg(itemsonson.note1)">点击下载</span>
+              itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-            <span v-else style="color: grey;">暂未上传</span>
+            " v-show="
+  (itemsonson.name === '平台地址' && showDocking) ||
+  (itemsonson.name === 'SDK安装包' && showSDK) ||
+  (itemsonson.name === '接口请求方式' && showInterface) ||
+  (itemsonson.name === '服务接口' && showInterface)
+">
+              <el-tooltip placement="top" :disabled="itemsonson.note1 !== null ? false : true" :content="itemsonson.note1">
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
+              </el-tooltip>
 
-            </div>
+            </el-form-item>
-              <div class="info-inner" v-else-if="
+          </div>
-               (itemsonson.name === '平台地址' && showDocking) ||
+          <div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
-                (itemsonson.name === 'SDK安装包' && showSDK) ||
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-                (itemsonson.name === '接口请求方式' && showInterface) ||
+              <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
-                (itemsonson.name === '服务接口' && showInterface)
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-              ">
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
-              <span style="font-size:14px;color:#212121;">{{itemsonson.name}}</span>:
+                  <div>{{ itemDataFormValue.name }}</div>
-                  <el-tooltip placement="top" v-if="(itemsonson.note1 && itemsonson.note1.length>10)">
+                  <el-tooltip placement="top">
-                    <div slot="content">{{itemsonson.note1}}</div>
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
-                    <span style="font-size:14px;color:#212121;font-weight: bold;">{{itemsonson.note1}}</span>
+                    <div>{{ itemDataFormValue.desc }}</div>
                   </el-tooltip>
-                  <span style="font-size:14px;color:#212121;font-weight: bold;" v-else>{{ itemsonson.note1 }}</span>
+                </div>
+              </div>
             </div>
-            <div class="info-inner" v-else-if="
+          </div>
-                          !(
+          <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
-                itemsonson.name === '平台地址' ||
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-                itemsonson.name === 'SDK安装包' ||
+              <div v-if="itemDataForm.attrType === '应用场景'" class="textAndImg">
-                itemsonson.name === '接口请求方式' ||
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-                itemsonson.name === '服务接口'
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
-              )
+                  <div>{{ itemDataFormValue.name }}</div>
-                          ">
+                  <el-tooltip placement="top">
-              <span style="font-size:14px;color:#212121;">{{itemsonson.name}}</span>:
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
-                  <el-tooltip placement="top" v-if="(itemsonson.note1 && itemsonson.note1.length>10)">
+                    <div>{{ itemDataFormValue.desc }}</div>
-                    <div slot="content">{{itemsonson.note1}}</div>
-                    <span style="font-size:14px;color:#212121;font-weight: bold;">{{itemsonson.note1}}</span>
                   </el-tooltip>
-                  <span style="font-size:14px;color:#212121;font-weight: bold;" v-else>{{ itemsonson.note1 }}</span>
+                  <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
+                </div>
+              </div>
             </div>
-              </template> 
+          </div>
+          <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
+              <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
+                  <div>{{ itemDataFormValue.name }}</div>
+                  <el-tooltip placement="top">
+                    <div slot="content">{{ itemDataFormValue.desc }}</div>
+                    <div>{{ itemDataFormValue.desc }}</div>
+                  </el-tooltip>
+                  <div @click="videoAndImg(itemDataFormValue.img)">浏览</div>
+                </div>
+              </div>
             </div>
-            </div>
+          </div>
-      
-        
         </div>
       </div>
     </el-form>
@@ -220,10 +145,9 @@
 
 <script>
 import qs from 'qs'
-import Template from '../../devtools/template.vue'
 
 export default {
-  components: {Template},
+  components: {},
   props: {
     dataForm: {
       type: Object
@@ -249,7 +173,6 @@ export default {
   watch: {
     dataList (item) {
       if (item) {
-       
         this.dataList = item
       }
     },
@@ -261,11 +184,11 @@ export default {
           )[0]
           this.dataForm.infoList.map((item, index) => {
             this.dataView.children.map((itemView, indexView) => {
-   
+              // console.log('itemView', itemView)
               itemView.children.map((itemViewSon, indexViewSon) => {
-
+                // console.log('itemViewSon', itemViewSon)
                 itemViewSon.children.map((itemSon, indexSon) => {
-          
+                  // console.log('itemSon', itemSon)
                   if (itemSon.name.indexOf('描述') != -1) {
                     this.dataView.children[indexView].children[
                       indexViewSon
@@ -283,7 +206,7 @@ export default {
                       indexViewSon
                     ].children[indexSon].note1 = this.dataForm.shareCondition
                   } else if (itemSon.name === '部门联系人') {
-                    
+                    console.log('itemSon.name', itemSon.name)
                     this.dataView.children[indexView].children[
                       indexViewSon
                     ].children[indexSon].note1 = this.dataForm.deptContacts
@@ -337,11 +260,11 @@ export default {
           )[0]
           this.dataForm.infoList.map((item, index) => {
             this.dataView.children.map((itemView, indexView) => {
-            
+              console.log('itemView', itemView)
               itemView.children.map((itemViewSon, indexViewSon) => {
-  
+                console.log('itemViewSon', itemViewSon)
                 itemViewSon.children.map((itemSon, indexSon) => {
-             
+                  console.log('itemSon', itemSon)
                   if (itemSon.name.indexOf('描述') != -1) {
                     this.dataView.children[indexView].children[
                       indexViewSon
@@ -363,7 +286,7 @@ export default {
                       indexViewSon
                     ].children[indexSon].note1 = this.dataForm.shareType
                   } else if (itemSon.name === '部门联系人') {
-            
+                    console.log('itemSon.name', itemSon.name)
                     this.dataView.children[indexView].children[
                       indexViewSon
                     ].children[indexSon].note1 = this.dataForm.deptContacts
@@ -413,26 +336,22 @@ export default {
             }
           })
           console.log(
-            'valvalvalvalvalvalvalvalvalvalval============',
+            'valvalvalvalvalvalvalvalvalvalval',
-       
+            this.dataForm,
             this.dataView
           )
           // 智能算法-使用方式-3种方式联动
           this.dataView.children.map((val) => {
             if (val.name === '部署与使用') {
-
               val.children.map((val) => {
                 if (val.name === '使用方式') {
                   val.children.map((val) => {
                     if (val.name === '使用方式') {
                       if (val.note1 === 'SDK') {
-                 
                         this.showSDK = true
                       } else if (val.note1 === '平台对接') {
-               
                         this.showDocking = true
                       } else if (val.note1 === '调用接口') {
-                
                         this.showInterface = true
                       }
                     }
@@ -447,16 +366,7 @@ export default {
   },
   computed: {},
   methods: {
-   setTab(name,cursel,n){
- for(let i=1;i<=n;i++){
- var menu=document.getElementById(name+i);
- var con=document.getElementById("con_"+name+"_"+i);
- menu.className=i==cursel?"hover":"";
- con.style.display=i==cursel?"block":"none";
- }
-},
     videoAndImg (link) {
-
       if (link) {
         window.open(link)
       } else {
@@ -467,11 +377,11 @@ export default {
       }
     },
     deptName () {
-   
+      console.log(this.dataForm.deptId)
       this.$http
         .get(`/sys/dept/${this.dataForm.deptId}`)
         .then(({ data: res }) => {
-
+          console.log(res.data.name, 'res')
           this.unit = res.data.name
         })
     },
@@ -527,117 +437,20 @@ export default {
 </style>
 <style lang="scss" scoped>
 .wrapper {
-  padding: 10px 100px;
+  .dataTitle {
-  background: #ffffff;
+    text-align: center;
-  .other-content{
+    color: #333333;
-    //  height: 278px;
+    font-size: 22px;
-     overflow-y: auto;
+    margin-bottom: 25px;
-     background: #f4f5f8;
-     .other-info{
-      display: inline;
-    }
-    .info-inner{
-     
-    padding: 0px 24px;
-      width:33%;
-      height:60px;
-      float:left;  
-    line-height: 60px;
-    display: flex;
-    span:nth-of-type(2){
-    width: 285px;
-    word-break: break-all;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-      }
-    }
-   
-    }
-  .info-content{
-    height:315px;
-    background: #f4f5f8;
-   
-    .info-left{
-    padding: 24px 24px;
-    overflow-y: auto;
-      width:58%;
-      height:100%;
-      float:left;
-      display:inline;
-      padding:24px 24px ;
-      .left-inner{
-        overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 1;
-    -webkit-box-orient: vertical;
-        width: 50%;
-        float:left;
-        height:32px;
-        line-height: 32px;
-        
-      }
-    }
-    .info-right{
-
-      width:42%;
-      height:100%;
-      float:left;
-      display:inline;
-      .lib_tabborder_sx{
-        height: 270px;
-        margin-top: 24px;
-      }
-.lib_Menubox_sx {
-  line-height:28px;
-  position:relative; 
-  float:left;
-   width:48x; 
-  height:300px;
- }
-.lib_Menubox_sx ul{
-  list-style:none;
-   position:absolute;
-     text-align:center;
-    }
-.lib_Menubox_sx li{
-  cursor: pointer;
-    color: #212121;
-    height: 66px;
-    width: 32px;
-    background-color: #ffffff;
-    border-radius: 1px;
-    writing-mode: vertical-lr;
-}
-.lib_Menubox_sx li.hover{
-    color: #fff;  
-    background-color: #0058e1;
-    
-}
-.lib_Contentbox_sx{
-  margin-left: 72px;
-    background: #dadada;
-    height: 270px;
-    width: 490px;
-}
-
-    }
   }
 
-
-
   .dataTitleSon {
-    padding-left: 20px;
+    padding-left: 30px;
-    color: #212121;
+    color: #333333;
-    font-size: 16px;
+    font-size: 22px;
-    margin-bottom: 10px; 
+    margin-bottom: 20px;
-    margin-top: 32px;
+    background: url("~@/assets/img/sj-jx.png") no-repeat;
-    background: url("~@/assets/img/biaoti.png") no-repeat;
+    background-position-x: 15px;
-    background-position-y: 2px;
-  
   }
 
   .multipleAdditionsClass {
@@ -696,66 +509,22 @@ export default {
     background: rgba(60, 155, 205, 0.1);
     display: inline-block;
   }
-.textAndImgY{
-  width: 720px;
-     height: 270px;
-     margin-right: 24px;
-     display: table;
 
-  .ImgSon{
-    display: table-cell;
-    width: 476px;
-    float: left;
-    height: 100%;
-    background: red;
-  }
-  .texton{
-    display: table-cell;
-    height: 100%;
-    width: 244px;
-    float: left;
-  }
-  
-}
   .textAndImg {
     display: flex;
-    // padding-left: 30px;
+    padding-left: 30px;
-    background:#fff;
-    .textAndImgSon1 {
-      width: 700px;
-     height: 270px;
-     .Son1-left{
-      float: left;
-      width:476px;
-      height: 270px;
 
-      border-radius: 2px;
-     }
-    }
     .textAndImgSon {
-      float:left;
+      width: 212px;
-      background: url("~@/assets/img/gongnengjieshao.png") no-repeat;
+      height: 182px;
-      width: 170px;
+      margin-right: 30px;
-     height: 270px;
-     margin-right: 24px;
-
-     color: #fff;
-     border-radius: 2px;
       display: flex;
       flex-direction: column;
- 
+      align-items: center;
-      padding: 30px 24px;
+      padding: 10px;
       position: relative;
 
-
+      &>div {
-      &>div:first-child {
-        text-align: center;
-        margin-bottom: 30px;
-        font-weight: bold;
-        font-size: 18px;
-      }
-      &>div:nth-child(2) {
-        text-align: left;
         -webkit-line-clamp: 5;
         overflow: hidden;
         text-overflow: ellipsis;
@@ -763,18 +532,24 @@ export default {
         -webkit-box-orient: vertical;
         word-break: break-all;
       }
-      &>div:nth-child(3)  {
+
-        margin-top: 24px;
+      &>div:first-child {
-        text-align: left;
+        margin-bottom: 10px;
-        -webkit-line-clamp: 3;
+        font-weight: bold;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        word-break: break-all;
       }
 
-    
+      &>div:nth-child(3) {
+        margin-top: 10px;
+        position: absolute;
+        bottom: 8px;
+        cursor: pointer;
+        font-size: 12px;
+        border: 1px solid #3c9bcd;
+        line-height: 12px;
+        padding: 5px;
+        margin-top: 10px;
+        background: rgba(60, 155, 205, 0.1);
+      }
     }
   }
 

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -34,7 +34,7 @@
     ></ren-process-multiple> -->
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>审批</div>
+      <h3>审批</h3>
       <div class="approvalOperation">
           <div class="contentOperation">
           <el-input v-model="input" placeholder="请输入审批意见"></el-input>
@@ -42,14 +42,35 @@
           <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
           <el-button class="transferButton" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         </div>
-    
+        <!-- <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('驳回')"
+          >驳回</el-button
+        > -->
+        <!-- <el-radio-group v-model="agreeOrList" style="width: 230px">
+          <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
+          <el-radio-button label="退回" class="redAll">退回</el-radio-button>
+        </el-radio-group>
+        <el-input
+          v-if="agreeOrList === '同意'"
+          v-model="inputAgree"
+          placeholder="请输入同意意见"
+        ></el-input>
+        <el-input
+          v-if="agreeOrList === '退回'"
+          v-model="inputNo"
+          placeholder="请输入退回意见"
+        ></el-input>
+        <el-button
+          class="inputBule"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >提交</el-button
+        > -->
       </div>
     </div>
     <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
-    <div style="padding: 10px 100px;background: #ffffff;">
     <ren-process-detail></ren-process-detail>
-  </div>
     <el-dialog
       title="审批意见"
       :close-on-click-modal="false"
@@ -121,6 +142,7 @@ export default {
   watch: {},
   created () {
     // 将业务KEY赋值给表单
+    console.log('params=================>', this.$route, this.$route.params)
     this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
     this.$http.get('/sys/user/info').then(({ data: res }) => {
@@ -132,7 +154,7 @@ export default {
               .get(
                 '/act/task/getTaskVariables?taskId=' + this.$route.params.taskId + '&variableName=allowEntrust'
               ).then(entrust => {
-               
+                console.log('11111111111111', entrust, this.dataForm)
                 if (entrust.data.data && entrust.data.data.allowEntrust === true) {
                   this.taskEntrustFlag2 = true
                   if (this.taskEntrustFlag && this.taskEntrustFlag2) {
@@ -153,7 +175,7 @@ export default {
       })
     })
     this.init()
-   
+    console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
     var callbacks = {
       startProcessSuccessCallback: this.closeCurrentTab,
@@ -170,6 +192,7 @@ export default {
     const businessKey = this.$router.currentRoute.params.businessKey
     this.getInfo(businessKey)
     this.methodsThree()
+    console.log(this.taskId, 'this.dataForm.taskId')
   },
   computed: {},
   methods: {
@@ -186,6 +209,7 @@ export default {
       this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
         this.dataForm = res.data.resourceDTO
         if (this.dataForm) {
+          console.log('this.dataForm', this.dataForm)
           this.flagShow = true
         }
       })
@@ -219,6 +243,7 @@ export default {
         // 如业务KEY已存在，不允许编辑
         this.fieldDisabled = true
         // this.id = this.$router.currentRoute.businessKey
+        console.log('id', this.$router.currentRoute.params.businessKey)
         // }
       })
     },
@@ -227,12 +252,12 @@ export default {
       function (data, type) {
         if (type === '同意') {
           // if (this.input !== '') {
-         
+          console.log('this.dataForm', this.dataForm)
           const params = qs.stringify({
             taskId: this.taskId,
             comment: this.input || '同意'
           })
-        
+          console.log(params)
           this.$http
             .post('/act/task/complete?' + params)
             .then(({ data: res }) => {
@@ -305,7 +330,7 @@ export default {
       { leading: true, trailing: false }
     ),
     tabRemoveHandle (tabName) {
-    
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
         return false
       }
@@ -350,26 +375,16 @@ export default {
 }
 .wrapper {
 }
-::v-deep .agreeOr{
+::v-deep .agreeOr > div {
-  padding: 10px 100px;
+  display: flex;
-  background: #ffffff;
+  //align-items: center;
-}
+  .el-input {
-::v-deep .agreeOr > div:first-of-type {
+    margin-right: 10px;
-  padding-left: 20px;
+    margin-left: 32px;
-    color: #212121;
+  }
-    font-size: 16px;
-    margin-bottom: 10px; 
-    margin-top: 10px;
-    background: url("~@/assets/img/biaoti.png") no-repeat;
-    background-position-y: 2px;
-  
 }
 ::v-deep .agreeOr > div:last-of-type {
   margin-top: 15px;
-  .el-input {
-    margin-right: 10px;
-
-  }
 }
 .blueAll {
   ::v-deep .el-radio-button__inner {

front/src/views/instructionManual/components/menuBook.vue

@@ -529,7 +529,7 @@
       border: 1px solid #74a9f8;
       border-radius: 10px;
       margin: 0 10px;
-      // cursor: pointer;
+      cursor: pointer;
 
       .item-name {
         color: #fff;