Browse Source

常规消缺

wangb 3 months ago
parent
commit
78d125a99f

+ 2 - 2
.env.production

@@ -14,8 +14,8 @@ VUE_APP_TITLE = '页面标题'
 # 登录
 # VUE_APP_LOGIN_URL = 'http://123.60.219.66:48080'
 # VUE_APP_LOGIN_URL = 'http://192.168.0.105:48080'
-# VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
-VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
+VUE_APP_LOGIN_URL = 'http://10.127.7.241:48080'
+# VUE_APP_LOGIN_URL = 'http://172.16.12.101:48080'
 # VUE_APP_LOGIN_URL = 'http://192.168.2.231:48080'
 # VUE_APP_LOGIN_URL = 'http://127.0.0.1:48080'
 

+ 0 - 2
components.d.ts

@@ -39,7 +39,6 @@ declare module 'vue' {
     EchartsGaugeComponent: typeof import('./src/components/homeComponent/echartsGaugeComponent.vue')['default']
     EchartsPie: typeof import('./src/components/homeComponent/echartsPie.vue')['default']
     EchartsPie2: typeof import('./src/components/homeComponent/echartsPie2.vue')['default']
-    ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
@@ -81,7 +80,6 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTableV2: typeof import('element-plus/es')['ElTableV2']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']

+ 3 - 2
src/views/intelligentReporting/existing.vue

@@ -5,12 +5,13 @@
             ref="singleTableRef">
             <el-table-column label="脚本名称">
                 <template #default="scope">
-                    <el-button type="warning" round>{{ scope.row.scriptName}}</el-button>
+                    <el-tag type="primary">{{ scope.row.scriptName}}</el-tag>
+                    <!-- <el-button type="warning" round>{{ scope.row.scriptName}}</el-button> -->
                 </template>
             </el-table-column>
             <el-table-column align="right">
                 <template #default="scope">
-                    <el-button type="primary" @click="openDetil(scope.row)">编辑</el-button>
+                    <el-button @click="openDetil(scope.row)">编辑</el-button>
                     <el-button style="margin-right:10px" type="danger" @click="deleteRow(scope.row)">删除</el-button>
                 </template>
             </el-table-column>

+ 10 - 8
src/views/intelligentReporting/reporting/index.vue

@@ -34,14 +34,15 @@
                         <el-table-column type="index" width="30" />
                         <el-table-column label="脚本名称">
                             <template #default="scope">
-                                <el-button v-if="scope.row.scriptName !==''" type="warning" round>
+                                <!-- <el-button v-if="scope.row.scriptName !==''" type="warning" round>
                                     {{ scope.row.scriptName}}
-                                </el-button>
+                                </el-button> -->
+                                <el-tag type="primary">{{ scope.row.scriptName}}</el-tag>
                             </template>
                         </el-table-column>
                         <el-table-column align="right">
                             <template #default="scope">
-                                <el-button type="primary" :disabled="btnloading" @click="handleRun(scope.$index)">运行
+                                <el-button :disabled="btnloading" @click="handleRun(scope.$index)">运行
                                 </el-button>
                                 <el-button type="danger" @click="handleDeleteList(scope.$index)">删除
                                 </el-button>
@@ -52,7 +53,7 @@
 
                 <div class="listTop listBot warn-table">
                     <p class="tableTit">每天运行一次</p>
-                    <el-table :data="tableData4" :height="listHeight">
+                    <el-table :data="tableData4" :max-height="listHeight">
                         <el-table-column label="时间" width="300">
                             <template #default="scope">
                                 <el-time-select v-model="scope.row.time" start="00:05" step="00:05" end="23:55"
@@ -61,16 +62,17 @@
                         </el-table-column>
                         <el-table-column label="脚本名称">
                             <template #default="scope">
-                                <el-button v-if="scope.row.scriptName !==''" type="warning" round>
+                                <!-- <el-button v-if="scope.row.scriptName !==''" type="warning" round>
                                     {{ scope.row.scriptName}}
-                                </el-button>
+                                </el-button> -->
+                                <el-tag type="primary">{{ scope.row.scriptName}}</el-tag>
                             </template>
                         </el-table-column>
                         <el-table-column align="right">
                             <template #default="scope">
-                                <el-button type="primary" v-if="!scope.row.isRunning" @click="dayRun(scope.row)">运行
+                                <el-button v-if="!scope.row.isRunning" @click="dayRun(scope.row)">运行
                                 </el-button>
-                                <el-button type="primary" v-else disabled>运行中
+                                <el-button v-else disabled>运行中
                                 </el-button>
                                 <el-button type="danger" @click="handleDeleteDayRun(scope.$index, scope.row)">删除
                                 </el-button>

+ 2 - 1
src/views/intelligentReporting/scriptgeneration/index.vue

@@ -5,7 +5,8 @@
                 <div class="listTop">
                     <p class="tableTit">基本脚本</p>
                     <el-table :data="tableData" :height="tableHeight" highlight-current-row ref="singleTableRef"
-                        @current-change="handleCurrentChange">
+                        @current-change="handleCurrentChange"
+                        :style="!theme ? 'background: #161f1e': 'background: #edeffb'">
                         <el-table-column label="脚本选项">
                             <template #default="scope">
                                 <el-input style="width: 150px" disabled>