数据中心

data-ui/src/api/data/generalbusiness/keyProjects/projects.js

@@ -72,3 +72,10 @@ export function deleteSchedule(scheduleId){
     method: 'delete'
   })
 }
+
+export function selectPark(deptType){
+  return request({
+    url: '/sooka-sponest-center-data/projectsSchedule/selectPark/' + deptType,
+    method: 'get'
+  })
+}

data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -22,13 +22,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属开发区" prop="park">
-        <el-select v-model="queryParams.park" placeholder="请选择所属开发区" clearable size="small">
+        <el-select v-model="queryParams.park" placeholder="请选择所属开发区">
           <el-option
-            v-for="dict in dict.type.centerdata_park"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+            v-for="item in deptOptionsPark"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -102,14 +102,10 @@
     <el-table v-loading="loading" :data="projectsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="70" align="center"/>
       <el-table-column label="属地辖区" align="center" prop="territoriality"/>
-      <el-table-column label="所属开发区" align="center" prop="park" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.centerdata_park" :value="scope.row.park"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="所属开发区" align="center" prop="park" :show-overflow-tooltip="true"/>
 <!--      <el-table-column label="开发区中心点经度" align="center" prop="parkLongitude"/>-->
 <!--      <el-table-column label="开发区中心点纬度" align="center" prop="parkLatitude"/>-->
-      <el-table-column label="项目名称" align="center" prop="projectName" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="项目名  称" align="center" prop="projectName" width="150" :show-overflow-tooltip="true"/>
 <!--      <el-table-column label="项目环境" align="center" prop="environment">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.centerdata_environment" :value="scope.row.environment"/>-->
@@ -292,10 +288,10 @@
             <el-form-item label="所属开发区" prop="park">
               <el-select v-model="form.park" placeholder="请选择所属开发区">
                 <el-option
-                  v-for="dict in dict.type.centerdata_park"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+                  v-for="item in deptOptionsPark"
+                  :key="item.deptId"
+                  :label="item.deptName"
+                  :value="item.deptId"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -455,9 +451,7 @@
             </li>
             <li>
               <h4 class="sjxtitle">所属开发区</h4>
-              <span class="sjx_cont">
-                <dict-tag :options="dict.type.centerdata_park" :value="form.park"/>
-              </span>
+              <span class="sjx_cont">{{form.parkName}}</span>
             </li>
           <li>
             <h4 class="sjxtitle">负责人</h4>
@@ -621,7 +615,7 @@ import {
   delProjects,
   getProjects, getProjectsSchedule,
   listProjects,
-  updateProjects, addProjectsScheduleInfo, getHistoryByTime, deleteSchedule
+  updateProjects, addProjectsScheduleInfo, getHistoryByTime, deleteSchedule,selectPark
 } from "@/api/data/generalbusiness/keyProjects/projects";
 import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
 import deptselector from '@/views/components/deptselector.vue'
@@ -644,6 +638,7 @@ export default {
       ISuperMapvisible: false,
       ISuperMapvisibletwo: false,
       deptOptions: undefined,
+      deptOptionsPark: [],
       disabled:true,
       // 遮罩层
       loading: true,
@@ -789,8 +784,8 @@ export default {
     };
   },
   created() {
-    this.getList();
     this.getTreeselect();
+
     selectCenterMonitorlList(this.queryParams).then(response => {
       this.cameraList = response.data;
     });
@@ -821,16 +816,35 @@ export default {
       treeselect().then(response => {
         this.deptOptions = response.data
       })
+      selectPark("sys_dept_type_27").then(response => {
+        let arr = response.data.map(item => {
+          item.deptId = item.deptId  +""
+          return item
+        })
+        this.deptOptionsPark = arr
+
+        this.getList();
+      })
     },
     hx(node) {
       this.form.deptId = node.id
       this.form.deptName = node.label
     },
     /** 查询重点工程列表 */
-    getList() {
+    async getList() {
       this.loading = true;
-      listProjects(this.queryParams).then(response => {
+      await listProjects(this.queryParams).then(response => {
         this.projectsList = response.rows;
+        let projectsList1=[]
+        this.projectsList.forEach(item1=>{
+           this.deptOptionsPark.forEach(item=>{
+             if(item1.park==item.deptId){
+               item1.park=item.deptName
+             }
+           })
+           projectsList1.push(item1)
+        })
+        this.projectsList = projectsList1;
         this.total = response.total;
         this.loading = false;
       });
@@ -983,6 +997,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getProjects(id).then(response => {
+        response.data.park = response.data.park + ""
         this.form = response.data;
         this.open = true;
         this.title = "修改重点工程";
@@ -1000,16 +1015,19 @@ export default {
     getScheduleHistory(row) {
       this.keyProjectsId = row.id || this.ids
       this.keyProjectsName = row.projectName;
-      getProjectsSchedule(this.keyProjectsId).then(response => {
-        this.activities = response.data;
+      getProjects(this.keyProjectsId).then(response => {
+        let obj = {};
+        this.deptOptionsPark.forEach(item =>{
+          if ( item.deptId == response.data.park){
+            obj["parkName"] = item.deptName
+          }
+        })
+
+        this.form = {...response.data, ...obj};
         this.scheduleHistory = true;
         this.title = "详情";
       })
       this.reset();
-      const id = row.id || this.ids
-      getProjects(id).then(response => {
-        this.form = response.data;
-      });
     },
     /** 提交按钮 */
     submitForm() {

src/main/java/com/sooka/sponest/data/generalbusiness/controller/CenterdataTKeyProjectsScheduleController.java

@@ -1,7 +1,11 @@
 package com.sooka.sponest.data.generalbusiness.controller;
 
+import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.system.api.RemoteDeptService;
+import com.ruoyi.system.api.domain.SysDept;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTKeyProjectsSchedule;
 import com.sooka.sponest.data.generalbusiness.service.ICenterdataTKeyProjectsScheduleService;
 import io.swagger.annotations.Api;
@@ -9,12 +13,16 @@ import io.swagger.annotations.ApiImplicitParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/projectsSchedule")
 @Api(tags = "数据中心重点工程进度管理控制器")
 public class CenterdataTKeyProjectsScheduleController extends BaseController {
     @Autowired
     private ICenterdataTKeyProjectsScheduleService projectsScheduleService;
+    @Autowired
+    private RemoteDeptService remoteDeptService;
 
 
     @PostMapping
@@ -37,4 +45,15 @@ public class CenterdataTKeyProjectsScheduleController extends BaseController {
     public AjaxResult deleteScheduleById(@PathVariable String id){
         return toAjax(projectsScheduleService.deleteScheduleById(id));
     }
+
+    /*
+    * 查询所属开发区列表
+    *
+    * @author 韩福成
+    * @date 2023/11/16 9:10
+    */
+    @GetMapping("/selectPark/{deptType}")
+    public R<List<SysDept>> selectPark(@PathVariable String deptType){
+        return remoteDeptService.selectPark(deptType, SecurityConstants.INNER);
+    }
 }