Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev

@@ -41,6 +41,16 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >
+          <el-select style="width:160px;"  v-model="search.disposeState" class="m-2" placeholder="请选择资源处理状态" clearable>
+            <el-option
+                    v-for="item in resDisposeStateData"
+                    :key="item.ddicCode"
+                    :label="item.ddicName"
+                    :value="item.ddicCode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item >
           <el-button @click="getDataList" type="primary">查询</el-button>
           <el-button @click="getDataList" type="primary">查询</el-button>
         </el-form-item>
         </el-form-item>
         <el-form-item >
         <el-form-item >

@@ -29,13 +29,15 @@ export default {
         }
         }
         let providerData=Vue.ref([]);//厂商
         let providerData=Vue.ref([]);//厂商
         let systemData=Vue.ref([]);//系统
         let systemData=Vue.ref([]);//系统
-        let resSyncStateData=Vue.ref([]);//资源处理状态
+        let resSyncStateData=Vue.ref([]);//资源同步状态
+        let resDisposeStateData=Vue.ref([]);//资源处理状态
         let currentPage=Vue.ref(1);//当前页
         let currentPage=Vue.ref(1);//当前页
         let search = Vue.ref({
         let search = Vue.ref({
             keyword: '',
             keyword: '',
             pageNum: 1,
             pageNum: 1,
             pageSize: 20,
             pageSize: 20,
             resSyncState:'',
             resSyncState:'',
+            disposeState:'',
             system: '',
             system: '',
             provider:'',
             provider:'',
         });
         });
@@ -92,13 +94,13 @@ export default {
                     align: 'center',
                     align: 'center',
                     width: '130',
                     width: '130',
                     render:function (row){
                     render:function (row){
-                        let str='已同步';
+                        let str='未同步';
                         if(row.state=='1'){
                         if(row.state=='1'){
                             str='纳入监控';
                             str='纳入监控';
                         }else if(row.state=='2'){
                         }else if(row.state=='2'){
                             str='忽略';
                             str='忽略';
                         }else{
                         }else{
-                            str='已同步';
+                            str='未同步';
                         }
                         }
                         return `<span>${str}</span>`
                         return `<span>${str}</span>`
                     }
                     }
@@ -325,7 +327,8 @@ export default {
                 keyword:search.value.keyword,
                 keyword:search.value.keyword,
                 provider:search.value.provider,//厂商
                 provider:search.value.provider,//厂商
                 system:search.value.system,//系统 linux
                 system:search.value.system,//系统 linux
-                resSyncState:search.value.resSyncState,//资源处理状态 0 监控同步成功
+                resSyncState:search.value.resSyncState,//资源同步状态 0 监控同步成功
+                state:search.value.disposeState,//资源处理状态
             }
             }
             proxy.$http.get(`/api-web/cmdbSync/getPage`, params, function (res) {
             proxy.$http.get(`/api-web/cmdbSync/getPage`, params, function (res) {
                 if (res && res.data) {
                 if (res && res.data) {
@@ -347,6 +350,8 @@ export default {
                         providerData.value=res.data;
                         providerData.value=res.data;
                     }else if(code == 'os'){
                     }else if(code == 'os'){
                         systemData.value=res.data;
                         systemData.value=res.data;
+                    }else if(code == 'res_dispose_state'){
+                        resDisposeStateData.value=res.data;
                     }
                     }
                 }
                 }
             });
             });
@@ -361,6 +366,7 @@ export default {
             getDdicCode('resSyncState');
             getDdicCode('resSyncState');
             getDdicCode('provider');
             getDdicCode('provider');
             getDdicCode('os');
             getDdicCode('os');
+            getDdicCode('res_dispose_state');
         })
         })
 
 
 
 
@@ -393,6 +399,7 @@ export default {
             providerData,
             providerData,
             systemData,
             systemData,
             resSyncStateData,
             resSyncStateData,
+            resDisposeStateData,
             handleIgnore
             handleIgnore
         }
         }
     }
     }