Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/api/radar/radar.js

@@ -7,4 +7,13 @@ let importData= function importData(param) {
     data: param
   })
 }
-export default {importData}
\ No newline at end of file
+// 查询条件字段
+let searchDic= function searchDic(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
+    method: 'get',
+
+  })
+}
+
+export default {importData,searchDic}
\ No newline at end of file

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -23,7 +23,7 @@
               <img src="@/assets/images/project/empty.png">
               <div class="p1">暂无数据展示</div>
               <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
-              <div class="btn btn_primary h36 w102" @click="opennew">新增联系人</div>
+              <div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>
             </div>
           </template>
           <el-table-column
@@ -108,7 +108,7 @@
           <img src="@/assets/images/economies/icon.png">
           <span>新建相关企业-{{types}}</span>
         </div>
-        <el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" >
+        <el-form class="popform i":model="queryParam" label-width="85px" :rules="rules" ref="ruleForm" >
           <el-form-item label="企业名称：" prop="companyName" class="row">
             <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
@@ -154,25 +154,7 @@
         nowedit:-1,//当前正在编辑的文本
         tipslit:[],//项目标签
         tipsvalue:"",//标签填写内容
-        tableData: [
-          {
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }
-        ],
+        tableData: [],
         typelist:['对接深度：','合作阶段：','竞争力度：'],
         typename:"",
         rules:{
@@ -224,6 +206,8 @@
       },
       addqy(){
         addXGQY(this.queryParam).then(res=>{
+          this.hzhbVisible=false
+          this.dialogVisible=false
           if(res.code == 200){
             this.$message.success('添加成功！')
             this.getlist()

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -10,8 +10,8 @@
         <el-tab-pane label="公司全部项目" name="second"></el-tab-pane>
 
         <div class="searchInput">
-          <el-input type="text" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
-          <div class="btn">搜索</div>
+          <el-input type="text" v-model="searchParam.projectName" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
+          <div class="btn" @click="getList(1)">搜索</div>
         </div>
         <div class="sellist">
           <div class="selli">
@@ -283,6 +283,7 @@ export default {
       }else{
         this.searchParam.userId = null
       }
+      this.searchParam.ownerCompany = this.searchParam.projectName
       getProjectlist(this.searchParam).then(result=>{
         if(result.code == 200){
           this.datalist = result.rows
@@ -315,6 +316,7 @@ export default {
           pageNum:1,
           pageSize:10,
       }
+      this.getList(1)
     },
     //地区
     async prvinceTree() {

dsk-operate-ui/src/views/radar/index.vue

@@ -50,13 +50,13 @@
 				// tablist
 				personnelList: [{
 						key: 'debtProject',
-						status: false,
+						status: true,
 						value: '企业专项债项目',
 
 					},
 					{
 						key: 'Land',
-						status: true,
+						status: false,
 						value: '土地交易',
 
 					},
@@ -92,7 +92,7 @@
 					},
 
 				],
-				personnelHerf:'Land'
+				personnelHerf:'debtProject'
 			}
 		},
 		created() {},