wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre

This commit is contained in:
a0049873 2022-11-03 14:46:30 +08:00
parent 63267ed67e e915396532
commit b10158ce02
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
back/src/views/modules/ability/bsabilityai.vue
View File

@ -170,9 +170,9 @@
width="30%" width="30%"
> >
<el-radio v-model="radio" label="智能算法">智能算法</el-radio> <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
<el-radio v-model="radio" label="图层服务">图层服务</el-radio> <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
<el-radio v-model="radio" label="开发组件">开发组件</el-radio> <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
<el-radio v-model="radio" label="业务组件">业务组件</el-radio> <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear">取 消</el-button> <el-button @click="clear">取 消</el-button>
<el-button type="primary" @click="showPutOnTheShelfVue" <el-button type="primary" @click="showPutOnTheShelfVue"
@ -181,7 +181,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="submitFrom.id ? '修改' + radio : '上架' + radio" title="盘点入库"
:visible.sync="showPutOnTheShelfFlag2" :visible.sync="showPutOnTheShelfFlag2"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -583,6 +583,7 @@ export default {
this.reset() this.reset()
}, },
showPutOnTheShelf () { showPutOnTheShelf () {
// :title="submitFrom.id ? '修改' + radio : '上架' + radio"
this.showPutOnTheShelfFlag = true this.showPutOnTheShelfFlag = true
this.$http.get('/category/getCategoryTree').then((res) => { this.$http.get('/category/getCategoryTree').then((res) => {
this.insertList = res.data.data.filter( this.insertList = res.data.data.filter(

3
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -175,7 +175,7 @@
></relate-application> ></relate-application>
</div> </div>
<el-dialog <el-dialog
:title="submitFrom.id?'修改'+radio:'上架'+radio" title="盘点入库"
:visible.sync="showPutOnTheShelfFlag2" :visible.sync="showPutOnTheShelfFlag2"
:close-on-click-modal='false' :close-on-click-modal='false'
:close-on-press-escape='false' :close-on-press-escape='false'
@ -549,6 +549,7 @@ export default {
}, },
// 上架 // 上架
showPutOnTheShelf () { showPutOnTheShelf () {
// :title="submitFrom.id?'修改'+radio:'上架'+radio"
this.showPutOnTheShelfFlag2 = true this.showPutOnTheShelfFlag2 = true
this.$http.get('/category/getCategoryTree').then(res => { this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0] this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]

8
back/src/views/modules/ability/businessComponents.vue
View File

@ -156,9 +156,9 @@
width="30%" width="30%"
> >
<el-radio v-model="radio" label="智能算法">智能算法</el-radio> <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
<el-radio v-model="radio" label="图层服务">图层服务</el-radio> <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
<el-radio v-model="radio" label="开发组件">开发组件</el-radio> <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
<el-radio v-model="radio" label="业务组件">业务组件</el-radio> <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear">取 消</el-button> <el-button @click="clear">取 消</el-button>
<el-button type="primary" @click="showPutOnTheShelfVue" <el-button type="primary" @click="showPutOnTheShelfVue"
@ -167,7 +167,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="submitFrom.id ? '修改' + radio : '上架' + radio" title="盘点入库"
:visible.sync="showPutOnTheShelfFlag2" :visible.sync="showPutOnTheShelfFlag2"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

8
back/src/views/modules/ability/commonCapabilities.vue
View File

@ -160,9 +160,9 @@
width="30%" width="30%"
> >
<el-radio v-model="radio" label="智能算法">智能算法</el-radio> <el-radio v-model="radio" label="智能算法">智能算法</el-radio>
<el-radio v-model="radio" label="图层服务">图层服务</el-radio> <el-radio v-model="radio" label="图层服务">GIS图层</el-radio>
<el-radio v-model="radio" label="开发组件">开发组件</el-radio> <el-radio v-model="radio" label="开发组件">通用能力组件</el-radio>
<el-radio v-model="radio" label="业务组件">业务组件</el-radio> <el-radio v-model="radio" label="业务组件">业务能力组件</el-radio>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="clear">取 消</el-button> <el-button @click="clear">取 消</el-button>
<el-button type="primary" @click="showPutOnTheShelfVue" <el-button type="primary" @click="showPutOnTheShelfVue"
@ -171,7 +171,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="submitFrom.id ? '修改' + radio : '上架' + radio" title="盘点入库"
:visible.sync="showPutOnTheShelfFlag2" :visible.sync="showPutOnTheShelfFlag2"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

2
back/src/views/modules/capabilityTraceability/index.vue
View File

@ -170,7 +170,7 @@
</div> </div>
</div> </div>
<!--GIS图层资源--> <!--GIS图层资源-->
<el-dialog title="GIS图层资源" :visible.sync="yunshow" class="status_change"> <el-dialog title="GIS图层资源能力溯源信息分析" :visible.sync="yunshow" class="status_change">
<div> <div>
<el-table <el-table
:data="dataList1" :data="dataList1"