修改

ruoyi-ui/src/api/system/config.js

@@ -9,10 +9,55 @@ export function listConfig(query) {
   })
 }
 
+// 查询在谈线索信息
+export function listConfigtwo(query) {
+  return request({
+    url: '/projectInfo/info/' + query,
+    method: 'get'
+    // params:
+  })
+}
+export function listConfigthert(query) {
+  return request({
+    url: '/projectInvestor/investor/list',
+    method: 'get'
+    // params:
+  })
+}
+export function listConfigfour(query) {
+  return request({
+    url: '/projectPersion/persion/list',
+    method: 'get'
+    // params:
+  })
+}
+//字典
+export function listConfigther(query) {
+  return request({
+    url: '/system/dict/data/type/project_status',
+    method: 'get'
+    // params:
+  })
+}
+export function listConfigfive(query) {
+  return request({
+    url: '/projectConstruction/construction/' +query,
+    method: 'get'
+    // params:
+  })
+}
+export function listConfigsix(query) {
+  return request({
+    url: '/constructionRate/rate/list',
+    method: 'get'
+    // params:
+  })
+}
+
 // 查询参数详细
 export function getConfig(configId) {
   return request({
-    url: '/system/config/' + configId,
+    url: '/projectInvestor/investor/' + configId,
     method: 'get'
   })
 }
@@ -25,10 +70,24 @@ export function getConfigKey(configKey) {
   })
 }
 
+export function getConfigKeytwo(configKey) {
+  return request({
+    url: '/projectPersion/persion/' + configKey,
+    method: 'get'
+  })
+}
+
 // 新增参数配置
 export function addConfig(data) {
   return request({
-    url: '/system/config',
+    url: '/projectInvestor/investor',
+    method: 'post',
+    data: data
+  })
+}
+export function addConfigtwo(data) {
+  return request({
+    url: '/projectPersion/persion',
     method: 'post',
     data: data
   })
@@ -37,7 +96,14 @@ export function addConfig(data) {
 // 修改参数配置
 export function updateConfig(data) {
   return request({
-    url: '/system/config',
+    url: '/projectInvestor/investor',
+    method: 'put',
+    data: data
+  })
+}
+export function updateConfigtwo(data) {
+  return request({
+    url: '/projectPersion/persion',
     method: 'put',
     data: data
   })
@@ -46,11 +112,16 @@ export function updateConfig(data) {
 // 删除参数配置
 export function delConfig(configId) {
   return request({
-    url: '/system/config/' + configId,
+    url: '/projectInvestor/investor/' + configId,
+    method: 'delete'
+  })
+}
+export function delConfigtwo(configId) {
+  return request({
+    url: '/projectPersion/persion/' + configId,
     method: 'delete'
   })
 }
-
 // 清理参数缓存
 export function clearCache() {
   return request({
@@ -66,4 +137,4 @@ export function exportConfig(query) {
     method: 'get',
     params: query
   })
-}
+}

ruoyi-ui/src/api/system/notice.js

@@ -8,9 +8,24 @@ export function listNotice(query) {
     params: query
   })
 }
+//信息公告列表信息
+export function listNoticetwo(query) {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询公告详细
 export function getNotice(noticeId) {
+  return request({
+    url: '/system/notice/list' + noticeId,
+    method: 'get'
+  })
+}
+//信息动态修改
+export function getNoticetwo(noticeId) {
   return request({
     url: '/system/notice/' + noticeId,
     method: 'get'
@@ -25,6 +40,14 @@ export function addNotice(data) {
     data: data
   })
 }
+// 新增信息动态
+export function addNoticetao(data) {
+  return request({
+    url: '/system/notice',
+    method: 'post',
+    data: data
+  })
+}
 
 // 修改公告
 export function updateNotice(data) {
@@ -41,4 +64,4 @@ export function delNotice(noticeId) {
     url: '/system/notice/' + noticeId,
     method: 'delete'
   })
-}
+}

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -20,7 +20,7 @@
           <div class="nstruction_navne">
             <p>
               <span>*</span>
-              <span>合同约定开工时间:</span>
+              <span> 合同约定竣工时间:</span>
             </p>
             <p></p>
           </div>
@@ -30,57 +30,37 @@
         <p @click="tabClid(index)" v-for="(item,index) in tabNume"  :key="index" :class="[tab == index? 'p' : '']">{{item}}</p>
        </div>
        <!-- 内容 -->
-       <div class="namjeu" >
+       <div class="namjeu" v-if="tab == 0">
          <el-form :model="queryParamstwr" ref="queryForm" :inline="true" v-show="showSearch" label-width="135px" label-position="center" class="manager_form">
           <el-form-item label="施工许可证:" prop="configType" class="maget_ty">
               <div class="forieu" style="width: 618px;">
                <div class="bure burert">
                  <el-upload
-                   action="#"
-                    list-type="picture-card"
-                    :auto-upload="false">
+                   action="http://192.168.101.11:8080/common/upload"
+                   :auto-upload="false"
+                   ref="upload"
+                   :before-upload="beforeAvatarUpload"
+                   list-type="picture-card"
+                   :on-preview="handlePictureCardPreview"
+                   :on-remove="handleRemove"
+                   :multiple="true"
+                   :file-list="fileList">
                       <!-- <i slot="default" class="el-icon-plus"></i> -->
-                      <div slot="file" slot-scope="{file}" style="height: 78px;">
-                        <img
-                          class="el-upload-list__item-thumbnail"
-                          :src="file.url" alt=""
-                        >
-                        <span class="el-upload-list__item-actions">
-                          <span
-                            class="el-upload-list__item-preview"
-                            @click="handlePictureCardPreview(file)"
-                          >
-                            <i class="el-icon-zoom-in"></i>
-                          </span>
-                         <!-- <span
-                            v-if="!disabled"
-                            class="el-upload-list__item-delete"
-                            @click="handleDownload(file)"
-                          >
-                            <i class="el-icon-download"></i>
-                          </span> -->
-                          <span
-                            v-if="!disabled"
-                            class="el-upload-list__item-delete"
-                            @click="handleRemove(file)"
-                          >
-                            <i class="el-icon-delete"></i>
-                          </span>
-                        </span>
 
-                      </div>
                    <div class="ijeut">
                      <el-button plain slot="trigger" size="small" type="primary" >选择图片</el-button>
                       <!-- margin-top: 15%; transform: translateY(-50%); -->
-                     <el-button style="margin-left: 10px;" size="small" type="primary" @click="submitUpload">开始上传</el-button>
+
                    </div>
                    <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
                  </el-upload>
+                 <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUpload">开始上传</el-button></div>
+
                </div>
               </div>
             </el-form-item>
-            <el-form-item label="是否开工建设:" prop="configType">
-              <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small" style="width: 458px">
+            <el-form-item label="是否开工建设:" prop="isConstruction">
+              <el-select v-model="queryParams.isConstruction" placeholder="系统内置" clearable size="small" style="width: 458px">
                 <el-option
                   v-for="dict in typeOptions"
                   :key="dict.dictValue"
@@ -90,10 +70,10 @@
               </el-select>
             </el-form-item>
              <el-form-item label=" 开工日期:">
-                  <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 335px"></el-date-picker>
+                  <el-date-picker type="date" placeholder="选择日期" v-model="queryParams.constructionStartdate" style="width: 335px"></el-date-picker>
               </el-form-item>
               <el-form-item label="预计完工日期:">
-                   <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 335px"></el-date-picker>
+                   <el-date-picker type="date" placeholder="选择日期" v-model="queryParams.constructionEnddate" style="width: 335px"></el-date-picker>
                </el-form-item>
                <el-form-item label="施工合同:" prop="configType" class="maget_ty">
                    <div class="forieu" style="width: 618px;">
@@ -130,7 +110,7 @@
                                  <i class="el-icon-delete"></i>
                                </span>
                              </span>
-                    
+
                            </div>
                         <div class="ijeut">
                           <el-button plain slot="trigger" size="small" type="primary" >选择图片</el-button>
@@ -144,20 +124,27 @@
                  </el-form-item>
           </el-form>
           <p class="kaieu">开工照片:</p>
-          <p class="kaieu_tw"><i class="el-icon-circle-plus-outline"></i> 添加企业</p>
+          <p class="kaieu_tw" @click="handleAdd"><i class="el-icon-circle-plus-outline"></i> 添加企业</p>
           <el-table v-loading="loading" :data="configList" >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
             <el-table-column label="时间" align="center" prop="configId" />
-            <el-table-column label="进度" align="center" prop="configName" :show-overflow-tooltip="true" />
-            <el-table-column label="照片" align="center" >
+            <el-table-column label="进度" align="center" prop="rateTypeName" :show-overflow-tooltip="true" />
+            <el-table-column label="照片" align="photo" >
               <!-- class-name="small-padding fixed-width" -->
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="warning"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:config:edit']"
-                >上传</el-button>
+                <el-upload
+                  class="upload-demo"
+                  action="http://192.168.101.11:8080/common/upload"
+                  :on-preview="handlePreviewtwo"
+                  :on-remove="handleRemovetwo"
+                  :before-remove="beforeRemovetwo"
+                  multiple
+                  :limit="3"
+                  :on-exceed="handleExceedtwo"
+                  :file-list="fileList">
+                  <el-button size="small" type="primary">点击上传</el-button>
+                  <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+                </el-upload>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" >
@@ -175,7 +162,7 @@
 
        </div>
 
-       <div class="equipment" v-if="false">
+       <div class="equipment" v-if="tab == 1">
             <p class="kaieu_tw"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
           <el-table v-loading="loading" :data="configList" >
             <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -207,9 +194,9 @@
 
        </div>
 
-     <div class="funding" v-if="false">
+     <div class="funding" v-if="tab == 2">
         <p class="kaieu">到资金额合计:  万元</p>
-          <p class="kaieu_tw"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
+          <p class="kaieu_tw" @click="handleAdd"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
         <el-table v-loading="loading" :data="configList" >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="时间" align="center" prop="configId" />
@@ -240,7 +227,7 @@
 
      </div>
      </div>
-     <div class="namjeu" v-if="false">
+     <div class="namjeu" v-if="tab == 3">
        <el-form :model="queryParamstwr" ref="queryForm" :inline="true" v-show="showSearch" label-width="135px" label-position="center" class="manager_form">
            <el-form-item label=" 入统时间:">
                 <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 335px"></el-date-picker>
@@ -308,30 +295,15 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="企业名称" prop="configName">
+        <el-form-item label="时间" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入企业名称" />
         </el-form-item>
-        <el-form-item label="企业所在地" prop="configKey">
+        <el-form-item label="进度" prop="configKey">
           <el-input v-model="form.configKey" placeholder="请输入参数键名" />
         </el-form-item>
-        <el-form-item label="法人代表姓名" prop="configValue">
+        <el-form-item label="图片" prop="configValue">
           <el-input v-model="form.configValue" placeholder="请输入参数键值" />
         </el-form-item>
-        <el-form-item label="系统内置" prop="configType">
-          <el-radio-group v-model="form.configType">
-            <el-radio
-              v-for="dict in typeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{dict.dictLabel}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="统一社会信用代码" prop="remark">
-          <el-input v-model="form.remark"  placeholder="请输入统一社会信用代码" />
-        </el-form-item>
-        <el-form-item label="联系方式" prop="remark">
-          <el-input v-model="form.remark"  placeholder="请输入联系方式" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -342,7 +314,7 @@
 </template>
 
 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
+import { listConfig, listConfigfive, listConfigsix, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
 export default {
   name: "Config",
   data() {
@@ -351,8 +323,8 @@ export default {
       loading: true,
       //步骤条
       naueactive:2,
-      tab:1,
-      tabNume:['线索信息','签约信息','在建信息','投产信息'],
+      tab:0,
+      tabNume:['项目施工','设备安装','项目到资','项目入统'],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -365,6 +337,8 @@ export default {
       total: 0,
       // 参数表格数据
       configList: [],
+      configListwo:[],
+      fileList:[],
       // 弹出层标题
       title: "",
       dialogImageUrl: '',
@@ -380,6 +354,7 @@ export default {
       },
       // 表单参数
       form: {},
+      bmProjectId:0,
       // 表单校验
       rules: {
         configName: [
@@ -395,9 +370,11 @@ export default {
     };
   },
   created() {
+    this.bmProjectId = this.$route.query.setid
     this.getList();
+    this.getListtoi()
     this.getDicts("sys_yes_no").then(response => {
-      this.typeOptions = response.data;
+    this.typeOptions = response.data;
     });
   },
   methods: {
@@ -414,10 +391,32 @@ export default {
          handleDownload(file) {
            console.log(file);
          },
+         handleRemovetwo(file, fileList) {
+                 console.log(file, fileList);
+               },
+               handlePreviewtwo(file) {
+                 console.log(file);
+               },
+               handleExceedtwo(files, fileList) {
+                 this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+               },
+               beforeRemovetwo(file, fileList) {
+                 return this.$confirm(`确定移除 ${ file.name }？`);
+               },
     /** 查询参数列表 */
     getList() {
       this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listConfigfive(this.bmProjectId).then(response => {
+          this.queryParamstwr = response.data;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    //开工图片列表
+    getListtoi() {
+      this.loading = true;
+      listConfigsix().then(response => {
           this.configList = response.rows;
           this.total = response.total;
           this.loading = false;

ruoyi-ui/src/views/management/roduction/index.vue

@@ -117,7 +117,7 @@
   </div>
 
 
-<el-dialog :visible.sync="dialogVisible">
+              <el-dialog :visible.sync="dialogVisible">
                      <img width="100%" :src="dialogImageUrl" alt="">
                    </el-dialog>
   </div>

ruoyi-ui/src/views/management/row/index.vue

@@ -32,11 +32,11 @@
       </div>
       <div class="naue_two">
         <el-steps :active="naueactive" align-center finish-status="success">
-          <el-step title="线索审核中"></el-step>
-          <el-step title="线索审核成功"></el-step>
+          <el-step v-for="(item,index) in configList" :key="index" :title="item.dictLabel"></el-step>
+          <!-- <el-step title="线索审核成功"></el-step>
           <el-step title="签约审核成功"></el-step>
           <el-step title="在建审核成功"></el-step>
-          <el-step title="结束"></el-step>
+          <el-step title="结束"></el-step> -->
         </el-steps>
       </div>
     </div>
@@ -99,7 +99,7 @@
 </template>
 
 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
+import { listConfig, listConfigther ,getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
 import myTabs from '../../tab/index.vue'
 import One from '../../under/index.vue'
 import Two from '../nstruction/index.vue'
@@ -143,7 +143,7 @@ export default {
       // 遮罩层
       loading: true,
       //步骤条
-      naueactive:2,
+      naueactive:0,
       tab:1,
       tabNume:['线索信息','签约信息','在建信息','投产信息'],
       // 选中数组
@@ -168,11 +168,11 @@ export default {
       dateRange: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        configName: undefined,
-        configKey: undefined,
-        configType: undefined
+        // pageNum: 1,
+        // pageSize: 10,
+        // configName: undefined,
+        // configKey: undefined,
+        // configType: undefined
       },
       // 表单参数
       form: {},
@@ -191,6 +191,12 @@ export default {
     };
   },
   created() {
+    if(this.$route.query.setrd == 0){
+      this.naueactive = this.$route.query.setrd - 0
+    }else {
+      this.naueactive = this.$route.query.setrd - 0 - 1
+    }
+    console.log(this.naueactive)
     this.getList();
     this.getDicts("sys_yes_no").then(response => {
       this.typeOptions = response.data;
@@ -200,9 +206,10 @@ export default {
     /** 查询参数列表 */
     getList() {
       this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.configList = response.rows;
-          this.total = response.total;
+      listConfigther().then(response => {
+        console.log(response)
+          this.configList = response.data;
+          // this.total = response.total;
           this.loading = false;
         }
       );
@@ -241,9 +248,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加参数";
+      console.log(this.queryParams)
+      // this.reset();
+      // this.open = true;
+      // this.title = "添加参数";
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

ruoyi-ui/src/views/system/notice/index.vue

@@ -81,19 +81,20 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column label="作者" align="center" prop="createBy" />
+      <el-table-column
+         label="发布单位"
+         align="center"
+         prop="deptName"
+         :show-overflow-tooltip="true"
+         width="100"
+       />
       <el-table-column
         label="类型"
         align="center"
         prop="noticeType"
         :formatter="typeFormat"
       />
-     <!-- <el-table-column
-        label="状态"
-        align="center"
-        prop="status"
-        :formatter="statusFormat"
-        width="100"
-      /> -->
+
       <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -137,29 +138,34 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="作者" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入作者" />
+            <el-form-item label="作者" prop="createBy">
+              <el-input v-model="form.createBy" placeholder="请输入作者" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="单位" prop="noticeTitle">
-              <el-input v-model="form.noticeTitle" placeholder="请输入单位" />
+            <el-form-item label="单位" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入单位" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="类型" prop="noticeType">
-              
+                <el-radio-group v-model="form.noticeType">
+                  <el-radio
+                    v-for="dict in typeOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictValue"
+                  >{{dict.dictLabel}}</el-radio>
+                </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{dict.dictLabel}}</el-radio>
-              </el-radio-group>
+            <el-form-item  label="缩略图" class="elItem" prop="je">
+              <el-upload class="upload-demo" ref="upload" action="http://192.168.101.11:8080/common/upload"
+                :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSucc" :file-list="fileList" :auto-upload="false" :multiple="true">
+                <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+                <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+              </el-upload>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -178,7 +184,7 @@
 </template>
 
 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
+import { listNotice, getNotice, getNoticetwo, delNotice, addNotice, updateNotice, exportNotice,listNoticetwo } from "@/api/system/notice";
 import Editor from '@/components/Editor';
 
 export default {
@@ -228,7 +234,9 @@ export default {
         noticeType: [
           { required: true, message: "公告类型不能为空", trigger: "change" }
         ]
-      }
+      },
+      configList: [{}],
+      fileList: []
     };
   },
   created() {
@@ -244,7 +252,7 @@ export default {
     /** 查询公告列表 */
     getList() {
       this.loading = true;
-      listNotice(this.queryParams).then(response => {
+      listNoticetwo(this.queryParams).then(response => {
         this.noticeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -252,7 +260,7 @@ export default {
     },
     // 公告状态字典翻译
     statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status);
+      return this.selectDictLabel(this.statusOptions, row.noticeType);
     },
     // 公告状态字典翻译
     typeFormat(row, column) {
@@ -300,7 +308,10 @@ export default {
     handleUpdate(row) {
       this.reset();
       const noticeId = row.noticeId || this.ids
-      getNotice(noticeId).then(response => {
+      // this.form = row;
+      // this.open = true;
+      // console.log(24)
+      getNoticetwo(noticeId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改动态";
@@ -339,6 +350,26 @@ export default {
           this.getList();
           this.msgSuccess("删除成功");
         })
+    },
+    submitUpload() {
+
+      this.$refs.upload.submit();
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+
+    },
+    handlePreview(file) {
+      console.log(file,45);
+    },
+    handleSucc(response, file, fileList){
+      this.form.imgUrl = file.response.url
+      console.log(this.form.imgUrl)
+      if(file.response.code == 200){
+        this.msgSuccess("上传成功");
+      }
+       
+      console.log(response.url, file, fileList);
     }
   }
 };

ruoyi-ui/src/views/tab/index.vue

@@ -15,7 +15,8 @@ export default {
   name: "'Mytabs'",
   props:{
     tabList: Array,
-    tabIndex: Number
+    tabIndex: Number,
+    queryParams:Object
   },
   data() {
     return {
@@ -29,6 +30,7 @@ export default {
       // 非单个禁用
       single: true,
       // 非多个禁用
+
     };
   },
   created() {

ruoyi-ui/src/views/under/index.vue

@@ -8,14 +8,14 @@
          <p>投资方 <i>*</i></p>
        </div>
        <p class="enterprise">企业</p>
-       <p class="enterprise_tw"><i class="el-icon-circle-plus-outline"></i>添加企业</p>
+       <p class="enterprise_tw" @click="handleAdd"><i class="el-icon-circle-plus-outline"></i>添加企业</p>
        <el-table v-loading="loading" :data="configList" >
          <!-- <el-table-column type="selection" width="55" align="center" /> -->
-         <el-table-column label="企业名称" align="center" prop="configId" />
-         <el-table-column label="企业所在地" align="center" prop="configName" :show-overflow-tooltip="true" />
-         <el-table-column label="法人代表姓名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-         <el-table-column label="统一社会信用代码" align="center" prop="configValue" />
-         <el-table-column label="联系方式" align="center" prop="configType" :formatter="typeFormat" />
+         <el-table-column label="企业名称" align="center" prop="companyName" />
+         <el-table-column label="企业所在地" align="center" prop="companyAddress" :show-overflow-tooltip="true" />
+         <el-table-column label="法人代表姓名" align="center" prop="companyLegal" :show-overflow-tooltip="true" />
+         <el-table-column label="统一社会信用代码" align="center" prop="companyCode" />
+         <el-table-column label="联系方式" align="center" prop="phone"  />
         <!-- <el-table-column label="操作" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
          <el-table-column label="操作" align="center" >
            <!-- class-name="small-padding fixed-width" -->
@@ -36,13 +36,13 @@
          </el-table-column>
        </el-table>
        <p class="enterprise">自然人</p>
-       <p class="enterprise_tw"><i class="el-icon-circle-plus-outline"></i>添加自然人</p>
-  <el-table v-loading="loading" :data="configList" >
+       <p class="enterprise_tw" @click="handleAddtwo"><i class="el-icon-circle-plus-outline"></i>添加自然人</p>
+  <el-table v-loading="loading" :data="configListtwoL" >
    <!-- <el-table-column type="selection" width="55" align="center" /> -->
-   <el-table-column label="姓名" align="center" prop="configId" />
-   <el-table-column label="自然人所在地" align="center" prop="configName" :show-overflow-tooltip="true" />
-   <el-table-column label="身份证号码" align="center" prop="configKey" :show-overflow-tooltip="true" />
-   <el-table-column label="联系方式" align="center" prop="configValue" />
+   <el-table-column label="姓名" align="center" prop="name" />
+   <el-table-column label="自然人所在地" align="center" prop="address" :show-overflow-tooltip="true" />
+   <el-table-column label="身份证号码" align="center" prop="idCode" :show-overflow-tooltip="true" />
+   <el-table-column label="联系方式" align="center" prop="phone" />
    <!-- <el-table-column label="联系方式" align="center" prop="configType" :formatter="typeFormat" /> -->
   <!-- <el-table-column label="操作" align="center" prop="remark" :show-overflow-tooltip="true" /> -->
    <el-table-column label="操作" align="center" >
@@ -51,22 +51,22 @@
        <el-button
          size="mini"
          type="warning"
-         @click="handleUpdate(scope.row)"
+         @click="handleUpdatetwo(scope.row)"
          v-hasPermi="['system:config:edit']"
        >修改</el-button>
        <el-button
          size="mini"
          type="danger"
-         @click="handleDelete(scope.row)"
+         @click="handleDeletetwo(scope.row)"
          v-hasPermi="['system:config:remove']"
        >删除</el-button>
      </template>
    </el-table-column>
  </el-table>
        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="115px" label-position="center" class="manager_form">
-         <el-form-item label="投资方联系人" prop="configName">
+         <el-form-item label="投资方联系人" prop="contactor">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.contactor"
              placeholder="请输入投资方联系人"
              clearable
              size="small"
@@ -74,9 +74,9 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
-         <el-form-item label="投资方联系方式:" prop="configKey">
+         <el-form-item label="投资方联系方式:" prop="phone">
            <el-input
-             v-model="queryParams.configKey"
+             v-model="queryParams.phone"
              placeholder="请输入联系方式"
              clearable
              size="small"
@@ -85,50 +85,52 @@
            />
          </el-form-item>
          <div class="nvestor">
-           <p>投资方 <i>*</i></p>
+           <p>引荐方 <i>*</i></p>
          </div>
-         <el-form-item label="引荐单位:" prop="configType">
-           <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small" style="width: 188px">
-             <el-option
-               v-for="dict in typeOptions"
-               :key="dict.dictValue"
-               :label="dict.dictLabel"
-               :value="dict.dictValue"
+         <div v-for="(item,index) in queryParams.referralList " :key="index">
+           <el-form-item label="引荐单位:" prop="item.sysdeptId">
+             <el-select v-model="item.sysdeptId" placeholder="系统内置" clearable size="small" style="width: 188px">
+               <el-option
+                 v-for="dict in typeOptions"
+                 :key="dict.dictValue"
+                 :label="dict.dictLabel"
+                 :value="dict.dictValue"
+               />
+             </el-select>
+           </el-form-item>
+           <el-form-item label="投资分配额:" prop="item.investmentAllcocation">
+             <el-input
+               v-model="item.investmentAllcocation"
+               placeholder="输入数字"
+               clearable
+               size="small"
+               style="width: 98px"
+               @keyup.enter.native="handleQuery"
              />
-           </el-select>
-         </el-form-item>
-         <el-form-item label="投资分配额:" prop="configName">
-           <el-input
-             v-model="queryParams.configName"
-             placeholder="输入数字"
-             clearable
-             size="small"
-             style="width: 98px"
-             @keyup.enter.native="handleQuery"
-           />
-           <span class="souu">%</span>
-         </el-form-item>
-         <el-form-item label="引荐方联系人:" prop="configName">
-           <el-input
-             v-model="queryParams.configName"
-             placeholder="请输入"
-             clearable
-             size="small"
-             style="width: 98px"
-             @keyup.enter.native="handleQuery"
-           />
-         </el-form-item>
+             <span class="souu">%</span>
+           </el-form-item>
+           <el-form-item label="引荐方联系人:" prop="item.referral">
+             <el-input
+               v-model="item.referral"
+               placeholder="请输入"
+               clearable
+               size="small"
+               style="width: 98px"
+               @keyup.enter.native="handleQuery"
+             />
+           </el-form-item>
 
-         <el-form-item label="引荐方联系方式:" prop="configName">
-           <el-input
-             v-model="queryParams.configName"
-             placeholder="请输入联系方式"
-             clearable
-             size="small"
-             style="width: 153px"
-             @keyup.enter.native="handleQuery"
-           />
-         </el-form-item>
+           <el-form-item label="引荐方联系方式:" prop="item.referralPhone">
+             <el-input
+               v-model="item.referralPhone"
+               placeholder="请输入联系方式"
+               clearable
+               size="small"
+               style="width: 153px"
+               @keyup.enter.native="handleQuery"
+             />
+           </el-form-item>
+         </div>
          <el-form-item label="引荐单位:" prop="configType">
            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small" style="width: 188px">
              <el-option
@@ -139,9 +141,9 @@
              />
            </el-select>
          </el-form-item>
-         <el-form-item label="投资分配额:" prop="configName">
+         <el-form-item label="投资分配额:" prop="investmentAllcocation">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.investmentAllcocation"
              placeholder="输入数字"
              clearable
              size="small"
@@ -174,9 +176,9 @@
          <div class="nvestor">
            <p>项目基本信息 <i>*</i></p>
          </div>
-         <el-form-item label="预计投资额" prop="configName">
+         <el-form-item label="预计投资额" prop="needAmt">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.needAmt"
              placeholder="请输入预计投资额"
              clearable
              size="small"
@@ -184,9 +186,9 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
-         <el-form-item label="其中 固定资产投资:" prop="configKey" class="manager_lab" >
+         <el-form-item label="其中 固定资产投资:" prop="fixedAssets" class="manager_lab" >
            <el-input
-             v-model="queryParams.configKey"
+             v-model="queryParams.fixedAssets"
              placeholder="请输入"
              clearable
              size="small"
@@ -196,10 +198,10 @@
          </el-form-item>
          <div class="lage_div">
            <span>项目主营产品</span>
-           <el-form-item label="产品名称:" prop="configKey"  class="maneg_lar">
+           <el-form-item label="产品名称:" prop="productName"  class="maneg_lar">
 
              <el-input
-               v-model="queryParams.configKey"
+               v-model="queryParams.productName"
                placeholder="请输入产品名称"
                clearable
                size="small"
@@ -209,9 +211,9 @@
 
            </el-form-item>
          </div>
-         <el-form-item label="设计产能:" prop="configKey" class="manager_labtwo" >
+         <el-form-item label="设计产能:" prop="productQty" class="manager_labtwo" >
            <el-input
-             v-model="queryParams.configKey"
+             v-model="queryParams.productQty"
              placeholder="请输入设计产能"
              clearable
              size="small"
@@ -222,10 +224,10 @@
          </el-form-item>
          <div class="lage_div">
            <span>项目预计收益</span>
-           <el-form-item label="预计产值:" prop="configKey"  class="maneg_lar">
+           <el-form-item label="预计产值:" prop="productPrice"  class="maneg_lar">
 
              <el-input
-               v-model="queryParams.configKey"
+               v-model="queryParams.productPrice"
                placeholder="请输入预计产值"
                clearable
                size="small"
@@ -235,9 +237,9 @@
 
            </el-form-item>
          </div>
-         <el-form-item label="预计税收:" prop="configKey" class="manager_labtwo" >
+         <el-form-item label="预计税收:" prop="productTax" class="manager_labtwo" >
            <el-input
-             v-model="queryParams.configKey"
+             v-model="queryParams.productTax"
              placeholder="请输入预计税收"
              clearable
              size="small"
@@ -246,9 +248,9 @@
            />
 
          </el-form-item>
-         <el-form-item label="预计用工:" prop="configKey" class="manager_labtwo" >
+         <el-form-item label="预计用工:" prop="productEmp" class="manager_labtwo" >
            <el-input
-             v-model="queryParams.configKey"
+             v-model="queryParams.productEmp"
              placeholder="请输入预计用工"
              clearable
              size="small"
@@ -259,9 +261,9 @@
          <div class="nvestor">
            <p>项目基本需求 </p>
          </div>
-         <el-form-item label="项目计划用地:" prop="configName" class="manager_labthre">
+         <el-form-item label="项目计划用地:" prop="plannedLand" class="manager_labthre">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.plannedLand"
              placeholder="请输入"
              clearable
              size="small"
@@ -270,9 +272,9 @@
            />
            <span class="souu">亩</span>
          </el-form-item>
-         <el-form-item label="其中 独立供地:" prop="configName">
+         <el-form-item label="其中 独立供地:" prop="independentLand">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.independentLand"
              placeholder="请输入"
              clearable
              size="small"
@@ -281,9 +283,9 @@
            />
            <span class="souu">亩</span>
          </el-form-item>
-        <el-form-item label="流转土地:" prop="configName" class="mage_ter">
+        <el-form-item label="流转土地:" prop="circulationLan" class="mage_ter">
           <el-input
-            v-model="queryParams.configName"
+            v-model="queryParams.circulationLan"
             placeholder="请输入"
             clearable
             size="small"
@@ -292,9 +294,9 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="项目计划租赁用房:" prop="configName" class="manager_labthre">
+        <el-form-item label="项目计划租赁用房:" prop="needRoom" class="manager_labthre">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.needRoom"
              placeholder="请输入"
              clearable
              size="small"
@@ -303,9 +305,9 @@
            />
            <span class="souu">亩</span>
          </el-form-item>
-         <el-form-item label="其中 厂房:" prop="configName">
+         <el-form-item label="其中 厂房:" prop="needFactoryRoom">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.needFactoryRoom"
              placeholder="请输入"
              clearable
              size="small"
@@ -314,9 +316,9 @@
            />
            <span class="souu">亩</span>
          </el-form-item>
-        <el-form-item label="办公生活用房:" prop="configName" class="mage_ter">
+        <el-form-item label="办公生活用房:" prop="needBusRoom" class="mage_ter">
           <el-input
-            v-model="queryParams.configName"
+            v-model="queryParams.needBusRoom"
             placeholder="请输入"
             clearable
             size="small"
@@ -325,9 +327,9 @@
           />
           <span class="souu">亩</span>
         </el-form-item>
-        <el-form-item label="其他需求:" prop="configName" class="maget_ty">
+        <el-form-item label="其他需求:" prop="other" class="maget_ty">
           <el-input
-            v-model="queryParams.configName"
+            v-model="queryParams.other"
             placeholder="请输入项目概况"
             clearable
             type="textarea"
@@ -337,8 +339,8 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-       <el-form-item label="拟落户地点:" prop="configType">
-           <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small" style="width: 188px">
+       <el-form-item label="拟落户地点:" prop="address">
+           <el-select v-model="queryParams.address" placeholder="系统内置" clearable size="small" style="width: 188px">
              <el-option
                v-for="dict in typeOptions"
                :key="dict.dictValue"
@@ -347,8 +349,8 @@
              />
            </el-select>
          </el-form-item>
-         <el-form-item label="是否签订框架协议:" prop="configType" class="maget_ty">
-             <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small" style="width: 298px">
+         <el-form-item label="是否签订框架协议:" prop="isFrameorder" class="maget_ty">
+             <el-select v-model="queryParams.isFrameorder" placeholder="系统内置" clearable size="small" style="width: 298px">
                <el-option
                  v-for="dict in typeOptions"
                  :key="dict.dictValue"
@@ -358,16 +360,35 @@
              </el-select>
            </el-form-item>
           <el-form-item label="添加附件:" prop="configType" class="maget_ty">
-              <div class="forieu">
-               <div class="bure">
-                 <el-button  type="primary" size="small" plain>选择图片</el-button>
-                 <el-button  type="primary" size="small">开始上传</el-button>
+              <div class="forieu" style="width: 618px;">
+               <div class="bure burert">
+                 <el-upload
+                   action="http://192.168.101.11:8080/common/upload"
+                   :auto-upload="false"
+                   ref="upload"
+                   :before-upload="beforeAvatarUpload"
+                   list-type="picture-card"
+                   :on-preview="handlePictureCardPreview"
+                   :on-remove="handleRemove"
+                   :multiple="true"
+                   :file-list="fileList">
+                      <!-- <i slot="default" class="el-icon-plus"></i> -->
+
+                   <div class="ijeut">
+                     <el-button plain slot="trigger" size="small" type="primary" >选择图片</el-button>
+                      <!-- margin-top: 15%; transform: translateY(-50%); -->
+
+                   </div>
+                   <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+                 </el-upload>
+                 <div class="ijeut"><el-button style="margin-left: 10px; height: 32px;" size="small" type="primary" @click="submitUpload">开始上传</el-button></div>
+
                </div>
               </div>
             </el-form-item>
-         <el-form-item label="备注:" prop="configName" class="maget_ty">
+         <el-form-item label="备注:" prop="description" class="maget_ty">
            <el-input
-             v-model="queryParams.configName"
+             v-model="queryParams.description"
              placeholder="请输入备注"
              clearable
              type="textarea"
@@ -389,14 +410,14 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="企业名称" prop="configName">
-          <el-input v-model="form.configName" placeholder="请输入企业名称" />
+        <el-form-item label="企业名称" prop="companyName">
+          <el-input v-model="form.companyName" placeholder="请输入企业名称" />
         </el-form-item>
-        <el-form-item label="企业所在地" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
+        <el-form-item label="企业所在地" prop="companyAddress">
+          <el-input v-model="form.companyAddress" placeholder="请输入参数键名" />
         </el-form-item>
-        <el-form-item label="法人代表姓名" prop="configValue">
-          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
+        <el-form-item label="法人代表姓名" prop="companyLegal">
+          <el-input v-model="form.companyLegal" placeholder="请输入参数键值" />
         </el-form-item>
         <el-form-item label="系统内置" prop="configType">
           <el-radio-group v-model="form.configType">
@@ -407,11 +428,11 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="统一社会信用代码" prop="remark">
-          <el-input v-model="form.remark"  placeholder="请输入统一社会信用代码" />
+        <el-form-item label="统一社会信用代码" prop="companyCode">
+          <el-input v-model="form.companyCode"  placeholder="请输入统一社会信用代码" />
         </el-form-item>
-        <el-form-item label="联系方式" prop="remark">
-          <el-input v-model="form.remark"  placeholder="请输入联系方式" />
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="form.phone"  placeholder="请输入联系方式" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -419,13 +440,49 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :title="titletwo" :visible.sync="opentwo" width="800px" append-to-body>
+      <el-form ref="formtwo" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="formtwo.name" placeholder="请输入企业名称" />
+        </el-form-item>
+        <el-form-item label="自然人所在地" prop="address">
+          <el-input v-model="formtwo.address" placeholder="请输入参数键名" />
+        </el-form-item>
+        <el-form-item label="身份证号码" prop="idCode">
+          <el-input v-model="formtwo.idCode" placeholder="请输入参数键值" />
+        </el-form-item>
+        <el-form-item label="系统内置" prop="configType">
+          <el-radio-group v-model="form.configType">
+            <el-radio
+              v-for="dict in typeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{dict.dictLabel}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="phone">
+          <el-input v-model="formtwo.phone"  placeholder="请输入联系方式" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormtwo">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+         <el-dialog :visible.sync="dialogVisible">
+           <img width="100%" :src="dialogImageUrl" alt="">
+         </el-dialog>
   </div>
 </template>
 
 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
+import { listConfig, listConfigtwo, listConfigthert, listConfigfour, getConfig, getConfigKeytwo, delConfig, delConfigtwo, addConfig, addConfigtwo,  updateConfig, updateConfigtwo, exportConfig, clearCache } from "@/api/system/config";
 export default {
   name: "Config",
+  props:{
+    queryParams: Object,
+    tabIndex: Number
+  },
   data() {
     return {
       // 遮罩层
@@ -446,24 +503,33 @@ export default {
       total: 0,
       // 参数表格数据
       configList: [],
+      configListtwoL:[],
       // 弹出层标题
       title: "",
+      titletwo:'',
       // 是否显示弹出层
       open: false,
+      opentwo:false,
       // 类型数据字典
       typeOptions: [],
       // 日期范围
       dateRange: [],
       // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        configName: undefined,
-        configKey: undefined,
-        configType: undefined
-      },
+      // queryParams: {
+      //   pageNum: 14,
+      //   pageSize: 10,
+      //   configName: undefined,
+      //   configKey: undefined,
+      //   configType: undefined
+      // },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      bmProjectId:0,
       // 表单参数
       form: {},
+      formtwo:{},
+      fileList:[],
       // 表单校验
       rules: {
         configName: [
@@ -479,18 +545,80 @@ export default {
     };
   },
   created() {
+
+    this.bmProjectId = this.$route.query.setid
+    console.log(this.bmProjectId)
     this.getList();
+    this.getListtwo();
+    this.getListther();
     this.getDicts("sys_yes_no").then(response => {
       this.typeOptions = response.data;
     });
+   console.log( this.queryParams)
   },
   methods: {
+    submitUpload() {
+      this.$refs.upload.submit();
+    },
+    handleRemove(file) {
+           console.log(file,87);
+    },
+    handlePictureCardPreview(file) {
+           this.dialogImageUrl = file.url;
+           this.dialogVisible = true;
+    },
+    handleDownload(file) {
+           console.log(file);
+    },
+     beforeAvatarUpload(file) {
+       console.log(file.type)
+            const isJPG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg';
+            const isPNG = file.type === 'image/png';
+            const isLt2M = file.size / 1024 / 1024 < 2;
+
+            if (!isJPG) {
+              this.$message.error('图片只能是 JPG 格式! 或者 PNG 格式!');
+            }
+            // if(!isPNG){
+            //   this.$message.error('图片只能是 JPG 格式! 或者 PNG 格式!');
+            // }
+            if (!isLt2M) {
+              this.$message.error('图片大小不能超过 2MB!');
+            }
+            return isJPG && isLt2M;
+    },
     /** 查询参数列表 */
     getList() {
       this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listConfigtwo(this.bmProjectId).then(response => {
+        console.log(response)
+          this.queryParams = response.data;
+          // this.fileList =  this.queryParams.attachment
+          // this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    //企业列表
+    getListtwo() {
+      this.loading = true;
+      listConfigthert().then(response => {
+        console.log(response)
           this.configList = response.rows;
-          this.total = response.total;
+          // this.fileList =  this.queryParams.attachment
+          // this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    //自然人列表
+    getListther() {
+      this.loading = true;
+      listConfigfour(this.bmProjectId).then(response => {
+        console.log(response)
+          this.configListtwoL = response.rows;
+          // this.fileList =  this.queryParams.attachment
+          // this.total = response.total;
           this.loading = false;
         }
       );
@@ -502,17 +630,29 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.opentwo = false
       this.reset();
     },
     // 表单重置
     reset() {
       this.form = {
-        configId: undefined,
-        configName: undefined,
-        configKey: undefined,
-        configValue: undefined,
-        configType: "Y",
-        remark: undefined
+        // configId: undefined,
+        // configName: undefined,
+        // configKey: undefined,
+        // configValue: undefined,
+        // configType: "Y",
+        // remark: undefined
+      };
+      this.resetForm("form");
+    },
+    resettwo() {
+      this.formtwo = {
+        // configId: undefined,
+        // configName: undefined,
+        // configKey: undefined,
+        // configValue: undefined,
+        // configType: "Y",
+        // remark: undefined
       };
       this.resetForm("form");
     },
@@ -531,7 +671,18 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.opentwo =  true
       this.title = "添加参数";
+      this.titletwo = "添加参数";
+
+    },
+    handleAddtwo() {
+      this.resettwo();
+      // this.open = true;
+      this.opentwo =  true
+      // this.title = "添加参数";
+      this.titletwo = "添加参数";
+
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -542,28 +693,67 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const configId = row.configId || this.ids
-      getConfig(configId).then(response => {
+      const id = row.id
+      getConfig(id).then(response => {
+        console.log(345)
         this.form = response.data;
         this.open = true;
+        // this.opentwo = true
         this.title = "修改参数";
+        // this.titletwo = "修改参数";
+
+      });
+    },
+    handleUpdatetwo(row) {
+      this.reset();
+      const id = row.id
+      getConfigKeytwo(id).then(response => {
+        console.log(345)
+        this.formtwo = response.data;
+        // this.open = true;
+        this.opentwo = true
+        // this.title = "修改参数";
+        this.titletwo = "修改参数";
+
       });
     },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.configId != undefined) {
+          if (this.form.id != undefined) {
             updateConfig(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              this.getListtwo();
             });
           } else {
+            this.form.bmProjectId = this.bmProjectId
             addConfig(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              this.getListtwo();
+            });
+          }
+        }
+      });
+    },
+    /** 提交按钮 */
+    submitFormtwo: function() {
+      this.$refs["formtwo"].validate(valid => {
+        if (valid) {
+          if (this.formtwo.id != undefined) {
+            updateConfigtwo(this.formtwo).then(response => {
+              this.msgSuccess("修改成功");
+              this.opentwo = false;
+              this.getListther();
+            });
+          } else {
+            this.formtwo.bmProjectId = this.bmProjectId
+            addConfigtwo(this.formtwo).then(response => {
+              this.msgSuccess("新增成功");
+              this.opentwo = false;
+              this.getListther();
             });
           }
         }
@@ -571,15 +761,28 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const configIds = row.configId || this.ids;
-      this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
+      const configIds = row.id ;
+      this.$confirm('是否确认删除"' + row.companyName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
           return delConfig(configIds);
         }).then(() => {
-          this.getList();
+          this.getListtwo();
+          this.msgSuccess("删除成功");
+        })
+    },
+    handleDeletetwo(row) {
+      const configIds = row.id ;
+      this.$confirm('是否确认删除"' + row.name + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delConfigtwo(configIds);
+        }).then(() => {
+          this.getListther();
           this.msgSuccess("删除成功");
         })
     },
@@ -603,10 +806,10 @@ export default {
       });
     },
     //tab
-    tabClid(index){
-    this.tab = index
-    // this.$router.push('/tab');
-    }
+   changeTab(index){
+     this.$emit('changeTab', index)
+   // this.tab = index
+   }
   }
 };
 </script>
@@ -667,6 +870,20 @@ export default {
        top: 50%;
        transform: translateY(-50%);
      }
+     .burert{
+       .el-upload--picture-card{
+         height: 78px;
+         line-height: 78px;
+         width: 80px;
+         vertical-align:center;
+         border: 0 !important;
+         background-color: #fff;
+       }
+       .el-upload-list--picture-card .el-upload-list__item{
+         height: 78px !important;
+         width: 78px !important;
+       }
+     }
     }
   }
   .lage_div{