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

god-ui/src/views/index.vue

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

god-ui/src/views/rescue/streamConference/index.vue

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