数据中心

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

@@ -102,20 +102,20 @@
     <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">
+      <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="parkLongitude"/>
-      <el-table-column label="开发区中心点纬度" align="center" prop="parkLatitude"/>
-      <el-table-column label="项目名称" align="center" prop="projectName" width="150"/>
-      <el-table-column label="项目环境" align="center" prop="environment">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.centerdata_environment" :value="scope.row.environment"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="法人单位" align="center" prop="legalUnit"/>
+<!--      <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="environment">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.centerdata_environment" :value="scope.row.environment"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="法人单位" align="center" prop="legalUnit"/>-->
 <!--      <el-table-column label="工程目标" align="center" prop="projectTarget"/>-->
 <!--      <el-table-column label="工程属地" align="center" prop="projectLevel">-->
 <!--        <template slot-scope="scope">-->
@@ -128,59 +128,52 @@
       <el-table-column label="开复工时间" align="center" prop="startTime"/>
       <el-table-column label="计划竣工时间" align="center" prop="endTime"/>
 <!--      <el-table-column label="联系电话" align="center" prop="phone"/>-->
-      <el-table-column label="建设地点" align="center" prop="constructionSite"/>
-      <el-table-column label="在建性质" align="center" prop="nature">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.centerdata_zj_nature" :value="scope.row.nature"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="建设地点" align="center" prop="constructionSite"/>-->
+<!--      <el-table-column label="在建性质" align="center" prop="nature">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.centerdata_zj_nature" :value="scope.row.nature"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="总投资（万元）" align="center" prop="totalInvest" width="120"/>
       <el-table-column label="年度计划投资（万元）" align="center" prop="yearInvest" width="100"/>
-      <el-table-column label="产业类别" align="center" prop="industryType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.centerdata_industry_type" :value="scope.row.industryType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目秘书" align="center" prop="secretary"/>
-      <el-table-column label="项目秘书职务" align="center" prop="secretaryDuties"/>
-      <el-table-column label="项目秘书手机" align="center" prop="secretaryPhone"/>
+<!--      <el-table-column label="产业类别" align="center" prop="industryType">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.centerdata_industry_type" :value="scope.row.industryType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="项目秘书" align="center" prop="secretary"/>-->
+<!--      <el-table-column label="项目秘书职务" align="center" prop="secretaryDuties"/>-->
+<!--      <el-table-column label="项目秘书手机" align="center" prop="secretaryPhone"/>-->
 <!--      <el-table-column label="建筑面积" align="center" prop="constructionArea"/>
       <el-table-column label="所属分类" align="center" prop="cameraSystem">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.camera_system" :value="scope.row.cameraSystem"/>
         </template>
       </el-table-column>-->
-      <el-table-column label="所属部门" align="center" prop="deptName"/>
-      <el-table-column label="创建人" align="center" prop="createName"/>
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
-      <el-table-column label="修改人" align="center" prop="updateName"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"/>
+      <el-table-column label="所属部门" align="center" prop="deptName" />
+      <el-table-column label="创建人" align="center" prop="createName" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateName" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime" :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="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['forest:keyProjects:edit']"
-          >修改
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['forest:keyProjects:remove']"
-          >删除
-          </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="getScheduleHistory(scope.row)"
-            v-hasPermi="['forest:keyProjects:edit']"
-          >进度
-          </el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                       v-hasPermi="['system:role:edit']">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="edit" icon="el-icon-edit"
+                                v-hasPermi="['forest:keyProjects:edit']">修改
+              </el-dropdown-item>
+              <el-dropdown-item command="remove" icon="el-icon-delete"
+                                v-hasPermi="['forest:keyProjects:remove']">删除
+              </el-dropdown-item>
+              <el-dropdown-item command="details" icon="el-icon-info"
+                                v-hasPermi="['forest:keyProjects:edit']">详情
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -412,101 +405,120 @@
 
     <el-dialog :title="title" :visible.sync="scheduleHistory" width="900px" class="form-style">
       <!-- 修改内容回显开始 -->
-      <ul class="xg_cont">
-          <li>
-            <h4 class="sjxtitle">项目名称</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">项目环境</h4>
-            <span class="sjx_cont">室外</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">经度</h4>
-            <span class="sjx_cont">124624652</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">纬度</h4>
-            <span class="sjx_cont">256513</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">属地辖区</h4>
-            <span class="sjx_cont">市本级</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">所属开发区</h4>
-            <span class="sjx_cont">吉林四平市新型工业化经济开发区</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">开发区中心点经度</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">开发区中心点纬度</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">开复工时间</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">计划竣工时间</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">建设地点</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">在建性质</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">总投资（万元）</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">年度计划投资（万元）</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">法人单位</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">项目秘书</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">项目秘书职务</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">项目秘书手机</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">所属部门</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">产业类别</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li>
-            <h4 class="sjxtitle">绑定设备</h4>
-            <span class="sjx_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li class="jiansheCont">
-            <h4 class="sjxtitle">建设内容</h4>
-            <span class="sjx_cont js_cont">四平市内涝积水点排查治理工程四平市内涝积水点排查治理工程四平市内涝积水点排查治理工程四平市内涝积水点排查治理工程四平市内涝积水点排查治理工程四平市内涝积水点排查治理工程（一期）</span>
-          </li>
-          <li class="jiansheCont">
-            <h4 class="sjxtitle">附件</h4>
-            <span class="sjx_cont js_cont">四平市内涝积水点排查治理工程（一期）</span>
-          </li>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <ul class="xg_cont">
+            <li>
+              <h4 class="sjxtitle">项目名称</h4>
+              <span class="sjx_cont">{{form.projectName}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">项目环境</h4>
+              <span class="sjx_cont">
+                <dict-tag :options="dict.type.centerdata_environment" :value="form.environment"/>
+              </span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">经度</h4>
+              <span class="sjx_cont">{{form.longitude}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">纬度</h4>
+              <span class="sjx_cont">{{form.latitude}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">属地辖区</h4>
+              <span class="sjx_cont">{{form.territoriality}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">所属开发区</h4>
+              <span class="sjx_cont">
+                <dict-tag :options="dict.type.centerdata_park" :value="form.park"/>
+              </span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">开发区中心点经度</h4>
+              <span class="sjx_cont">{{form.parkLongitude}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">开发区中心点纬度</h4>
+              <span class="sjx_cont">{{form.parkLatitude}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">开复工时间</h4>
+              <span class="sjx_cont">{{form.startTime}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">计划竣工时间</h4>
+              <span class="sjx_cont">{{form.endTime}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">建设地点</h4>
+              <span class="sjx_cont">{{form.constructionSite}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">在建性质</h4>
+              <span class="sjx_cont">
+                <dict-tag :options="dict.type.centerdata_zj_nature" :value="form.nature"/>
+              </span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">总投资（万元）</h4>
+              <span class="sjx_cont">{{form.totalInvest}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">年度计划投资（万元）</h4>
+              <span class="sjx_cont">{{form.yearInvest}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">法人单位</h4>
+              <span class="sjx_cont">{{form.legalUnit}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">项目秘书</h4>
+              <span class="sjx_cont">{{form.secretary}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">项目秘书职务</h4>
+              <span class="sjx_cont">{{form.secretaryDuties}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">项目秘书手机</h4>
+              <span class="sjx_cont">{{form.secretaryPhone}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">所属部门</h4>
+              <span class="sjx_cont">{{form.deptName}}</span>
+            </li>
+            <li>
+              <h4 class="sjxtitle">产业类别</h4>
+              <span class="sjx_cont">
+                <dict-tag :options="dict.type.centerdata_industry_type" :value="form.industryType"/>
+              </span>
+            </li>
+            <li class="jiansheCont">
+              <h4 class="sjxtitle">绑定设备</h4>
+              <span class="sjx_cont" >
+                <span v-for="(list,index) in form.deviceList">
+                  <span v-for="dict in cameraList" v-if="list == dict.id">
+                    {{ dict.cameraName }}<span v-if="index!=form.deviceList.length-1" >,</span>
+                  </span>
+                </span>
+              </span>
+            </li>
+            <li class="jiansheCont">
+              <h4 class="sjxtitle">建设内容</h4>
+              <span class="sjx_cont js_cont">{{form.introduction}}</span>
+            </li>
+            <li class="jiansheCont">
+              <h4 class="sjxtitle">附件</h4>
+              <el-image
+                :src="form.photoId" style="width:150px;height:150px;"
+                :preview-src-list="[form.photoId]">
+              </el-image>
+            </li>
 
-      </ul>
+        </ul>
+      </el-form>
       <!-- 修改内容回显结束 -->
       <el-form ref="historyForm" :inline="true" :model="historyQueryParams" :rules="rules" label-width="80px">
         <el-form-item label="起始时间" prop="startTime">
@@ -528,7 +540,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleHistoryQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleHistoryQuery" :loading="loading1">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetHistoryQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -539,7 +551,6 @@
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.scheduleTime" placement="top">
-
             <div>
               <span>{{ activity.deptName }} -- {{ activity.createName }}</span>
               <el-button
@@ -557,14 +568,14 @@
             </div>
             <div v-if="activity.schedulePictures !== null">
               <template v-for="(imageUrl, imgIndex) in activity.schedulePictures.split(',')">
-                <el-image :src="imageUrl" :key="imgIndex" style="width:8rem; height: 8rem; margin:2px">
+                <el-image :src="imageUrl" :key="imgIndex" style="width:8rem; height: 8rem; margin:2px" :preview-src-list="[imageUrl]">
                 </el-image>
               </template>
             </div>
           </el-timeline-item>
         </el-timeline>
       </div>
-      
+
     </el-dialog>
 
     <ISuperMap ref="ISuperMap" v-if="ISuperMapvisible" @send="send"/>
@@ -588,12 +599,13 @@ import {treeselect} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import ISuperMap from "@/views/data/common/ISuperMap";
+import TreeDept from "../../../../components/treeDept";
 
 
 export default {
   name: "Projects",
   dicts: ['project_type', "camera_system", 'centerdata_project_level','centerdata_zj_nature','centerdata_industry_type','centerdata_environment','centerdata_park'],
-  components: {deptselector, supermap, Treeselect, ISuperMap},
+  components: {TreeDept, deptselector, supermap, Treeselect, ISuperMap},
   data() {
     return {
       sign: 1,
@@ -603,6 +615,7 @@ export default {
       disabled:true,
       // 遮罩层
       loading: true,
+      loading1: false,
       // 选中数组
       ids: [],
       titleLongitude: '经纬度',
@@ -737,6 +750,7 @@ export default {
         ]
       },
       cameraList: [],
+      cameraNameList: [],
     };
   },
   created() {
@@ -747,6 +761,26 @@ export default {
     });
   },
   methods: {
+    handleClick() {
+      alert('button click');
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case 'edit':
+          this.handleUpdate(row)
+          break
+        case 'remove':
+          this.handleDelete(row)
+          break
+        case 'details':
+          this.getScheduleHistory(row)
+          break
+        default:
+          break
+      }
+
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {
@@ -881,11 +915,11 @@ export default {
     },
     /** 历史进度记录搜索按钮操作 */
     handleHistoryQuery() {
-      this.historyQueryParams.keyProjectsId = this.activities[0].keyProjectsId;
-      this.loading = true;
+      this.historyQueryParams.keyProjectsId = this.form.id;
+      this.loading1 = true;
       getHistoryByTime(this.historyQueryParams).then(response => {
         this.activities = response.data;
-        this.loading = false;
+        this.loading1 = false;
       });
     },
     /** 重置按钮操作 */
@@ -934,8 +968,13 @@ export default {
       getProjectsSchedule(this.keyProjectsId).then(response => {
         this.activities = response.data;
         this.scheduleHistory = true;
-        this.title = "历史进度";
+        this.title = "详情";
       })
+      this.reset();
+      const id = row.id || this.ids
+      getProjects(id).then(response => {
+        this.form = response.data;
+      });
     },
     /** 提交按钮 */
     submitForm() {