Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/activiti/demo/abilitydemandapply.vue

@@ -91,11 +91,16 @@
     ></ren-process-multiple> -->
      <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
+      <div class="approvalOperation">
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+       <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -239,9 +244,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -278,7 +283,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -364,4 +369,102 @@ export default {
     margin: 20px 0;
   }
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>

back/src/views/modules/activiti/demo/comments.vue

@@ -32,11 +32,16 @@
     ></ren-process-multiple> -->
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
+      <div class="approvalOperation">
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+         <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'拒绝')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -149,9 +154,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -188,7 +193,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '拒绝') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -291,4 +296,102 @@ export default {
   height: 100px;
   resize: none;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>

back/src/views/modules/activiti/my-work-dynamics.vue

@@ -521,12 +521,11 @@ export default {
       })
         .then(async () => {
           let ids = []
-          if (this.deleteDataArr.length > 1) {
+          if(row.id && this.deleteDataArr.length==0){
-            ids = this.deleteDataArr
-          } else {
              ids = [row.id]
+          }else{
+            ids = this.deleteDataArr
           }
-          console.log(ids)
           this.$http
             .delete('/workdynamics/delete', {
               data: ids

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

@@ -35,12 +35,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
-      <div>
+      <div class="approvalOperation">
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+          <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <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>
@@ -243,8 +249,8 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -282,7 +288,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.taskId,
@@ -358,7 +364,7 @@ export default {
 }
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
@@ -416,4 +422,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -89,15 +89,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="dataForm.taskId">
       <h3>审批</h3>
-      <div>
+      <div class="approvalOperation">
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
           <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        <div class="contentOperation">
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
-        <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <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-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="agreeOrNot">提交</el-button> -->
@@ -107,14 +110,14 @@
         <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail ref="renProcessMultiple"></ren-process-detail>
-    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
+    <!-- <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
       :before-close="handleClose">
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
         <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
   </el-card>
 </template>
 
@@ -169,6 +172,7 @@ export default {
     this.$http.get('/sys/user/info').then(({ data: res }) => {
       res.data.roleIdList.map(val => {
         this.$http.get('/sys/role/' + val).then(role => {
+          console.log('role',role);
           if (role.data.data.name === '流程管理员') {
             this.taskEntrustFlag = true
           }
@@ -190,7 +194,7 @@ export default {
       formSaveErrorCallback: null
     }
     // 初始化综合组件
-    this.initProcessMultiple(callbacks)
+    this.initProcessMultiple(callbacks);
   },
   computed: {
     // dataRule () {
@@ -410,8 +414,10 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
-        if (this.dialogType === '同意') {
+          //console.log('datadata',data);
+          //console.log('tttttt',type);
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -448,7 +454,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -670,7 +676,7 @@ export default {
 
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
 
   .el-input {
     margin-right: 10px;
@@ -737,4 +743,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>

back/src/views/modules/sys/menu.vue

@@ -9,6 +9,15 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+         <el-form-item>
+          <el-input v-model="dataForm.name" :placeholder="$t('process.name')" clearable></el-input>
+        </el-form-item>
+          <el-form-item>
+          <el-button  type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+           <el-button  type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -52,11 +61,22 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/menu/list',
         deleteURL: '/sys/menu'
-      }
+      },
+       dataForm: {
+           name: null
+       },
     }
   },
   components: {
     AddOrUpdate
+  },
+    methods: {
+    resetHandle() {
+      this.dataForm.name = '';
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
   }
 }
 </script>

back/src/views/modules/sys/role.vue

@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()" type="primary">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>

front/src/views/home/DetailsPageconetent.vue

@@ -21,21 +21,21 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+           <i  class="searchImg" aria-hidden="true"></i>
            <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <button
             v-if="Cardsname == '应用资源'"
             class="button-reset"
             @click="applyAll()"
-            style="margin-left: 0.1rem"
+            style="margin-left: 0.1rem;width:135px"
           >
-            全部申请
+            申请全部应用资源
           </button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
@@ -168,14 +168,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
           <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -228,14 +228,14 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
            <button
             class="button-reset"
-            style="margin-left: 0.1rem"
             @click="globalSearch()"
           >
             全局搜索
           </button>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian" style="background: transparent"></div>
         </div>
       </div>
@@ -334,7 +334,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -481,7 +482,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+          <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
         </div>
       </div>
       <KnowledgeBase
@@ -538,7 +540,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset" style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
@@ -703,7 +706,8 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
-          <button class="button-reset" @click="chongzhi()">重置</button>
+            <i  class="searchImg" aria-hidden="true"></i>
+          <button class="button-reset"  style="margin-left: 0.1rem;" @click="chongzhi()">重置</button>
         </div>
       </div>
       <KnowledgeBase
@@ -1930,13 +1934,21 @@
     .resultListSearchInput-son {
       background: #fff;
       padding: 0.2rem 0.2rem 0rem 0.3rem;
-
+      position: relative;
       .hengxian {
         width: 100%;
         height: 0.01rem;
         background: rgba(150, 144, 144, 0.3);
         margin-top: 0.2rem;
       }
+     .searchImg{
+      width: 17px;
+      height: 17px;
+     background: url('~@/assets/home/searchInner.png');
+      position: absolute;
+      top: 29px;
+      left: 480px;
+      }
     }
   }
 
@@ -1945,20 +1957,20 @@
 
     :deep(.ant-input) {
       width: 4rem;
-      height: 0.36rem;
+      height: 0.32rem;
       background: #fff;
-      border-radius: 0.04rem;
+      border-radius: 0.02rem;
     }
 
     :deep(.ant-input-search-button) {
       width: 0.8rem;
-      height: 0.36rem;
+      height: 0.32rem;
-      background: #0087ff;
+      background: #0558e1;
-      border-radius: 0.04rem !important;
+      border-radius: 0.02rem !important;
       font-size: 0.14rem;
       font-weight: 400;
       color: #fff;
-      line-height: 0.34rem;
+      line-height: 0.32rem;
       margin-left: 0.1rem;
     }
 
@@ -1971,13 +1983,15 @@
     border: 0;
     outline: none;
     width: 0.8rem;
-    height: 0.36rem;
+    height: 0.32rem;
-    background: #e1edfa;
+    color: #fff;
-    border-radius: 0.04rem;
+    //background: #e1edfa;
+    background: #0558e1;
+    border-radius: 0.02rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    //color: #0087ff;
-    line-height: 0.34rem;
+    line-height: 0.32rem;
     margin-left: 2.5rem;
     cursor: pointer;
   }

front/src/views/home/integrationServices.vue

@@ -29,6 +29,7 @@
             @change="onSearch"
             class="resultListSearchInput"
           />
+            <i  class="searchImg" aria-hidden="true"></i>
           <button class="button-reset" @click="resetAction()">重置</button>
           <div class="hengxian"></div>
         </div>
@@ -342,6 +343,14 @@
         background: rgba(150, 144, 144, 0.3);
         margin-top: 0.2rem;
       }
+      .searchImg{
+      width: 17px;
+      height: 17px;
+     background: url('~@/assets/home/searchInner.png');
+      position: absolute;
+      top: 139px;
+    left: 500px;
+      }
     }
   }
 
@@ -350,20 +359,20 @@
 
     :deep(.ant-input) {
       width: 4rem;
-      height: 0.36rem;
+      height: 0.32rem;
       background: #fff;
-      border-radius: 0.04rem;
+      border-radius: 0.02rem;
     }
 
     :deep(.ant-input-search-button) {
       width: 0.8rem;
-      height: 0.36rem;
+      height: 0.32rem;
-      background: #0087ff;
+     background: #0558e1;
-      border-radius: 0.04rem !important;
+      border-radius: 0.02rem !important;
       font-size: 0.14rem;
       font-weight: 400;
       color: #fff;
-      line-height: 0.34rem;
+      line-height: 0.32rem;
       margin-left: 0.1rem;
     }
 
@@ -376,13 +385,15 @@
     border: 0;
     outline: none;
     width: 0.8rem;
-    height: 0.36rem;
+    height: 0.32rem;
-    background: #e1edfa;
+    //background: #e1edfa;
-    border-radius: 0.04rem;
+     background: #0558e1;
+    border-radius: 0.02rem;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    //color: #0087ff;
-    line-height: 0.34rem;
+     color: #fff;
+    line-height: 0.32rem;
     margin-left: 2.5rem;
     cursor: pointer;
   }