no message

This commit is contained in:
小陌 2023-06-27 22:51:20 +08:00
parent 84efd5055d
commit 2a3f618e74
4 changed files with 16 additions and 13 deletions

View File

@ -3,7 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
<meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= VUE_APP_TITLE %></title> <title><%= VUE_APP_TITLE %></title>
<script type="text/javascript"> <script type="text/javascript">
@ -49,8 +50,8 @@
</div> </div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
<div id="versionCheck" style="display: none;position: absolute;z-index: 99;top:0;left:0;right:0;bottom:0;padding:40px;background:rgba(255,255,255,0.9);color: #333;"> <div id="versionCheck" style="display: none;position: absolute;z-index: 99;top:0;left:0;right:0;bottom:0;padding:150px 20px;background:rgba(255,255,255,0.8);color: #333;">
<h2 style="line-height: 1;margin: 0;font-size: 24px;">当前使用的浏览器内核版本过低 :(</h2> <h2 style="line-height: 1;margin: 0;font-size: 24px;">当前浏览器内核版本过低</h2>
<p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 20px;opacity: 0.8;">当前版本:<span id="versionCheck-type">--</span> <span id="versionCheck-version">--</span></p> <p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 20px;opacity: 0.8;">当前版本:<span id="versionCheck-type">--</span> <span id="versionCheck-version">--</span></p>
<p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 10px;opacity: 0.8;">最低版本要求Chrome 71+、Firefox 65+、Safari 12+、Edge 97+。</p> <p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 10px;opacity: 0.8;">最低版本要求Chrome 71+、Firefox 65+、Safari 12+、Edge 97+。</p>
<p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 10px;opacity: 0.8;">请升级浏览器版本,或更换现代浏览器,如果你使用的是双核浏览器,请切换到极速/高速模式。</p> <p style="line-height: 1;margin: 0;font-size: 14px;margin-top: 10px;opacity: 0.8;">请升级浏览器版本,或更换现代浏览器,如果你使用的是双核浏览器,请切换到极速/高速模式。</p>
@ -81,6 +82,9 @@
}else if(indexOf(userAgent, "Safari")){ }else if(indexOf(userAgent, "Safari")){
browerInfo.type = "Safari" browerInfo.type = "Safari"
browerInfo.version = userAgent.match(/Safari\/([\d.]+)/)[1] browerInfo.version = userAgent.match(/Safari\/([\d.]+)/)[1]
}else if(indexOf(userAgent, "MicroMessenger")){
browerInfo.type = "MicroMessenger"
browerInfo.version = userAgent.match(/MicroMessenger\/([\d.]+)/)[1]
} }
return browerInfo return browerInfo
} }
@ -93,6 +97,7 @@
"Firefox": 65, "Firefox": 65,
"Safari": 12, "Safari": 12,
"Edg": 97, "Edg": 97,
"MicroMessenger": 8,
"IE": 999 "IE": 999
} }
var browerInfo = getBrowerInfo() var browerInfo = getBrowerInfo()

View File

@ -6,7 +6,6 @@
<el-tab-pane v-for="item in settingList" :key="item.key" :label="item.name" :name="item.key"> <el-tab-pane v-for="item in settingList" :key="item.key" :label="item.name" :name="item.key">
<sc-form ref="formref" :config="formList[item.key]" v-model="info" :loading="loading"> </sc-form> <sc-form ref="formref" :config="formList[item.key]" v-model="info" :loading="loading"> </sc-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="扩展配置"> <el-tab-pane label="扩展配置">
<el-alert title="扩展配置为系统业务所有的配置" type="warning" style="margin-bottom: 15px;"></el-alert> <el-alert title="扩展配置为系统业务所有的配置" type="warning" style="margin-bottom: 15px;"></el-alert>
<sc-form-table v-model="extend" :hideAdd="true" drag-sort placeholder="暂无数据"> <sc-form-table v-model="extend" :hideAdd="true" drag-sort placeholder="暂无数据">
@ -29,7 +28,12 @@
<el-button type="primary" icon="el-icon-plus" @click="table_add" style="margin-top: 20px;"></el-button> <el-button type="primary" icon="el-icon-plus" @click="table_add" style="margin-top: 20px;"></el-button>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-button type="primary" @click="submit" style="width: 500px;margin: 30px 0 0 150px;" :loading="submitloading">保存</el-button> <el-row>
<el-col :span="3"><span>1</span></el-col>
<el-col :span="20">
<el-button type="primary" @click="submit" style="max-width: 500px; width: 100%;" :loading="submitloading">保存</el-button>
</el-col>
</el-row>
</el-card> </el-card>
</el-main> </el-main>
</el-container> </el-container>
@ -54,19 +58,13 @@
}, },
methods: { methods: {
render(){ render(){
this.loading = true; this.loading = true;
setTimeout(async ()=>{ setTimeout(async ()=>{
var res = await this.$http.get('system/setting/get'); var res = await this.$http.get('system/setting/get');
if (res.code!=200) { if (res.code!=200) {
this.$message.warning(res.message) this.$message.warning(res.message)
return false; return false;
} }
this.settingList = res.data.settingList; this.settingList = res.data.settingList;
this.info = res.data.info; this.info = res.data.info;
this.formList = res.data.formList; this.formList = res.data.formList;

View File

@ -5,7 +5,7 @@
<el-radio-group v-model="dateType" v-if="dateGroup.length>0" @change="changedateGroup" style="margin-right: 15px;"> <el-radio-group v-model="dateType" v-if="dateGroup.length>0" @change="changedateGroup" style="margin-right: 15px;">
<el-radio-button v-for="item in dateGroup" :key="item.value" :label="item.text" :name="item.value"></el-radio-button> <el-radio-button v-for="item in dateGroup" :key="item.value" :label="item.text" :name="item.value"></el-radio-button>
</el-radio-group> </el-radio-group>
<el-date-picker v-if="this.date" @change="changedate" format="YYYY-MM-DD HH:mm" v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker class="hidden-sm-and-down" v-if="this.date" @change="changedate" format="YYYY-MM-DD HH:mm" v-model="date" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</div> </div>
</el-header> </el-header>
<el-main> <el-main>

View File

@ -20,7 +20,7 @@
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :tableColumn="column" :params="search" :columnSetting="columnSetting" :api="api" :row-key="key" @selection-change="selectionChange" :remoteSort="true" :remoteFilter="true" stripe> <scTable ref="table" :tableColumn="column" :params="search" :columnSetting="columnSetting" :api="api" :row-key="key" @selection-change="selectionChange" :remoteSort="true" :remoteFilter="true" stripe>
<el-table-column v-if="isselection" type="selection" width="50"></el-table-column> <el-table-column v-if="isselection" type="selection" width="50"></el-table-column>
<el-table-column :label="operation.label || '操作'" :width="operation.width || 120" :fixed="operation.fixed || 'right'" :align="operation.align || 'left'" v-if="operation.edit || operation.delete"> <el-table-column :label="operation.label || '操作'" :width="operation.width || 124" :fixed="operation.fixed || 'right'" :align="operation.align || 'left'" v-if="operation.edit || operation.delete">
<template #default="scope"> <template #default="scope">
<el-button-group> <el-button-group>
<el-button v-if="operation.edit" :type="operation.edit.type || 'primary'" :size="operation.edit.size || 'small'" @click="operationEdit(scope.row, scope.$index)">{{ operation.edit.name || '编辑' }}</el-button> <el-button v-if="operation.edit" :type="operation.edit.type || 'primary'" :size="operation.edit.size || 'small'" @click="operationEdit(scope.row, scope.$index)">{{ operation.edit.name || '编辑' }}</el-button>