Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

cmdb数据同步页优化-去掉资源分类、资源处理状态改为同步状态、同步和忽略按钮调换位置、按钮颜色、关键文本框长度调整



See merge request !575

@@ -8,10 +8,10 @@
     <div class="search">
     <div class="search">
       <div class="condition">
       <div class="condition">
         <el-form-item >
         <el-form-item >
-          <el-input style="width:120px;"  v-model="search.keyword" placeholder="关键字"></el-input>
+          <el-input style="width:160px;"  v-model="search.keyword" placeholder="请输入关键字"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-select style="width:200px;" v-model="search.provider" class="m-2" placeholder="厂商" clearable>
+          <el-select style="width:160px;" v-model="search.provider" class="m-2" placeholder="请选择厂商" clearable>
             <el-option
             <el-option
                     v-for="item in providerData"
                     v-for="item in providerData"
                     :key="item.ddicCode"
                     :key="item.ddicCode"
@@ -21,7 +21,7 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-select style="width:200px;"  v-model="search.system" class="m-2" placeholder="系统" clearable>
+          <el-select style="width:160px;"  v-model="search.system" class="m-2" placeholder="请选择系统" clearable>
             <el-option
             <el-option
                     v-for="item in systemData"
                     v-for="item in systemData"
                     :key="item.ddicCode"
                     :key="item.ddicCode"
@@ -31,7 +31,7 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-select style="width:200px;"  v-model="search.resSyncState" class="m-2" placeholder="资源处理状态" clearable>
+          <el-select style="width:160px;"  v-model="search.resSyncState" class="m-2" placeholder="请选择同步状态" clearable>
             <el-option
             <el-option
                     v-for="item in resSyncStateData"
                     v-for="item in resSyncStateData"
                     :key="item.ddicCode"
                     :key="item.ddicCode"
@@ -41,16 +41,16 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-button @click="getDataList">查询</el-button>
+          <el-button @click="getDataList" type="primary">查询</el-button>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-button @click="handleEdit">纳入监控</el-button>
+          <el-button @click="handleEdit" type="primary">纳入监控</el-button>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-button @click="handleRefresh">同步</el-button>
+          <el-button @click="handleIgnore" >忽略</el-button>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
-          <el-button @click="handleIgnore">忽略</el-button>
+          <el-button @click="handleRefresh">同步</el-button>
         </el-form-item>
         </el-form-item>
       </div>
       </div>
     </div>
     </div>
@@ -68,9 +68,9 @@
                      :showTools="true"
                      :showTools="true"
                      :height="height - 110">
                      :height="height - 110">
         <template #default="{row,prop,column}">
         <template #default="{row,prop,column}">
-          <div v-if="prop == 'resName'">
+         <!-- <div v-if="prop == 'resName'">
             <span class="resName-span" style="cursor: pointer;color:#1e9fff" @click="goResDetail(row.resId,row.resName,row.resType)">{{row.resName}}</span>
             <span class="resName-span" style="cursor: pointer;color:#1e9fff" @click="goResDetail(row.resId,row.resName,row.resType)">{{row.resName}}</span>
-          </div>
+          </div>-->
         </template>
         </template>
         <template #tools="{scope}">
         <template #tools="{scope}">
           <div class="list-handle">
           <div class="list-handle">

@@ -57,12 +57,6 @@ export default {
                     sortable: true,
                     sortable: true,
                     align: 'center',
                     align: 'center',
                     width: '200'
                     width: '200'
-                }, {
-                    prop: 'resCategory',
-                    label: '资源分类',
-                    sortable: true,
-                    align: 'center',
-                    width: '100'
                 },
                 },
                 {
                 {
                     prop: 'ip',
                     prop: 'ip',