Commit 9fe9a7e7 by liangzhen

暂存

1 parent 193b142a
...@@ -248,6 +248,7 @@ import { ...@@ -248,6 +248,7 @@ import {
selFileList, selFileList,
} from '@/api/index' } from '@/api/index'
import { MaterialsListKY } from '@/utils/cache' import { MaterialsListKY } from '@/utils/cache'
import { Loading } from 'element-ui';
export default { export default {
data() { data() {
return { return {
...@@ -474,18 +475,33 @@ export default { ...@@ -474,18 +475,33 @@ export default {
}) })
}, },
working(type){ working(type){
let options={
fullscreen: true,
spinner: 'el-icon-loading',
customClass: 'iam-loading',
text:"智能分析中,请耐心等候...", //显示在加载图标下方的加载文案
background:'rgba(0,0,0,.7)', //遮罩背景色
}
let loadingInstance ='';
let params = { let params = {
projectStage: this.active * 1 + 1, projectStage: this.active * 1 + 1,
// hgx: 'hgx', // hgx: 'hgx',
...this.clqparams, ...this.clqparams,
} }
if(type=='work'){ if(type=='work'){
this.hgx='hgx' loadingInstance = Loading.service(options);
} }
if( this.hgx='hgx'){ if( this.hgx='hgx'){
params.hgx='hgx' params.hgx='hgx'
} }
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => { Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
if(type=='work'){
console.log('走了关闭')
loadingInstance.close();
}
});
this.tabListKY = [] this.tabListKY = []
this.urlList = res[0].data this.urlList = res[0].data
if (this.urlList.length > 0) { if (this.urlList.length > 0) {
......
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
</template> </template>
<script> <script>
import { Loading } from 'element-ui';
// import{kkk}from "@/static/web/viewer.mjs" // import{kkk}from "@/static/web/viewer.mjs"
import { import {
selWtqdFZ, selWtqdFZ,
...@@ -474,18 +475,35 @@ export default { ...@@ -474,18 +475,35 @@ export default {
}) })
}, },
working(type){ working(type){
let options={
fullscreen: true,
spinner: 'el-icon-loading',
customClass: 'iam-loading',
text:"智能分析中,请耐心等候...", //显示在加载图标下方的加载文案
background:'rgba(0,0,0,.7)', //遮罩背景色
}
let params = { let params = {
projectStage: this.active * 1 + 1, projectStage: this.active * 1 + 1,
// hgx: 'hgx', // hgx: 'hgx',
...this.clqparams, ...this.clqparams,
} }
let loadingInstance ='';
if(type=='work'){ if(type=='work'){
this.hgx='hgx' this.hgx='hgx'
loadingInstance = Loading.service(options);
} }
if( this.hgx='hgx'){ if( this.hgx='hgx'){
params.hgx='hgx' params.hgx='hgx'
} }
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => { Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
if(type=='work'){
console.log('走了关闭')
loadingInstance.close();
}
});
this.tabListKY = [] this.tabListKY = []
this.urlList = res[0].data this.urlList = res[0].data
if (this.urlList.length > 0) { if (this.urlList.length > 0) {
......
...@@ -842,6 +842,7 @@ export default { ...@@ -842,6 +842,7 @@ export default {
async detailsForm(row) { async detailsForm(row) {
this.checkedList[0] = row; this.checkedList[0] = row;
this.dialog = true; this.dialog = true;
this.bjId=row.id
this.ruleFormdialog = this.checkedList[0]; this.ruleFormdialog = this.checkedList[0];
let params = { let params = {
id: this.bjId, id: this.bjId,
......
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
ref="multipleTable" ref="multipleTable"
@row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
:data="tableData" :data="tableData"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
......
...@@ -4,7 +4,7 @@ const { defineConfig } = require('@vue/cli-service') ...@@ -4,7 +4,7 @@ const { defineConfig } = require('@vue/cli-service')
// const ip = '172.20.10.9'; // 何鹏 // const ip = '172.20.10.9'; // 何鹏
// const ip = '192.168.0.120'; // const ip = '192.168.0.120';
// const ip = '192.168.50.1'; // const ip = '192.168.50.1';
const ip = '192.168.8.120'; const ip = '192.168.145.116';
module.exports = defineConfig({ module.exports = defineConfig({
transpileDependencies: true, transpileDependencies: true,
//如果是hash模式, publicPath:"";如果是history, publicPath:"/" //如果是hash模式, publicPath:"";如果是history, publicPath:"/"
...@@ -18,7 +18,7 @@ module.exports = defineConfig({ ...@@ -18,7 +18,7 @@ module.exports = defineConfig({
proxy: { proxy: {
'/arch-evaluation':{ '/arch-evaluation':{
// target: `http://192.168.69.1:18102`, // pin // target: `http://192.168.69.1:18102`, // pin
target: `http://192.168.145.1:18000/tools`, // pin target: `http://192.168.145.116:18000/tools`, // pin
changeOrigin: true, changeOrigin: true,
pathRewrite:{ pathRewrite:{
"^/arch-evaluation":"/" "^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!