yrik há 4 anos atrás
pai
commit
661af97042

+ 77 - 0
ruoyi-ui/src/api/system/config.js

@@ -53,6 +53,37 @@ export function listConfigsix(query) {
     // params:
   })
 }
+export function listConfigserve(query) {
+  return request({
+    url: '/constructionEq/constructionEq/list',
+    method: 'get'
+    // params:
+  })
+}
+
+export function listConfigfunding(query) {
+  return request({
+    url: '/constructionPay/pay/list',
+    method: 'get'
+    // params:
+  })
+}
+
+export function listConfigarrival(data) {
+  return request({
+    url: '/constructionPay/pay/payForMoneyALL',
+    method: 'post',
+    data: data
+  })
+}
+
+export function listConfigintegration(data) {
+  return request({
+    url: '/constructionPayInfo/payInfo/' + data,
+    method: 'get'
+    // data: data
+  })
+}
 
 // 查询参数详细
 export function getConfig(configId) {
@@ -92,6 +123,34 @@ export function addConfigtwo(data) {
     data: data
   })
 }
+export function addConfigther(data) {
+  return request({
+    url: '/constructionRate/rate',
+    method: 'post',
+    data: data
+  })
+}
+export function addConfigtherction(data) {
+  return request({
+    url: '/projectConstruction/construction',
+    method: 'post',
+    data: data
+  })
+}
+export function addConfigfour(data) {
+  return request({
+    url: '/constructionEq/constructionEq',
+    method: 'post',
+    data: data
+  })
+}
+export function addConfigfiv(data) {
+  return request({
+    url: '/constructionPay/pay',
+    method: 'post',
+    data: data
+  })
+}
 
 // 修改参数配置
 export function updateConfig(data) {
@@ -122,6 +181,24 @@ export function delConfigtwo(configId) {
     method: 'delete'
   })
 }
+export function delConfigther(configId) {
+  return request({
+    url: '/constructionRate/rate/' + configId,
+    method: 'delete'
+  })
+}
+export function delConfigfour(configId) {
+  return request({
+    url: '/constructionEq/constructionEq/' + configId,
+    method: 'delete'
+  })
+}
+export function delConfigfive(configId) {
+  return request({
+    url: '/constructionPay/pay/' + configId,
+    method: 'delete'
+  })
+}
 // 清理参数缓存
 export function clearCache() {
   return request({

+ 598 - 159
ruoyi-ui/src/views/management/nstruction/index.vue

@@ -1,7 +1,22 @@
 <template>
-
   <div class="app-conta">
-
+ <el-row :gutter="10" class="mb8 roiyy">
+    <el-col :span="1.5">
+      <el-button
+        type="primary"
+        @click="submitCtion"
+        v-hasPermi="['system:config:add']"
+      >提交</el-button>
+    </el-col>
+    <el-col :span="1.5">
+      <el-button
+        type="primary"
+        @click="handleUpdate"
+        v-hasPermi="['system:config:edit']"
+      >暂存</el-button>
+    </el-col>
+    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+  </el-row>
 
   <div class="nauer">
 
@@ -15,14 +30,14 @@
               <span>*</span>
               <span>合同约定开工时间:</span>
             </p>
-            <p>23</p>
+            <p>{{queryParams.orderBeginTime}}</p>
           </div>
           <div class="nstruction_navne">
             <p>
               <span>*</span>
               <span> 合同约定竣工时间:</span>
             </p>
-            <p></p>
+            <p>{{queryParams.orderEndTime}}</p>
           </div>
 
        </div>
@@ -32,7 +47,7 @@
        <!-- 内容 -->
        <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">
+          <el-form-item label="施工许可证:" prop="constructionCode" class="maget_ty">
               <div class="forieu" style="width: 618px;">
                <div class="bure burert">
                  <el-upload
@@ -43,8 +58,9 @@
                    list-type="picture-card"
                    :on-preview="handlePictureCardPreview"
                    :on-remove="handleRemove"
+                   :on-success="handleSuccpermit"
                    :multiple="true"
-                   :file-list="fileList">
+                   :file-list="fileListther">
                       <!-- <i slot="default" class="el-icon-plus"></i> -->
 
                    <div class="ijeut">
@@ -79,59 +95,67 @@
                    <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"
+                        :on-success="handleSuccontract"
+                        :file-list="fileListfour">
                            <!-- <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" class="maget_ty">
+                     <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"
+                          :on-success="handleSucc"
+                          :multiple="true"
+                          :file-list="fileListfive">
+                             <!-- <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>
-          <p class="kaieu">开工照片:</p>
-          <p class="kaieu_tw" @click="handleAdd"><i class="el-icon-circle-plus-outline"></i> 添加企业</p>
+          <p class="kaieu_tw" @click="handleAdd(0)"><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="createTime" />
             <el-table-column label="进度" align="center" prop="rateTypeName" :show-overflow-tooltip="true" />
-            <el-table-column label="照片" align="photo" >
+            <el-table-column label="照片" align="center"  prop="photo">
               <!-- class-name="small-padding fixed-width" -->
-              <template slot-scope="scope">
+              <template slot-scope="scope"   >
                 <el-upload
                   class="upload-demo"
                   action="http://192.168.101.11:8080/common/upload"
@@ -141,7 +165,7 @@
                   multiple
                   :limit="3"
                   :on-exceed="handleExceedtwo"
-                  :file-list="fileList">
+                  :file-list="scope.row.photo">
                   <el-button size="small" type="primary">点击上传</el-button>
                   <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
                 </el-upload>
@@ -159,25 +183,39 @@
               </template>
             </el-table-column>
           </el-table>
+          <pagination
+            v-if="total>0 && tab==0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getListtoi"
+          />
 
        </div>
 
        <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" >
+            <p class="kaieu_tw" @click="quipment(1)"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
+          <el-table v-loading="loading" :data="configListher" >
             <!-- <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="createTime" />
+            <el-table-column label="进度" align="center" prop="eqTypeName" :show-overflow-tooltip="true" />
             <el-table-column label="照片" align="center" >
               <!-- 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>
-              </template>
+             <template slot-scope="scope"   >
+               <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="scope.row.photo">
+                 <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" >
               <!-- class-name="small-padding fixed-width" -->
@@ -185,32 +223,46 @@
                 <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>
+          <pagination
+            v-if="total>0 && tab==1"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getListther"
+          />
 
        </div>
 
      <div class="funding" v-if="tab == 2">
-        <p class="kaieu">到资金额合计:  万元</p>
-          <p class="kaieu_tw" @click="handleAdd"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
-        <el-table v-loading="loading" :data="configList" >
+        <p class="kaieu">到资金额合计: {{queryParamstwo}}  万元</p>
+        <p class="kaieu_tw" @click="handleAdd(2)"><i class="el-icon-circle-plus-outline"></i> 添加设备安装信息</p>
+        <el-table v-loading="loading" :data="configLisfour" >
           <!-- <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="payForTypeName" :show-overflow-tooltip="true" />
+          <el-table-column label="金额" align="center" prop="payForMoney" />
+          <el-table-column label="到资证明" align="center" prop="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>
-            </template>
+           <template slot-scope="scope"   >
+             <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="scope.row.photo">
+               <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" >
             <!-- class-name="small-padding fixed-width" -->
@@ -218,65 +270,51 @@
               <el-button
                 size="mini"
                 type="danger"
-                @click="handleDelete(scope.row)"
+                @click="handleDeletether(scope.row)"
                 v-hasPermi="['system:config:remove']"
               >删除</el-button>
             </template>
           </el-table-column>
         </el-table>
+        <pagination
+          v-if="total>0 && tab==2"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getListfour"
+        />
 
      </div>
      </div>
      <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 :model="queryParamstheyr" 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>
+                <el-date-picker type="date" placeholder="选择日期" v-model="queryParamstheyr.statisticsDate" style="width: 335px"></el-date-picker>
             </el-form-item>
              <el-form-item label="施工许可证:" prop="configType" class="maget_ty maget_tyty">
                  <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"
+                     :on-success="handleSucc"
+                     :multiple="true"
+                     :file-list="fileListthertwo">
                         <!-- <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>
@@ -295,14 +333,93 @@
     <!-- 添加或修改参数配置对话框 -->
     <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="configName">
+          <el-date-picker type="date" placeholder="选择日期" v-model="form.createTime" style="width: 335px"></el-date-picker>
+        </el-form-item> -->
+        <el-form-item label="进度" prop="configKey">
+          <el-select v-model="form.rateType" placeholder="系统内置" clearable size="small" style="width: 458px">
+            <el-option
+              v-for="dict in typeOptionstwo"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="图片" prop="configValue">
+         <el-upload class="upload-demo" ref="upload" action="http://192.168.101.11:8080/common/upload"
+           :on-preview="handlePreviewther" :on-remove="handleRemovether" :on-success="handleSuccther" :file-list="fileListtherrt" :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="submitUploadther">上传到服务器</el-button>
+           <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+         </el-upload>
         </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <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="formtwo" :rules="rulestwo" label-width="150px">
+        <!-- <el-form-item label="时间" prop="configName">
+          <el-date-picker type="date" placeholder="选择日期" v-model="form.createTime" style="width: 335px"></el-date-picker>
+        </el-form-item> -->
         <el-form-item label="进度" prop="configKey">
-          <el-input v-model="form.configKey" placeholder="请输入参数键名" />
+          <el-select v-model="formtwo.eqType" placeholder="系统内置" clearable size="small" style="width: 458px">
+            <el-option
+              v-for="dict in typeOptionsther"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="图片" prop="configValue">
-          <el-input v-model="form.configValue" placeholder="请输入参数键值" />
+         <el-upload class="upload-demo" ref="upload" action="http://192.168.101.11:8080/common/upload"
+           :on-preview="handlePreviewther" :on-remove="handleRemovether" :on-success="handleSuccther" :file-list="fileListtherrt" :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="submitUploadther">上传到服务器</el-button>
+           <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+         </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 项目到资 -->
+  <el-dialog :title="titlether" :visible.sync="openther" width="800px" append-to-body>
+      <el-form ref="formther" :model="formther" :rules="rulesther" label-width="150px">
+        <el-form-item label="到资类型" prop="payForType">
+          <el-select v-model="formther.payForType" placeholder="系统内置" clearable size="small" style="width: 458px">
+            <el-option
+              v-for="dict in typeOptionsfour"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="到资金额" prop="payForMoney">
+          <el-input
+            v-model="formther.payForMoney"
+            placeholder="输入数字"
+            clearable
+            size="small"
+            style="width: 458px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="图片" prop="photo">
+         <el-upload class="upload-demo" ref="upload" action="http://192.168.101.11:8080/common/upload"
+           :on-preview="handlePreviewther" :on-remove="handleRemovether" :on-success="handleSuccther" :file-list="fileListtherrt" :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="submitUploadther">上传到服务器</el-button>
+           <div slot="tip" class="el-upload__tip">只能上传jpg/png文件,且不超过500kb</div>
+         </el-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -314,7 +431,7 @@
 </template>
 
 <script>
-import { listConfig, listConfigfive, listConfigsix, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
+import { listConfig, listConfigfive, listConfigsix, listConfigserve, listConfigfunding, listConfigarrival, listConfigintegration, getConfig, delConfig, delConfigther, delConfigfour, delConfigfive, addConfig, addConfigther, addConfigfour, addConfigfiv, addConfigtherction,  updateConfig, exportConfig, clearCache } from "@/api/system/config";
 export default {
   name: "Config",
   data() {
@@ -335,12 +452,24 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      open:false,
+      opentwo:false,
+      openther:false,
       // 参数表格数据
       configList: [],
       configListwo:[],
-      fileList:[],
+      configListher:[],
+      configLisfour:[],
+      fileListtherrt:[],//弹框里的
+      fileListfour:[],
+      fileListfive:[],
+      fileListthertwo:[],
+      fileList:[{name:'',url:''}],
+      fileListther:[],
       // 弹出层标题
       title: "",
+      titletwo: "",
+      titlether:'',
       dialogImageUrl: '',
       dialogVisible: false,
       disabled: false,
@@ -352,30 +481,61 @@ export default {
         configKey: undefined,
         configType: undefined
       },
+      queryParamstwo:0,
+      queryParamstheyr:{},
+      queryParamstwr:{},
       // 表单参数
       form: {},
+      formtwo:{},
+      formther:{},
       bmProjectId:0,
+      bmjdeu:{
+        'bmProjectId':0
+      },
+      imagese:[],
+      numhu:0,//判断
       // 表单校验
       rules: {
-        configName: [
-          { required: true, message: "参数名称不能为空", trigger: "blur" }
-        ],
-        configKey: [
-          { required: true, message: "参数键名不能为空", trigger: "blur" }
-        ],
-        configValue: [
-          { required: true, message: "参数键值不能为空", trigger: "blur" }
-        ]
-      }
+        // configName: [
+        //   { required: true, message: "参数名称不能为空", trigger: "blur" }
+        // ],
+        // configKey: [
+        //   { required: true, message: "参数键名不能为空", trigger: "blur" }
+        // ],
+        // configValue: [
+        //   { required: true, message: "参数键值不能为空", trigger: "blur" }
+        // ]
+      },
+      rulestwo:{},
+      rulesther:{},
+      //开工照片
+      onstruction:[],
+      permit:[],
+      ontract:[]
     };
   },
   created() {
     this.bmProjectId = this.$route.query.setid
+    this.bmjdeu.bmProjectId = this.$route.query.setid
+    console.log(this.bmjdeu)
     this.getList();
     this.getListtoi()
+    this.getListther()
+    this.getListfour()
+    this.getListfive()
+    this.getListsix()
     this.getDicts("sys_yes_no").then(response => {
     this.typeOptions = response.data;
     });
+    this.getDicts("project_rate").then(response => {
+    this.typeOptionstwo = response.data;
+    });
+    this.getDicts("project_schedule").then(response => {
+    this.typeOptionsther = response.data;
+    });
+    this.getDicts("project_pay").then(response => {
+    this.typeOptionsfour = response.data;
+    });
   },
   methods: {
     submitUpload() {
@@ -384,30 +544,81 @@ export default {
     handleRemove(file) {
            console.log(file);
          },
-         handlePictureCardPreview(file) {
+    handleSucc(response, file, fileList){
+      console.log(file.response.url)
+      this.onstruction.push(file.response.url)
+      this.queryParams.constructionPhoto = this.onstruction.join(',')
+
+    },
+    //施工许可证照片
+    handleSuccpermit(response, file, fileList){
+     console.log(file.response.url)
+     this.permit.push(file.response.url)
+     this.queryParams.constructionCode = this.permit.join(',')
+    },
+    //施工合同
+    handleSuccontract(response, file, fileList){
+     this.ontract.push(file.response.url)
+     this.queryParams.constructionDoc = this.ontract.join(',')
+    },
+    handlePictureCardPreview(file) {
            this.dialogImageUrl = file.url;
            this.dialogVisible = true;
-         },
-         handleDownload(file) {
+    },
+    handleDownload(file) {
            console.log(file);
-         },
-         handleRemovetwo(file, fileList) {
+    },
+    handleRemovetwo(file, fileList) {
                  console.log(file, fileList);
-               },
-               handlePreviewtwo(file) {
+    },
+    handlePreviewtwo(file) {
                  console.log(file);
-               },
-               handleExceedtwo(files, fileList) {
+    },
+    handleExceedtwo(files, fileList) {
                  this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
-               },
-               beforeRemovetwo(file, fileList) {
+    },
+    beforeRemovetwo(file, fileList) {
                  return this.$confirm(`确定移除 ${ file.name }?`);
-               },
+    },
+    submitUploadther() {
+
+      this.$refs.upload.submit();
+    },
+    handleRemovether(file, fileList) {
+      // console.log(file, fileList);
+
+    },
+    handlePreviewther(file) {
+      console.log(file,45);
+    },
+    handleSuccther(response, file, fileList){
+      // let imges = []
+
+      this.imagese.push(file.response.url)
+      console.log(this.imagese.join(','), 345)
+      if(this.numhu == 0){
+        this.form.photo = this.imagese.join(',')
+      }else if(this.numhu ==1 ){
+        this.formtwo.photo = this.imagese.join(',')
+      }else if(this.numhu ==2){
+        this.formther.photo = this.imagese.join(',')
+      }
+
+      console.log(this.form.photo)
+      if(file.response.code == 200){
+        this.msgSuccess("上传成功");
+      }
+
+      console.log(response.url, file, fileList);
+    },
     /** 查询参数列表 */
     getList() {
       this.loading = true;
       listConfigfive(this.bmProjectId).then(response => {
-          this.queryParamstwr = response.data;
+          this.queryParams = response.data;
+          this.fileListther.push({name:this.queryParams.constructionCode,url:this.queryParams.constructionCode})
+          this.fileListfour.push({name:this.queryParams.constructionDoc,url:this.queryParams.constructionDoc})
+          this.fileListfive.push({name:this.queryParams.constructionPhoto,url:this.queryParams.constructionPhoto})
           this.total = response.total;
           this.loading = false;
         }
@@ -418,11 +629,89 @@ export default {
       this.loading = true;
       listConfigsix().then(response => {
           this.configList = response.rows;
+          this.configList.filter(route => {
+              if(route.photo !== null){
+                let poku = []
+                 poku = route.photo.split(",")
+                console.log(poku,98)
+                console.log( route.photo)
+                route.photo = []
+                for(var i = 0; i < poku.length; i++){
+                  route.photo.push({name:poku[i],ulr:poku[i]})
+                }
+              }
+
+               })
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    //设备安装接口
+    getListther() {
+      this.loading = true;
+      listConfigserve().then(response => {
+          this.configListher = response.rows;
+          this.configListher.filter(route => {
+              if(route.photo !== null){
+                let poku = []
+                 poku = route.photo.split(",")
+                console.log(poku,98)
+                console.log( route.photo)
+                route.photo = []
+                for(var i = 0; i < poku.length; i++){
+                  route.photo.push({name:poku[i],ulr:poku[i]})
+                }
+              }
+
+               })
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    //项目到资列表接口
+    getListfour() {
+      this.loading = true;
+      listConfigfunding().then(response => {
+          this.configLisfour = response.rows;
+          this.configLisfour.filter(route => {
+              if(route.photo !== null){
+                let poku = []
+                 poku = route.photo.split(",")
+                console.log(poku,98)
+                console.log( route.photo)
+                route.photo = []
+                for(var i = 0; i < poku.length; i++){
+                  route.photo.push({name:poku[i],ulr:poku[i]})
+                }
+              }
+
+               })
           this.total = response.total;
           this.loading = false;
         }
       );
     },
+    //项目到资查看接口
+    getListfive() {
+      this.loading = true;
+      listConfigarrival(this.bmjdeu).then(response => {
+         this.queryParamstheyr = response.data
+          this.loading = false;
+        }
+      );
+    },
+    //项目入统查看接口
+    getListsix() {
+      this.loading = true;
+      listConfigintegration(this.bmProjectId).then(response => {
+         this.queryParamstwo = response.data
+         this.fileListthertwo.push({name:this.queryParamstwo.statisticsPhoto,url:this.queryParamstwo.statisticsPhoto})
+          this.loading = false;
+        }
+      );
+    },
     // 参数系统内置字典翻译
     typeFormat(row, column) {
       return this.selectDictLabel(this.typeOptions, row.configType);
@@ -430,6 +719,8 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.opentwo = false
+      this.openther = false
       this.reset();
     },
     // 表单重置
@@ -444,6 +735,17 @@ export default {
       };
       this.resetForm("form");
     },
+    resettwo() {
+      this.form = {
+        // configId: undefined,
+        // configName: undefined,
+        // configKey: undefined,
+        // configValue: undefined,
+        // configType: "Y",
+        // remark: undefined
+      };
+      this.resetForm("formtwo");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -456,9 +758,15 @@ export default {
       this.handleQuery();
     },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(index) {
+      this.numhu = index
       this.reset();
-      this.open = true;
+      if(this.numhu==0){
+        this.open = true;
+      }else if(this.numhu == 2){
+        this.openther = true
+      }
+
       this.title = "添加参数";
     },
     // 多选框选中数据
@@ -479,35 +787,150 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.configId != undefined) {
-            updateConfig(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addConfig(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+      this.form.bmProjectId = this.bmProjectId
+      this.formtwo.bmProjectId = this.bmProjectId
+      this.formther.bmProjectId = this.bmProjectId
+      console.log(this.numhu)
+      if(this.numhu == 0){
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            // if (this.form.bmProjectId != undefined) {
+            //   updateConfig(this.form).then(response => {
+            //     this.msgSuccess("修改成功");
+            //     this.open = false;
+            //     this.getList();
+            //   });
+            // } else {
+              addConfigther(this.form).then(response => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getListtoi();
+              });
+            // }
           }
-        }
-      });
+        });
+      }else if(this.numhu == 1){
+        this.$refs["formtwo"].validate(valid => {
+          if (valid) {
+            // if (this.formtwo.bmProjectId != undefined) {
+            //   updateConfig(this.form).then(response => {
+            //     this.msgSuccess("修改成功");
+            //     this.open = false;
+            //     this.getList();
+            //   });
+            // } else {
+              addConfigfour(this.formtwo).then(response => {
+                this.msgSuccess("新增成功");
+                this.opentwo = false;
+                this.getListther();
+              });
+            // }
+          }
+        });
+      }else if(this.numhu == 2){
+        console.log("步骤3")
+          this.$refs["formther"].validate(valid => {
+            if (valid) {
+              console.log('步骤5')
+              // if (this.formther.bmProjectId != undefined) {
+              //   updateConfig(this.form).then(response => {
+              //     this.msgSuccess("修改成功");
+              //     this.open = false;
+              //     this.getList();
+              //   });
+              // } else {
+                console.log('步骤4')
+                addConfigfiv(this.formther).then(response => {
+                  this.msgSuccess("新增成功");
+                  this.openther = false;
+                  this.getListfour();
+                });
+              // }
+            }
+          });
+      }
+
+    },
+    //项目施工提交按钮
+    submitCtion(){
+       this.queryParamstwr.bmProjectId = this.bmProjectId
+       // this.formtwo.bmProjectId = this.bmProjectId
+       // this.formther.bmProjectId = this.bmProjectId
+       console.log(this.numhu)
+       if(this.numhu == 0){
+         this.$refs["queryForm"].validate(valid => {
+           if (valid) {
+               addConfigtherction(this.queryParamstwr).then(response => {
+                 this.msgSuccess("新增成功");
+                 this.open = false;
+                 this.getListtoi();
+               });
+           }
+         });
+       }else if(this.numhu == 1){
+         this.$refs["formtwo"].validate(valid => {
+           if (valid) {
+               addConfigfour(this.formtwo).then(response => {
+                 this.msgSuccess("新增成功");
+                 this.opentwo = false;
+                 this.getListther();
+               });
+           }
+         });
+       }else if(this.numhu == 2){
+         console.log("步骤3")
+           this.$refs["formther"].validate(valid => {
+             if (valid) {
+               console.log('步骤5')
+                 console.log('步骤4')
+                 addConfigfiv(this.formther).then(response => {
+                   this.msgSuccess("新增成功");
+                   this.openther = false;
+                   this.getListfour();
+                 });
+             }
+           });
+       }
     },
-    /** 删除按钮操作 */
+    /** 开工照片删除按钮操作 */
     handleDelete(row) {
-      const configIds = row.configId || this.ids;
+      const configIds = row.id ;
+      this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delConfigther(configIds);
+        }).then(() => {
+          this.getListtoi();
+          this.msgSuccess("删除成功");
+        })
+    },
+    //设备安装删除
+    handleDeletetwo(row) {
+      const configIds = row.id ;
+      this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delConfigfour(configIds);
+        }).then(() => {
+          this.getListther();
+          this.msgSuccess("删除成功");
+        })
+    },
+    //项目到资删除
+    handleDeletether(row) {
+      const configIds = row.id ;
       this.$confirm('是否确认删除参数编号为"' + configIds + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return delConfig(configIds);
+          return delConfigfive(configIds);
         }).then(() => {
-          this.getList();
+          this.getListfour();
           this.msgSuccess("删除成功");
         })
     },
@@ -534,11 +957,27 @@ export default {
     tabClid(index){
     this.tab = index
     // this.$router.push('/tab');
+    },
+    quipment(index){
+      this.resettwo();
+      this.numhu = index
+      this.opentwo = true;
+      this.titletwo = "添加参数";
     }
   }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss">
+  .roiyy{
+    position: fixed;
+    top:180px;
+    left:0;
+    width: 100%;
+    padding-left: 230px;
+    padding-right: 30px;
+    box-sizing: border-box;
+    z-index: 44;
+  }
   .buiy{
     // width: 75px !important;
     // height: 30px !important;

+ 2 - 18
ruoyi-ui/src/views/management/row/index.vue

@@ -4,23 +4,7 @@
     <div class="header">
       项目详情 >
     </div>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          @click="handleAdd"
-          v-hasPermi="['system:config:add']"
-        >提交</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          @click="handleUpdate"
-          v-hasPermi="['system:config:edit']"
-        >暂存</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+
 
   <div class="naue">
     <!-- //步骤条 -->
@@ -408,7 +392,7 @@ export default {
     background-color: #F1F1F1;
     font-size: 18px;
     color: #343434;
-    margin-bottom: 40px;
+    margin-bottom: 90px;
   }
   .naue{
     border: 1px solid #DADADA;

+ 1 - 1
ruoyi-ui/src/views/system/config/index.vue

@@ -358,4 +358,4 @@ export default {
     }
   }
 };
-</script>
+</script>

+ 17 - 0
ruoyi-ui/src/views/under/index.vue

@@ -1,6 +1,23 @@
 <template>
 
   <div class="app-cont">
+    <!-- <el-row :gutter="10" class="mb8">
+       <el-col :span="1.5">
+         <el-button
+           type="primary"
+           @click="handleAdd"
+           v-hasPermi="['system:config:add']"
+         >提交</el-button>
+       </el-col>
+       <el-col :span="1.5">
+         <el-button
+           type="primary"
+           @click="handleUpdate"
+           v-hasPermi="['system:config:edit']"
+         >暂存</el-button>
+       </el-col>
+       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+     </el-row> -->
   <!-- <div class="naue"> -->
     <!-- 内容的显示隐藏 -->
 <div class="mation" >