From d91f0dfcd2ef95fb3624d94ade24fe69a9169a58 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 二月 2024 15:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/P2022036_Web2
---
src/views/datamanage/uploadmanage.vue | 1532 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1,209 insertions(+), 323 deletions(-)
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index c3d77b8..0b88751 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -8,230 +8,519 @@
<el-divider />
<!-- tabs鍒囨崲 -->
<div class="tabs_box">
- <div class="tabs_pane"
- @click="setTabsChange(1)">
- <div class="tabsSpan"
- :class="{ changetabs : active == 'first'}">
+ <div
+ class="tabs_pane"
+ @click="setTabsChange(1)"
+ >
+ <div
+ class="tabsSpan"
+ :class="{ changetabs : active == 'first'}"
+ >
<span> {{$t('dataManage.uploadObj.dataRelease')}}</span>
</div>
</div>
- <div class="tabs_pane"
- @click="setTabsChange(2)">
- <div class="tabsSpan"
- :class="{ changetabs : active == 'second'}">
+ <div
+ class="tabs_pane"
+ @click="setTabsChange(2)"
+ >
+ <div
+ class="tabsSpan"
+ :class="{ changetabs : active == 'second'}"
+ >
<span> {{$t('dataManage.uploadObj.releaseList')}}</span>
</div>
</div>
- <div class="tabs_pane"
- @click="setTabsChange(3)">
- <div class="tabsSpan"
- :class="{ changetabs : active == 'third'}">
- <span> {{$t('dataManage.uploadObj.modelAttachMount')}}</span>
+ <div
+ class="tabs_pane"
+ @click="setTabsChange(4)"
+ >
+ <div
+ class="tabsSpan"
+ :class="{ changetabs : active == 'fourth'}"
+ >
+ <span> {{$t('dataManage.uploadObj.publishTask')}}</span>
+ </div>
+ </div>
+ <div
+ class="tabs_pane"
+ @click="setTabsChange(3)"
+ >
+ <div
+ class="tabsSpan"
+ :class="{ changetabs : active == 'third'}"
+ >
+ <span> {{$t('dataManage.uploadObj.attachMount')}}</span>
</div>
</div>
</div>
- <div v-if="active != 'third'"
- class="content_box">
- <el-form :inline="true"
- :model="formInline"
- class="demo-form-inline">
+ <div
+ v-if="active != 'third'"
+ class="content_box"
+ >
+ <el-form
+ :inline="true"
+ :model="formInline"
+ class="demo-form-inline"
+ >
<!-- 鍗曚綅 -->
<el-form-item v-if="active == 'first'">
- <el-select size="small"
- v-model="formInline.depid">
- <el-option :value="formInline.depid"
- :label="formInline.depName"
- style="height: auto">
- <el-tree ref="tree"
- :data="depOption"
- node-key="id"
- :props="defaultProps"
- @node-click="handleDepChange" />
+ <el-select
+ size="small"
+ v-model="formInline.depid"
+ >
+ <el-option
+ :value="formInline.depid"
+ :label="formInline.depName"
+ style="height: auto"
+ >
+ <el-tree
+ ref="tree"
+ :data="depOption"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handleDepChange"
+ />
</el-option>
</el-select>
</el-form-item>
<!-- 鐩綍 -->
<el-form-item v-if="active == 'first'">
- <el-select size="small"
- v-model="formInline.dirid">
- <el-option :value="formInline.dirid"
- :label="formInline.dirName"
- style="height: auto">
- <el-tree ref="tree"
- :data="dirOption"
- node-key="id"
- :props="defaultProps"
- @node-click="handleDirChange" />
+ <el-select
+ size="small"
+ v-model="formInline.dirid"
+ >
+ <el-option
+ :value="formInline.dirid"
+ :label="formInline.dirName"
+ style="height: auto"
+ >
+ <el-tree
+ ref="tree"
+ :data="dirOption"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handleDirChange"
+ />
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鐩綍 -->
+ <el-form-item v-if="active == 'second'">
+ <el-select
+ size="small"
+ v-model="formInline.dirid2"
+ placeholder="璇烽�夋嫨椤圭洰鐩綍..."
+ >
+ <el-option
+ :value="formInline.dirid2"
+ :label="formInline.dirName2"
+ style="height: auto"
+ >
+ <el-tree
+ ref="tree"
+ :data="dirOption2"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handleDirChange2"
+ />
</el-option>
</el-select>
</el-form-item>
<!-- 鐗堟湰 -->
<el-form-item v-if="active == 'first'">
- <el-select size="small"
- v-model="formInline.verid"
- @change="handleVerChange"> <el-option v-for="item in verOption"
- :key="item.id"
- :label="item.name"
- :value="item.id">
+ <el-select
+ size="small"
+ v-model="formInline.verid"
+ @change="handleVerChange"
+ > <el-option
+ v-for="item in verOption"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
<!-- 绫诲瀷 -->
<el-form-item v-if="active == 'first'">
- <el-select size="small"
- v-model="formInline.type"
- @change="handleTypeChange">
- <el-option v-for="item in typeOption"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-select
+ size="small"
+ v-model="formInline.type"
+ @change="handleTypeChange"
+ >
+ <el-option
+ v-for="item in typeOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="active == 'second' || active == 'fourth'">
+ <el-select
+ size="small"
+ v-model="formInline.type1"
+ @change="handleTypeChange1"
+ placeholder="璇烽�夋嫨鏁版嵁绫诲埆..."
+ >
+ <el-option
+ v-for="item in typeOption1"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="active == 'fourth'">
+ <el-select
+ size="small"
+ v-model="formInline.status"
+ @change="handleTypeChange2"
+ placeholder="璇烽�夋嫨鏁版嵁绫诲埆..."
+ >
+ <el-option
+ v-for="item in typeOption2"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-input size="small"
- :title="$t('dataManage.vmobj.keyword')"
- v-model="formInline.name"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuedataName')"> <i @click="getTableData"
- :title="$t('common.iquery')"
- slot="suffix"
- class="el-icon-search"
- style="padding-right: 8px"></i></el-input>
+ <el-input
+ size="small"
+ :title="$t('dataManage.vmobj.keyword')"
+ v-model="formInline.name"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuedataName')"
+ > <i
+ @click="getTableData"
+ :title="$t('common.iquery')"
+ slot="suffix"
+ class="el-icon-search"
+ style="padding-right: 8px"
+ ></i></el-input>
</el-form-item>
<el-form-item style="float:right">
<!-- 鍙戝竷 -->
- <el-button v-if="active == 'first'"
- type="success"
- size="small"
- icon="el-icon-s-promotion"
- @click="setPagePublish">{{$t('common.publish')}}</el-button>
+ <el-button
+ v-if="active == 'first'"
+ type="success"
+ size="small"
+ icon="el-icon-s-promotion"
+ @click="setPagePublish"
+ >{{$t('common.publish')}}</el-button>
<!-- 鍒櫎 -->
- <el-button v-if="active == 'second'"
- type="danger"
- size="small"
- icon="el-icon-delete"
- @click="setPageDelete">{{$t('common.delete')}}</el-button>
+ <el-button
+ v-if="active == 'second'"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ @click="setPageDelete"
+ >{{$t('common.delete')}}</el-button>
<!-- 閲嶇疆 -->
- <el-button type="info"
- size="small"
- @click="setPageStart"
- icon="el-icon-refresh">{{$t('common.reset')}}</el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="setPageStart"
+ icon="el-icon-refresh"
+ >{{$t('common.reset')}}</el-button>
</el-form-item>
</el-form>
<div class="dividing-line"></div>
<div class="table_box content_Table">
- <el-table :data="tableData"
- style="width: 100%"
- @selection-change="handleSelectionChange"
- @cell-dblclick="copyText"
- height="calc(100% - 1px)">
- <el-table-column type="selection"
- width="55" />
- <el-table-column :label="$t('dataManage.dictionaryManageObj.number')"
- type="index"
- width="50"
- align="center">
+ <el-table
+ v-if="active !='fourth'"
+ :data="tableData"
+ style="width: 100%"
+ @selection-change="handleSelectionChange"
+ @cell-dblclick="copyText"
+ height="calc(100% - 1px)"
+ ref="tableBox"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ key="1"
+ />
+ <el-table-column
+ :label="$t('dataManage.dictionaryManageObj.number')"
+ type="index"
+ width="50"
+ align="center"
+ key="2"
+ >
</el-table-column>
- <el-table-column prop="name"
- :label="$t('dataManage.vmobj.name')"
- align="center" />
- <el-table-column prop="type"
- :label="$t('dataManage.vmobj.format')"
- align="center" />
- <el-table-column v-if="active == 'first'"
- prop="sizes"
- :label="$t('dataManage.vmobj.size')"
- :formatter="stateFormatSizes"
- align="center" />
- <el-table-column prop="depName"
- :label="$t('dataManage.vmobj.depName')"
- align="center" />
- <el-table-column prop="dirName"
- :label="$t('dataManage.vmobj.dirName')"
- width="200"
- align="center" />
- <el-table-column prop="verName"
- :label="$t('dataManage.vmobj.versionNumber')"
- align="center" />
- <el-table-column prop="url"
- :label="$t('common.publishAddress')"
- align="center" />
- <el-table-column v-if="active == 'first'"
- prop="uname"
- :label="$t('common.rublisher')"
- align="center"
- :key="Math.random()" />
- <el-table-column v-if="active != 'first'"
- prop="createName"
- :label="$t('common.rublisher')"
- align="center"
- :key="Math.random()" />
- <el-table-column prop="createTime"
- :label="$t('common.releaseTime')"
- align="center" />
+ <el-table-column
+ prop="name"
+ :label="$t('dataManage.vmobj.name')"
+ align="center"
+ key="3"
+ />
+ <el-table-column
+ prop="type"
+ :label="$t('dataManage.vmobj.format')"
+ align="center"
+ key="4"
+ />
+ <el-table-column
+ v-if="active == 'first'"
+ prop="sizes"
+ :label="$t('dataManage.vmobj.size')"
+ :formatter="stateFormatSizes"
+ align="center"
+ key="5"
+ />
+ <el-table-column
+ prop="depName"
+ :label="$t('dataManage.vmobj.depName')"
+ align="center"
+ key="6"
+ />
+ <el-table-column
+ prop="dirName"
+ :label="$t('dataManage.vmobj.dirName')"
+ width="200"
+ align="center"
+ key="7"
+ />
+ <el-table-column
+ v-if="active == 'first'"
+ prop="verName"
+ :label="$t('dataManage.vmobj.versionNumber')"
+ align="center"
+ key="8"
+ />
+ <el-table-column
+ prop="url"
+ :label="$t('common.publishAddress')"
+ align="center"
+ key="9"
+ />
+ <el-table-column
+ v-if="active == 'first'"
+ prop="uname"
+ :label="$t('common.rublisher')"
+ align="center"
+ key="10"
+ />
+ <el-table-column
+ v-if="active != 'first'"
+ prop="createName"
+ :label="$t('common.rublisher')"
+ align="center"
+ key="11"
+ />
+ <el-table-column
+ prop="createTime"
+ :label="$t('common.releaseTime')"
+ align="center"
+ key="12"
+ />
- <el-table-column min-width="150"
- :label="$t('common.operate')">
+ <el-table-column
+ v-if="active == 'first'"
+ prop="createTime"
+ :label="$t('common.publishStatus')"
+ align="center"
+ key="13"
+ >
<template slot-scope="scope">
- <el-button v-if="active == 'second'"
- size="small"
- type="info"
- plain
- @click="setPreviewDetails(scope.row)">{{$t('common.details')}}
+ <span v-if="scope.row.url ">宸插彂甯�</span>
+
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="updateName"
+ :label="$t('dataManage.vmobj.updateonuser')"
+ align="center"
+ key="14"
+ />
+ <el-table-column
+ prop="updateTime"
+ :label="$t('dataManage.vmobj.updateontime')"
+ :formatter="formatData"
+ align="center"
+ key="15"
+ />
+
+ <el-table-column
+ min-width="150"
+ :label="$t('common.operate')"
+ v-if="active == 'second'"
+ >
+ <template slot-scope="scope">
+ <el-button
+ v-if="active == 'second'"
+ size="small"
+ type="info"
+ plain
+ @click="setPreviewDetails(scope.row)"
+ >{{$t('common.details')}}
</el-button>
- <el-button v-if="active == 'second'"
- size="small"
- type="warning"
- plain
- @click="setPreviewEdit(scope.row)">{{$t('common.update')}}
+ <el-button
+ v-if="active == 'second'"
+ size="small"
+ type="warning"
+ plain
+ @click="setPreviewEdit(scope.row)"
+ >{{$t('common.update')}}
</el-button>
- <el-button v-if="scope.row.url"
- size="small"
- type="success"
- plain
- @click="setPreviewLayer(scope.row)">{{$t('common.preview')}}
+ <el-button
+ v-if="scope.row.url && active == 'second'"
+ size="small"
+ type="success"
+ plain
+ @click="setPreviewLayer(scope.row)"
+ >{{$t('common.preview')}}
+
+ </el-button>
+ <el-button
+ v-if="scope.row.url && active == 'first'"
+ size="small"
+ type="success"
+ plain
+ >宸插彂甯�
</el-button>
</template>
</el-table-column>
</el-table>
+ <el-table
+ v-if="active == 'fourth'"
+ :data="tableData"
+ style="width: 100%"
+ height="calc(100% - 1px)"
+ ref="tableBox"
+ >
+ <!-- <el-table-column
+ prop="name"
+ :label="$t('dataManage.vmobj.name')"
+ align="center"
+ key="1"
+ ></el-table-column> -->
+ <el-table-column
+ prop="name"
+ :label="$t('dataManage.vmobj.name')"
+ align="center"
+ key="3"
+ ></el-table-column>
+ <el-table-column
+ prop="status"
+ :label="$t('dataManage.styleObj.status')"
+ align="center"
+ key="4"
+ :formatter="stateFormatStatus"
+ ></el-table-column>
+ <el-table-column
+ prop="type"
+ :label="$t('dataManage.styleObj.type')"
+ align="center"
+ key="5"
+ ></el-table-column>
+ <el-table-column
+ prop="descr"
+ :label="$t('dataManage.styleObj.descr')"
+ align="center"
+ key="6"
+ ></el-table-column>
+ <el-table-column
+ prop="err"
+ :label="$t('common.err')"
+ align="center"
+ key="7"
+ ></el-table-column>
+ <el-table-column
+ prop="createName"
+ :label="$t('common.rublisher')"
+ align="center"
+ key="8"
+ />
+ <el-table-column
+ prop="createTime"
+ :label="$t('common.releaseTime')"
+ :formatter="formatData"
+ align="center"
+ key="9"
+ />
+ <el-table-column
+ prop="updateName"
+ :label="$t('dataManage.vmobj.updateonuser')"
+ align="center"
+ key="10"
+ />
+ <el-table-column
+ prop="updateTime"
+ :label="$t('dataManage.vmobj.updateontime')"
+ :formatter="formatData"
+ align="center"
+ key="11"
+ />
+ <el-table-column
+ min-width="80"
+ :label="$t('common.operate')"
+ >
+ <template slot-scope="scope">
+ <el-button
+ v-if="scope.row.status == '1'"
+ size="small"
+ type="danger"
+ plain
+ @click="setCannelTask(scope.row)"
+ >{{$t('common.endTask')}}
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- <div class="pagination_box"
- style="margin-top: 10px">
- <el-pagination @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="showPageSize"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="listData.count">
+ <div
+ class="pagination_box"
+ style="margin-top: 10px"
+ >
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="showPageSize"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="listData.count"
+ >
</el-pagination>
</div>
</div>
- <div v-if="active == 'third'"
- class="content_box">
+ <div
+ v-if="active == 'third'"
+ class="content_box"
+ >
<mapview v-if="active == 'third'"></mapview>
</div>
<!-- 鍦板潃棰勮 -->
- <el-dialog :title="$t('common.preview')"
- :class="isFullscreen ? '' : 'dialogClass_his'"
- custom-class="handleDialogClass"
- width="73.4%"
- :fullscreen="isFullscreen"
- v-if="dialogVisible"
- :visible.sync="dialogVisible"
- :show-close="false"
- :close-on-click-modal="false"
- :close-on-press-escape="false">
- <dialog-header slot="title"
- :dialog-tittle="$t('common.preview')"
- :fullscreen="isFullscreen"
- @handle-closed="handleClose"
- @is-fullscreen="onFullscreen"></dialog-header>
+ <el-dialog
+ :title="$t('common.preview')"
+ :class="isFullscreen ? '' : 'dialogClass_his'"
+ custom-class="handleDialogClass"
+ width="73.4%"
+ :fullscreen="isFullscreen"
+ v-if="dialogVisible"
+ :visible.sync="dialogVisible"
+ :show-close="false"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ >
+ <dialog-header
+ slot="title"
+ :dialog-tittle="$t('common.preview')"
+ :fullscreen="isFullscreen"
+ @handle-closed="handleClose"
+ @is-fullscreen="onFullscreen"
+ ></dialog-header>
<div :class="{'fullscreen1':isFullscreen}">
<mapview v-if="showMapView"></mapview>
</div>
@@ -251,57 +540,75 @@
id="MapDiv"
style="background:red;widht:100%;height:calc(100% - 10px)"
></div>
- <!--
+
</el-dialog> -->
<!-- 淇敼鏁版嵁 -->
- <el-dialog :title="$t('common.update')"
- :visible.sync="editDialogVisible"
- width="50%"
- :show-close="false"
- :close-on-click-modal="false">
+ <el-dialog
+ :title="$t('common.update')"
+ :visible.sync="editDialogVisible"
+ width="50%"
+ :show-close="false"
+ :close-on-click-modal="false"
+ >
<div style="width:100%;height:50vh">
- <el-form ref="form"
- :model="editLayer"
- label-width="150px">
+ <el-form
+ ref="form"
+ :model="editLayer"
+ label-width="150px"
+ >
<el-form-item :label="$t('dataManage.vmobj.name')">
<el-input v-model="editLayer.name"></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.vmobj.format')">
- <el-input disabled
- v-model="editLayer.type"></el-input>
+ <el-input
+ disabled
+ v-model="editLayer.type"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.vmobj.depName')">
- <el-input disabled
- v-model="editLayer.depName"></el-input>
+ <el-input
+ disabled
+ v-model="editLayer.depName"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.vmobj.dirName')">
- <el-input disabled
- v-model="editLayer.dirName"></el-input>
+ <el-input
+ disabled
+ v-model="editLayer.dirName"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.vmobj.versionNumber')">
- <el-input disabled
- v-model="editLayer.verName"></el-input>
+ <el-input
+ disabled
+ v-model="editLayer.verName"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('common.publishAddress')">
<el-input v-model="editLayer.url"></el-input>
</el-form-item>
<el-form-item>
- <el-button size="small"
- type="primary"
- @click="setEditLayerSubmit">{{$t('common.submit')}}</el-button>
- <el-button size="small"
- type="info"
- @click="setEditLayerCancle">{{$t('common.cancel')}}</el-button>
+ <el-button
+ size="small"
+ type="primary"
+ @click="setEditLayerSubmit"
+ >{{$t('common.submit')}}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="setEditLayerCancle"
+ >{{$t('common.cancel')}}</el-button>
</el-form-item>
</el-form>
</div>
</el-dialog>
<!-- 鏁版嵁璇︽儏 -->
- <el-dialog :title="$t('common.details')"
- :visible.sync="detailsDialogVisible"
- width="50%"
- :close-on-click-modal="false">
+ <el-dialog
+ :title="$t('common.details')"
+ :visible.sync="detailsDialogVisible"
+ width="50%"
+ :close-on-click-modal="false"
+ >
<div style="width:100%;height:50vh">
<p>{{ $t("dataManage.vmobj.name") }}锛歿{ itemdetail.name }}</p>
<el-divider></el-divider>
@@ -326,91 +633,267 @@
</div>
</el-dialog>
<!-- 鍙戝竷 -->
- <el-dialog :title="$t('common.publish')"
- :visible.sync="insertDialogVisible"
- width="40%"
- :close-on-click-modal="false"
- :show-close="false">
+ <el-dialog
+ :title="$t('common.publish')"
+ :visible.sync="insertDialogVisible"
+ width="40%"
+ :close-on-click-modal="false"
+ :show-close="false"
+ >
<div style="width:100%; ">
- <el-form ref="form"
- :model="insertLayer"
- label-width="150px">
+ <el-form
+ ref="form"
+ :model="insertLayer"
+ label-width="150px"
+ >
<el-form-item :label="$t('dataManage.vmobj.name')">
- <el-input v-model="insertLayer.name"
- :placeholder="$t('dataManage.vmobj.name')"></el-input>
+ <el-input
+ v-model="insertLayer.name"
+ :placeholder="$t('dataManage.vmobj.name')"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.vmobj.numberFiles')">
- <el-input disabled
- v-model="insertLayer.number"></el-input>
+ <el-input
+ disabled
+ v-model="insertLayer.number"
+ ></el-input>
</el-form-item>
- <el-form-item :label="$t('dataManage.vmobj.labe14')"
- v-show="formInline.type =='DOM'">
- <el-select style="width:100%"
- v-model="insertLayer.noData">
- <el-option label="榛戣壊"
- value="0"></el-option>
- <el-option label="鐧借壊"
- value="255"></el-option>
+ <el-form-item
+ :label="$t('dataManage.vmobj.labe14')"
+ v-show="formInline.type =='DOM'"
+ >
+ <el-select
+ style="width:100%"
+ v-model="insertLayer.noData"
+ >
+ <el-option
+ label="榛戣壊"
+ value="0"
+ ></el-option>
+ <el-option
+ label="鐧借壊"
+ value="255"
+ ></el-option>
</el-select>
</el-form-item>
- <el-form-item v-show="formInline.type !='DEM'"
- :label="$t('dataManage.vmobj.minLevel')">
+ <el-form-item
+ v-show="formInline.type !='DEM'"
+ :label="$t('dataManage.vmobj.minLevel')"
+ >
<!-- <el-input
v-model="insertLayer.min"
:placeholder="$t('dataManage.vmobj.labe11')"
></el-input> -->
- <el-select style="width:100%"
- v-model="insertLayer.min"
- :placeholder="$t('dataManage.vmobj.labe11')">
- <el-option v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-select
+ style="width:100%"
+ v-model="insertLayer.min"
+ :placeholder="$t('dataManage.vmobj.labe11')"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
- <el-form-item :label="$t('dataManage.vmobj.maxLevel')"
- v-show="formInline.type !='DEM'">
+ <el-form-item
+ :label="$t('dataManage.vmobj.maxLevel')"
+ v-show="formInline.type !='DEM'"
+ >
<!-- <el-input
v-model="insertLayer.max"
:placeholder="$t('dataManage.vmobj.labe12')"
></el-input> -->
- <el-select style="width:100%"
- v-model="insertLayer.max"
- :placeholder="$t('dataManage.vmobj.labe12')">
- <el-option v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-select
+ style="width:100%"
+ v-model="insertLayer.max"
+ :placeholder="$t('dataManage.vmobj.labe12')"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button size="small"
- type="primary"
- @click="setinsertLayerSubmit()">{{$t('common.submit')}}</el-button>
- <el-button size="small"
- type="info"
- @click="setinsertLayerCancel()">{{$t('common.cancel')}}</el-button>
+ <el-button
+ size="small"
+ type="primary"
+ @click="setinsertLayerSubmit()"
+ >{{$t('common.submit')}}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="setinsertLayerCancel()"
+ >{{$t('common.cancel')}}</el-button>
</el-form-item>
</el-form>
</div>
</el-dialog>
+ <!--妯″瀷鍙戝竷 -->
+ <el-dialog
+ :title="$t('common.publish')"
+ :visible.sync="insertModelVisible"
+ width="25%"
+ :close-on-click-modal="false"
+ :show-close="false"
+ >
+ <div style="width:100%; ">
- <div class="loadBox"
- v-if="loadDialogVisible">
- <div style="widht:100%; margin:20px; color:white">
- <div style="margin-left:99%">
- <el-link @click="setloadDialogVisible()"
- style="color:white"> X</el-link>
+ <div
+ v-for="item in modelOptions"
+ style="margin: 5px;"
+ >
+ <el-row :gutter="20">
+ <el-col :span="10">
+ <div
+ class="contLable"
+ style="height: 64px; display: flex; align-items: center;"
+ >
+ {{ item.name }}
+ </div>
+ </el-col>
+ <el-col :span="10">
+ <div style="height: 64px; display: flex; align-items: center;">
+
+ <el-select
+ size="small"
+ v-model="item.isModel"
+ placeholder="璇烽�夋嫨鏁版嵁绫诲瀷"
+ >
+ <el-option
+ label="鍗曚綋妯″瀷"
+ value="1"
+ ></el-option>
+ <el-option
+ label="鍊炬枩妯″瀷"
+ value="0"
+ >鍊炬枩妯″瀷</el-option>
+ </el-select>
+
+ </div>
+ </el-col>
+ </el-row>
+ </div>
+ <div style="display: flex; justify-content: end;margin-top:10px;">
+ <el-button
+ size="small"
+ type="primary"
+ @click="setModelInsert"
+ >{{$t('common.submit')}}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="setModelCanel"
+ >{{$t('common.cancel')}}</el-button>
</div>
</div>
- <div v-loading="true"
- element-loading-background="rgba(0, 0, 0, 0.0) "
- element-loading-text="鏁版嵁鍙戝竷涓�"
- style="margin: 0px 20px;widht:100%;height:calc(100% - 80px); ">
+ </el-dialog>
+
+ <!-- OSGB LAS -->
+ <el-dialog
+ :title="$t('common.publish')"
+ :visible.sync="insertOsgbVisible"
+ :close-on-click-modal="false"
+ :show-close="false"
+ width="35%"
+ >
+ <div>
+
+ <div
+ v-for="item in osgbLasOption"
+ style="margin-top: 10px; display: flex; justify-content: center; align-items: center; "
+ >
+
+ <div style=" text-align: center; ">
+ {{ item.name }}
+ </div>
+ <!-- <div style="display: flex; align-items: center; margin: 0px 10px;">
+ <label class="contLable">楂樺害鍋忕Щ閲忥細</label>
+ <el-input
+ size="small"
+ v-model="item.zs"
+ >
+ <i slot="suffix">m</i></el-input>
+ </div>
+ <div style="display: flex; align-items: center; ">
+ <label class="contLable">鍧愭爣绯伙細</label>
+ <el-select
+ v-if="!item.lids"
+ v-model="item.srids"
+ style="width: 100%;"
+ size="small"
+ >
+ <el-option
+ v-for="item in stridOption"
+ :key="item.id"
+ :label="item.coordinate"
+ :value="item.epsgcode"
+ >
+ </el-option>
+ </el-select>
+ <el-input
+ v-if="item.lids"
+ v-model="item.srids"
+ size="small"
+ disabled
+ ></el-input>
+ </div> -->
+ </div>
+ <div style="display: flex; justify-content: end;margin-top:10px;">
+ <el-button
+ size="small"
+ type="primary"
+ @click="setOsgbInsert"
+ >{{$t('common.submit')}}</el-button>
+ <el-button
+ size="small"
+ type="info"
+ @click="setOsgbCanel"
+ >{{$t('common.cancel')}}</el-button>
+ </div>
+ </div>
+ </el-dialog>
+ <div
+ class="loadBox"
+ v-if="loadDialogVisible"
+ >
+ <div style="widht:100%; margin:20px; color:white">
+ <div style="margin-left:99%">
+ <el-link
+ @click="setloadDialogVisible()"
+ style="color:white"
+ > X</el-link>
+ </div>
+ </div>
+ <div
+ v-loading="true"
+ element-loading-background="rgba(0, 0, 0, 0.0) "
+ :element-loading-text="loadingText"
+ style="margin: 0px 20px;widht:100%;height:calc(100% - 80px); "
+ >
</div>
</div>
+ <el-dialog
+ :title="$t('common.details')"
+ :visible.sync="rasterCsVisible"
+ :close-on-click-modal="false"
+ width="35%"
+ >
+ <div class="rasterCsBox">
+ <div v-for="(item,index) in rasterCsOption">
+ <div class="rasterCsContent">
+ <label>{{ item.name }} : </label>
+ <label>{{ item.bak }}</label>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -429,6 +912,11 @@
publish_deletes,
publish_update,
publish_insert,
+ dataUpload_selectCoords,
+ publish_selectLasCs,
+ task_selectByPageAndCount,
+ task_deleteTask,
+ publish_selectRasterCs
} from '../../api/api.js'
import { conditions } from '../Archive/Archive';
@@ -437,17 +925,21 @@
MyBread, mapview,
'dialog-header': dialogHeader,
},
- data () {
+ data() {
return {
active: 'first',
formInline: {
dirid: null,
+ dirid2: null,
dirName: null,
+ dirName2: null,
depid: null,
verid: null,
depName: null,
name: "",
- type: ""
+ type: "",
+ type1: "All",
+ status: 'All'
},
listData: {
pageIndex: 1,
@@ -457,8 +949,10 @@
multipleSelection: [],
tableData: [],
depOption: [],
+ dirOption2: [],
dirOption: [],
verOption: [],
+ modelOptions: [],
typeOption: [{
value: 'DOM',
label: '褰卞儚鏁版嵁(.tif, .img)'
@@ -469,6 +963,12 @@
value: 'MPT',
label: '鍦烘櫙鏁版嵁(.mpt)'
}, {
+ value: 'OSGB',
+ label: '鍊炬枩鏁版嵁(.osgb)'
+ }, {
+ value: 'LAS',
+ label: '鐐逛簯鏁版嵁(.las, .laz)'
+ }, {
value: 'CPT',
label: '鐐逛簯鏁版嵁(.cpt)'
}, {
@@ -477,6 +977,53 @@
}, {
value: 'BIM',
label: '涓夌淮妯″瀷(.fbx, .ifc, .rvt)'
+ }],
+ typeOption1: [{
+ value: 'All',
+ label: '鍏ㄩ儴'
+ }, {
+ value: 'DOM',
+ label: '褰卞儚鏁版嵁(.tif, .img)'
+ }, {
+ value: 'DEM',
+ label: '楂樼▼鏁版嵁(.tif)'
+ }, {
+ value: 'MPT',
+ label: '鍦烘櫙鏁版嵁(.mpt)'
+ }, {
+ value: 'OSGB',
+ label: '鍊炬枩鏁版嵁(.osgb)'
+ }, {
+ value: 'LAS',
+ label: '鐐逛簯鏁版嵁(.las, .laz)'
+ }, {
+ value: 'CPT',
+ label: '鐐逛簯鏁版嵁(.cpt)'
+ }, {
+ value: '3DML',
+ label: '涓夌淮妯″瀷(.3dml)'
+ }, {
+ value: 'BIM',
+ label: '涓夌淮妯″瀷(.fbx, .ifc, .rvt)'
+ }],
+ typeOption2: [{
+ label: '鍏ㄩ儴',
+ value: 'All'
+ }, {
+ label: '鏈紑濮�',
+ value: 0
+ }, {
+ label: '杩涜涓�',
+ value: 1
+ }, {
+ label: '姝ｅ父缁撴潫',
+ value: 2
+ }, {
+ label: '鐢ㄦ埛缁撴潫',
+ value: 3
+ }, {
+ label: '杩愯鍑洪敊',
+ value: 4
}],
defaultProps: {
label: "name",
@@ -494,14 +1041,128 @@
detailsDialogVisible: false,
itemdetail: {},
insertDialogVisible: false,
+ insertModelVisible: false,
insertLayer: { name: '', number: null, min: 4, max: 18, noData: '0' },
loadDialogVisible: false,
options: [],
isFullscreen: false,
+ insertOsgbVisible: false,
+ osgbLasLayer: {
+ z: '0',
+ strid: ''
+ },
+ stridOption: [],
+ osgbLasOption: [],
+ loadingText: '鏁版嵁鍙戝竷涓�',
+ rasterCsVisible: false,
+ rasterCsOption: []
}
},
methods: {
- copyText (row, column, cell, event) {
+
+ setOsgbCanel() {
+ this.insertOsgbVisible = false;
+ this.osgbLasLayer = {
+ z: '0',
+ strid: ''
+ }
+ },
+ async setOsgbInsert() {
+
+ var ids = [];
+ var zs = []
+ var models = []
+ var srids = [];
+ var lerro = [];
+ for (var i in this.osgbLasOption) {
+ ids.push(this.osgbLasOption[i].id)
+ // zs.push(this.osgbLasOption[i].zs)
+ zs.push(0)
+ srids.push(0)
+ models.push(0)
+ }
+ var name = this.osgbLasOption[0].name
+
+ if (this.formInline.type == 'LAS') {
+ for (var i in this.osgbLasOption) {
+ // if (this.osgbLasOption[i].srids) {
+ // //var epsg = this.osgbLasOption[i].srids.replace('EPSG:', '')
+ // // srids.push(epsg)
+ // srids.push("00")
+ // } else {
+ // lerro.push(this.osgbLasOption[i].name)
+ // }
+ srids.push(0)
+ }
+ // if (lerro.length > 0) {
+ // return this.$message(lerro + '鏈�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴');
+ // }
+
+ // if (!this.osgbLasLayer.strid) {
+ // return this.$message('璇烽�夋嫨鍙戝竷鏁版嵁鐨勫潗鏍囩郴');
+ // } else {
+ // strid = this.osgbLasLayer.strid.replace('EPSG:', '')
+ // }
+ }
+ var obj = {
+ dircode: this.formInline.dirid,
+ depcode: this.formInline.depid,
+ min: 0,
+ max: 0,
+ name: name,
+ type: this.formInline.type,
+ noData: 0,
+ ids: ids,
+ models: models,
+ srids: [],
+ zs: zs
+ }
+ this.setPublish_insert(obj)
+
+
+ },
+ setModelCanel() {
+ this.insertModelVisible = false;
+ this.modelOptions = [];
+ },
+ async setModelInsert() {
+ var val = this.modelOptions.filter(res => {
+ if (!res.isModel) {
+ return res
+ }
+ })
+ var str = [];
+ if (val.length > 0) {
+ for (var i in val) {
+ str.push(val[i].name)
+ }
+ var mesage = str.toString() + '鏈�夋嫨鏁版嵁绫诲瀷'
+ this.$message(mesage);
+ return;
+ }
+ var ids = [];
+ var models = [];
+ for (var i in this.modelOptions) {
+ ids.push(this.modelOptions[i].id)
+ models.push(parseInt(this.modelOptions[i].isModel))
+ }
+ var obj = {
+ dircode: this.formInline.dirid,
+ depcode: this.formInline.depid,
+ min: null,
+ max: null,
+ name: null,
+ type: this.formInline.type,
+ noData: null,
+ ids: ids,
+ models: models
+
+ }
+ this.setPublish_insert(obj)
+
+
+ },
+ copyText(row, column, cell, event) {
// 鍙屽嚮澶嶅埗
let save = function (e) {
e.clipboardData.setData('text/plain', event.target.innerText);
@@ -511,7 +1172,7 @@
document.execCommand("copy");//鎵цcopy鏂规硶
this.$message({ message: '澶嶅埗鎴愬姛', type: 'success' })//鎻愮ず
},
- setOptions () {
+ setOptions() {
var std = [];
for (var i = 0; i < 23; i++) {
std.push({
@@ -521,15 +1182,17 @@
}
this.options = std;
},
- setloadDialogVisible () {
- this.loadDialogVisible = false
+ setloadDialogVisible() {
+
+ this.loadDialogVisible = false;
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
},
- setinsertLayerCancel () {
+ setinsertLayerCancel() {
this.insertDialogVisible = false;
this.insertLayer = { name: '', number: null, min: 4, max: 18 };
},
//鍙戝竷鎻愪氦
- async setinsertLayerSubmit () {
+ async setinsertLayerSubmit() {
var min = this.insertLayer.min;
var max = this.insertLayer.max;
@@ -563,6 +1226,21 @@
for (var i in this.multipleSelection) {
std.push(this.multipleSelection[i].id)
}
+
+ // if (this.formInline.type == 'DOM') {
+ // const data1 = await publish_selectRasterCs({
+ // ids: std.toString()
+ // })
+ // if (data1.code == 200 && data1.result.length == 0) {
+ // } else {
+ // this.rasterCsOption = data1.result;
+ // this.insertDialogVisible = false;
+ // this.rasterCsVisible = true;
+ // return
+ // }
+ // }
+
+
var obj = {
dircode: this.formInline.dirid,
depcode: this.formInline.depid,
@@ -573,25 +1251,14 @@
type: this.formInline.type,
noData: this.insertLayer.noData
}
- this.loadDialogVisible = true
- this.insertDialogVisible = false;
-
- const data = await publish_insert(obj);
-
- if (data.code == 200 && data.result > 0) {
- this.$message({
- message: '鏁版嵁鍙戝竷鎴愬姛',
- type: 'success'
- });
- } else {
- this.$message.error("鏁版嵁鍙戝竷澶辫触")
- }
- this.loadDialogVisible = false
- this.getTableData();
+ this.setPublish_insert(obj)
},
+
+
+
//鏁版嵁鍙戝竷
- async setPagePublish () {
+ async setPagePublish() {
if (this.multipleSelection.length == 0) {
this.$message("璇烽�夋嫨瑕佸彂甯冪殑鏁版嵁")
return
@@ -602,6 +1269,58 @@
this.insertLayer.number = this.multipleSelection.length
this.insertLayer.noData = '0';
this.insertDialogVisible = true;
+ } else if (this.formInline.type == "3DML" || this.formInline.type == "BIM") {
+ var val = JSON.parse(JSON.stringify(this.multipleSelection))
+ for (var i in val) {
+ val[i].isModel = null
+ }
+ this.modelOptions = val;
+ this.insertModelVisible = true;
+ } else if (this.formInline.type == "OSGB") {
+
+ var val = JSON.parse(JSON.stringify(this.multipleSelection))
+ for (var i in val) {
+ val[i].zs = 0;
+ val[i].srids = null;
+ }
+ this.osgbLasOption = val;
+ this.insertOsgbVisible = true;
+
+ } else if (this.formInline.type == "LAS") {
+ var lids = [];
+ var val = JSON.parse(JSON.stringify(this.multipleSelection))
+ for (var i in val) {
+ val[i].zs = 0;
+ val[i].srids = null;
+ val[i].lids = false;
+ lids.push('ids=' + val[i].id)
+ }
+
+ var url = lids.join('&')
+ const data1 = await publish_selectLasCs(url);
+
+ if (data1.code != 200) {
+ this.$message('Las鏂囦欢鍧愭爣绯籌D澶辫触');
+ } else {
+ for (var i = 0; i < val.length; i++) {
+ var coord = data1.result[i]
+ if (coord > 0) {
+ val[i].srids = "EPSG:" + coord;
+ val[i].lids = true;
+ }
+ }
+
+ }
+
+ const data = await dataUpload_selectCoords();
+
+ if (data.code != 200) {
+ this.$message('鍧愭爣绯绘暟鎹幏鍙栧け璐�');
+ }
+ this.stridOption = data.result;
+
+ this.osgbLasOption = val;
+ this.insertOsgbVisible = true;
} else {
var std = [];
for (var i in this.multipleSelection) {
@@ -615,30 +1334,47 @@
type: this.formInline.type
}
- this.loadDialogVisible = true
- this.insertDialogVisible = false;
- const data = await publish_insert(obj);
- if (data.code != 200) {
- this.$message.error("鏁版嵁鍙戝竷澶辫触")
-
- } else {
- this.$message({
- message: '鏁版嵁鍙戝竷鎴愬姛',
- type: 'success'
- });
- }
- this.loadDialogVisible = false
- this.getTableData();
+ this.setPublish_insert(obj)
}
},
+
+ async setPublish_insert(obj) {
+ this.insertDialogVisible = false;
+ this.insertModelVisible = false;
+ this.insertOsgbVisible = false;
+ var std = [];
+
+
+
+ this.loadingText = '鏁版嵁鍙戝竷涓�';
+ this.loadDialogVisible = true
+ this.insertDialogVisible = false;
+ const data = await publish_insert(obj);
+ if (data.code == 200 && data.result > 0) {
+ this.$message({
+ message: '鏁版嵁鍙戝竷鎴愬姛',
+ type: 'success'
+ });
+ } else {
+ this.$message.error("鏁版嵁鍙戝竷澶辫触")
+ }
+ this.loadDialogVisible = false
+ this.getTableData();
+
+
+ },
+
+
+
+
//鏁版嵁璇︽儏
- setPreviewDetails (res) {
+ setPreviewDetails(res) {
this.itemdetail = res;
this.detailsDialogVisible = true;
},
//淇敼鎻愪氦
- async setEditLayerSubmit () {
+ async setEditLayerSubmit() {
if (this.editLayer.url) {
var url = this.editLayer.url;
this.editLayer.url = url.replace(iisHost, "{host}");
@@ -657,7 +1393,7 @@
this.editDialogVisible = false;
},
//淇敼鍙栨秷
- setEditLayerCancle () {
+ setEditLayerCancle() {
if (this.editLayer == this.updateLayer) {
this.editDialogVisible = false;
} else {
@@ -671,28 +1407,49 @@
});
}
},
+
+ async setCannelTask(res) {
+
+ const data = await task_deleteTask({ id: res.id })
+ if (data.result == 200) {
+ this.$message({
+ message: '浠诲姟缁撴潫鎴愬姛',
+ type: 'success'
+ });
+ } else {
+ this.$message.error({
+ message: '浠诲姟缁撴潫澶辫触',
+ });
+ }
+ this.getTableData();
+
+ },
+
//淇敼寮圭獥
- setPreviewEdit (res) {
+ setPreviewEdit(res) {
this.updateLayer = JSON.stringify(res) //澶囦唤;
this.editLayer = JSON.parse(JSON.stringify(res));
this.editDialogVisible = true;
},
//鍒犻櫎
- setPageDelete () {
+ setPageDelete() {
if (this.multipleSelection.length == 0) {
return this.$message.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁")
} else {
var that = this
this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?')
.then(_ => {
- done();
+
+ that.deletePage()
})
.catch(_ => {
- that.deletePage()
+
});
}
},
- async deletePage () {
+ async deletePage() {
+ this.loadingText = '鏁版嵁鍒犻櫎涓�';
+ this.loadDialogVisible = true;
var std = [];
for (var i in this.multipleSelection) {
std.push(this.multipleSelection[i].id);
@@ -708,30 +1465,32 @@
});
this.getTableData();
}
+ this.loadDialogVisible = false;
},
//棰勮寮圭獥鎵撳紑
- setPreviewLayer (res) {
+ setPreviewLayer(res) {
+ res.stype= 'yl'
this.$store.state.previewLayer = res;
this.dialogVisible = true;
this.showMapView = true;
},
//鏄惁涓哄叏灞忓嚱鏁�
- onFullscreen (fullscreen) {
+ onFullscreen(fullscreen) {
this.isFullscreen = fullscreen;
},
//棰勮寮圭獥鍏抽棴
- handleClose () {
+ handleClose() {
this.getTableData();
this.dialogVisible = false;
this.showMapView = false;
},
// 鑾峰彇澶氶�夐�変腑鐨勫璞�
- handleSelectionChange (val) {
+ handleSelectionChange(val) {
this.multipleSelection = val
},
//鍗曚綅杞崲
- stateFormatSizes (row, column) {
+ stateFormatSizes(row, column) {
if (row.sizes >= 1024) {
const val = parseFloat(row.sizes / 1024).toFixed(3)
return val + " GB"
@@ -739,8 +1498,28 @@
return row.sizes + " MB"
}
},
+ stateFormatStatus(row, column) {
+
+ switch (row.status) {
+ case 0:
+ return '鏈紑濮�';
+ break;
+ case 1:
+ return '杩涜涓�';
+ break;
+ case 2:
+ return '姝ｅ父缁撴潫';
+ break;
+ case 3:
+ return '鐢ㄦ埛缁撴潫';
+ break;
+ case 4:
+ return '杩愯鍑洪敊';
+ break;
+ }
+ },
//鏍煎紡鍖栧湴鍧�
- formatLayer (row, column) {
+ formatLayer(row, column) {
let data = row.layer
if (data == null) {
return data
@@ -749,7 +1528,7 @@
return data.replace("{host}", iisHost)
},
//鏍煎紡鍖栨椂闂�
- formatData (row, column) {
+ formatData(row, column) {
let data = row[column.property]
if (data == null) {
return data
@@ -757,18 +1536,18 @@
return this.format(data)
},
//鍒嗛〉鍒囨崲
- handleCurrentChange (val) {
+ handleCurrentChange(val) {
this.listData.pageIndex = val;
this.getTableData_one();
},
//姣忛〉鏄剧ず鏁伴噺
- handleSizeChange (val) {
+ handleSizeChange(val) {
this.listData.pageSize = val;
this.listData.pageIndex = 1;
this.getTableData_one();
},
//tabs鍒囨彌
- setTabsChange (res) {
+ setTabsChange(res) {
switch (res) {
case 1:
this.active = 'first';
@@ -783,22 +1562,44 @@
url: "menuLayer"
}
this.active = 'third';
-
break;
+ case 4:
+ this.active = 'fourth';
+ this.setPageStart();
+ break;
+
+
+
+ this.$nextTick(() => {
+ this.$refs.tableBox.doLayout()
+ })
+
+
}
},
//椤甸潰鍒濆鍖�
- setPageStart () {
+ setPageStart() {
this.formInline = {
dirid: null,
+ dirid2: null,
dirName: null,
+ dirName2: null,
depid: null,
verid: null,
depName: null,
name: "",
- type: ""
+ type: "",
+ type1: "All",
+ status: 'All'
}
if (this.active == "first") {
+ this.listData = {
+ pageIndex: 1,
+ pageSize: 10,
+ count: 0
+ }
+ this.showPageSize = [10, 50, 100, 200]
+ } if (this.active == "fourth") {
this.listData = {
pageIndex: 1,
pageSize: 10,
@@ -811,7 +1612,14 @@
pageSize: 10,
count: 0
}
- this.showPageSize = [10, 50, 100, 200]
+ this.showPageSize = [10, 50, 100, 200, 500]
+ this.formInline.type1 = this.typeOption1[0].value;
+ if (this.dirOption2.length > 0) {
+ this.formInline.dirid2 = this.dirOption2[0].code;
+
+ this.formInline.dirName2 = this.dirOption2[0].name;
+ }
+
}
this.formInline.type = this.typeOption[0].value;
@@ -819,19 +1627,35 @@
this.getDirTreeList();
},
//鑾峰彇鐩綍鍒楄〃
- async getDirTreeList () {
+ async getDirTreeList() {
const data = await selectdirTab();
if (data.code != 200) {
this.$message.error("鍗曚綅鍒楄〃鑾峰彇澶辫触")
return
}
+ var res = JSON.parse(JSON.stringify(data.result));
+ var res_val = res.filter((rs) => {
+ if (rs.pid == 0) {
+ return rs
+ }
+ })
+
+ res_val.unshift({
+ name: '鍏ㄩ儴',
+ id: 'All',
+ pid: 0,
+ code: "All"
+ })
+ this.dirOption2 = this.treeData(res_val)
this.dirOption = this.treeData(data.result);
this.formInline.dirid = this.dirOption[0].code;
this.formInline.dirName = this.dirOption[0].name;
+ this.formInline.dirid2 = this.dirOption2[0].code;
+ this.formInline.dirName2 = this.dirOption2[0].name;
this.getVerList(this.dirOption[0].id)
},
//鑾峰彇鐗堟湰鍒楄〃
- async getVerList (res) {
+ async getVerList(res) {
const data = await meta_selectVerByDirid({ dirid: res })
if (data.code != 200) {
this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触")
@@ -842,36 +1666,51 @@
this.getTableData();
},
//鐗堟湰鍒楄〃鍒囨崲
- handleVerChange (value) {
-
+ handleVerChange(value) {
this.formInline.verid = value;
this.getTableData();
},
//鏈嶅姟绫诲瀷鍒楄〃鍒囨崲
- handleTypeChange (value) {
+ handleTypeChange(value) {
this.formInline.type = value;
this.getTableData();
},
+ handleTypeChange1(value) {
+ this.formInline.type1 = value;
+ this.getTableData();
+ },
+
+
+ handleTypeChange2(value) {
+ this.formInline.status = value;
+ this.getTableData();
+ },
//鍗曚綅鍒楄〃鍒囨崲
- handleDepChange (data, node, nodeData) {
+ handleDepChange(data, node, nodeData) {
this.formInline.depid = data.code
this.formInline.depName = data.name
this.getTableData();
},
//鐩綍鍒楄〃鍒囨崲
- handleDirChange (data, node, nodeData) {
+ handleDirChange(data, node, nodeData) {
this.formInline.dirid = data.code
this.formInline.dirName = data.name
this.getVerList(data.id)
},
+ //鐩綍鍒楄〃鍒囨崲
+ handleDirChange2(data, node, nodeData) {
+ this.formInline.dirid2 = data.code
+ this.formInline.dirName2 = data.name
+ this.getTableData();
+ },
//鑾峰彇Table琛ㄦ牸鏁版嵁
- async getTableData () {
+ async getTableData() {
this.listData.count = 0;
this.listData.pageIndex = 1;
this.getTableData_one();
},
- async getTableData_one () {
+ async getTableData_one() {
this.tableData = [];
if (this.active == "first") {
@@ -902,11 +1741,45 @@
this.tableData = val;
this.listData.count = data.count;
}
- }
- else {
- if (this.formInline.name) {
- this.listData.name = this.formInline.name
+ } else if (this.active == "fourth") {
+ if (this.formInline.status == 'All') {
+ this.listData.status = null;
+
+ } else {
+ this.listData.status = this.formInline.status
}
+
+ if (this.formInline.type1 == 'All') {
+ this.listData.type = null;
+ } else {
+ this.listData.type = this.formInline.type1
+ }
+
+ if (this.formInline.name) {
+ this.listData.name = this.formInline.name;
+ }
+ this.tableData = [];
+ const data = await task_selectByPageAndCount(this.listData)
+ if (data.code != 200) {
+
+ }
+ this.tableData = data.result;
+ this.listData.count = data.count;
+
+
+ } else {
+ this.listData.name = this.formInline.name
+ if (this.formInline.dirid2 == 'All') {
+ this.listData.dircode = this.formInline.dirid2.replace('All', '');
+ } else {
+ this.listData.dircode = this.formInline.dirid2
+ }
+ if (this.formInline.type1 == 'All') {
+ this.listData.type = this.formInline.type1.replace('All', '');
+ } else {
+ this.listData.type = this.formInline.type1
+ }
+
const data = await publish_selectByPage(this.listData);
@@ -932,7 +1805,7 @@
}
},
//鏍煎紡鍖栨椂闂�
- format (shijianchuo) {
+ format(shijianchuo) {
//shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
var time = new Date(shijianchuo);
var y = time.getFullYear();
@@ -956,11 +1829,11 @@
);
},
//鏍煎紡鍖栨椂闂�
- add0 (m) {
+ add0(m) {
return m < 10 ? '0' + m : m;
},
//鑾峰彇鍗曚綅鍒楄〃
- async getDepTreeList () {
+ async getDepTreeList() {
const data = await selectdepTab();
if (data.code != 200) {
this.$message.error("鍗曚綅鍒楄〃鑾峰彇澶辫触")
@@ -971,7 +1844,7 @@
this.formInline.depName = this.depOption[0].name
},
//鏍戝垪琛ㄧ敓鎴�
- treeData (source) {
+ treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)) // 瀵规簮鏁版嵁娣卞害鍏嬮殕
return cloneData.filter(father => {
// 寰幆鎵�鏈夐」
@@ -981,7 +1854,7 @@
})
},
},
- mounted () {
+ mounted() {
this.active = 'first';
this.setPageStart();
this.setOptions();
@@ -1058,5 +1931,18 @@
/deep/.el-dialog__header {
padding: 10px !important;
}
+ .contLable {
+ width: 140px;
+ text-align: right;
+ }
+ .rasterCsBox {
+ max-height: 60vh;
+ overflow: auto;
+ .rasterCsContent {
+ padding: 10px;
+ font-size: 16px;
+ font-family: Source Han Sans CN;
+ }
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3