Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

Browse Source
This commit is contained in:
LiWeiJie 2024-03-25 18:05:26 +08:00
commit b1ff2cc8e1
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
god-ui/src/views/index.vue
View File

@ -20,6 +20,7 @@
<information v-else-if="port === '9401'" /> <information v-else-if="port === '9401'" />
<qcfgquality v-else-if="port === '9402'" /> <qcfgquality v-else-if="port === '9402'" />
<machine v-else-if="port === '9403'" /> <machine v-else-if="port === '9403'" />
<cdapChart v-else-if="port === '9404'" />
<operate-home v-else-if="port === '80' || port === ''"></operate-home> <operate-home v-else-if="port === '80' || port === ''"></operate-home>
<home-page v-else></home-page> <home-page v-else></home-page>
</div> </div>
@ -46,6 +47,7 @@ import agricultural from './machinery/home2/index.vue'
import information from './informationManagement/home/index' import information from './informationManagement/home/index'
import machine from './machineVision/home/index.vue' import machine from './machineVision/home/index.vue'
import qcfgquality from './qcfgjIndustrialVision/qcfgquality/index' import qcfgquality from './qcfgjIndustrialVision/qcfgquality/index'
import cdapChart from './cdap/chart/index'
export default { export default {
components: { components: {
HomePage, HomePage,
@ -68,7 +70,8 @@ export default {
agricultural, agricultural,
information, information,
machine, machine,
qcfgquality qcfgquality,
cdapChart
}, },
data() { data() {
return { return {

6
god-ui/src/views/rescue/streamConference/index.vue
View File

@ -41,7 +41,6 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="[' rescue:streamConference:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -52,7 +51,6 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="[' rescue:streamConference:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -63,7 +61,6 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="[' rescue:streamConference:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -73,7 +70,6 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="[' rescue:streamConference:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -107,14 +103,12 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="[' rescue:streamConference:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="[' rescue:streamConference:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>