Commit da423870 authored by 黄奎's avatar 黄奎

页面修改

parent 1b4660ff
...@@ -7,249 +7,246 @@ ...@@ -7,249 +7,246 @@
// https://quasar.dev/quasar-cli/quasar-conf-js // https://quasar.dev/quasar-cli/quasar-conf-js
/* eslint-env node */ /* eslint-env node */
module.exports = function(ctx) { module.exports = function (ctx) {
return { return {
// https://quasar.dev/quasar-cli/supporting-ts // https://quasar.dev/quasar-cli/supporting-ts
supportTS: false, supportTS: false,
// https://quasar.dev/quasar-cli/prefetch-feature // https://quasar.dev/quasar-cli/prefetch-feature
// preFetch: true, // preFetch: true,
// app boot file (/src/boot) // app boot file (/src/boot)
// --> boot files are part of "main.js" // --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/boot-files // https://quasar.dev/quasar-cli/boot-files
boot: [ boot: [
'i18n', 'i18n',
'axios', 'axios',
'permission' 'permission'
], ],
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
css: [ css: [
'app.sass' 'app.sass'
], ],
// https://github.com/quasarframework/quasar/tree/dev/extras // https://github.com/quasarframework/quasar/tree/dev/extras
extras: [ extras: [
// 'ionicons-v4', // 'ionicons-v4',
// 'mdi-v5', // 'mdi-v5',
// 'fontawesome-v5', // 'fontawesome-v5',
// 'eva-icons', // 'eva-icons',
// 'themify', // 'themify',
// 'line-awesome', // 'line-awesome',
// 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both! // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
'roboto-font', // optional, you are not bound to it 'roboto-font', // optional, you are not bound to it
'material-icons' // optional, you are not bound to it 'material-icons' // optional, you are not bound to it
], ],
// Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
build: { build: {
vueRouterMode: 'hash', // available values: 'hash', 'history' vueRouterMode: 'hash', // available values: 'hash', 'history'
env: ctx.dev ? { env: ctx.dev ? {
//http://192.168.1.27:8300/api API: 'http://192.168.1.27:8300/api'
//https://localhost:5001/api } : {
// API: 'http://192.168.1.27:8300/api' API: 'http://eduapi.oytour.com/api'
API:'http://192.168.1.27:8300/api' },
} : { // transpile: false,
API: 'https://prod.api.com'
}, // Add dependencies for transpiling with Babel (Array of string/regex)
// transpile: false, // (from node_modules, which are by default not transpiled).
// Applies only if "transpile" is set to true.
// Add dependencies for transpiling with Babel (Array of string/regex) // transpileDependencies: [],
// (from node_modules, which are by default not transpiled).
// Applies only if "transpile" is set to true. // rtl: false, // https://quasar.dev/options/rtl-support
// transpileDependencies: [], // preloadChunks: true,
// showProgress: false,
// rtl: false, // https://quasar.dev/options/rtl-support // gzip: true,
// preloadChunks: true, // analyze: true,
// showProgress: false,
// gzip: true, // Options below are automatically set depending on the env, set them if you want to override
// analyze: true, // extractCSS: false,
// Options below are automatically set depending on the env, set them if you want to override // https://quasar.dev/quasar-cli/handling-webpack
// extractCSS: false, extendWebpack(cfg) {
// cfg.module.rules.push({
// https://quasar.dev/quasar-cli/handling-webpack // enforce: 'pre',
extendWebpack(cfg) { // test: /\.(js|vue)$/,
// cfg.module.rules.push({ // loader: 'eslint-loader',
// enforce: 'pre', // exclude: /node_modules/
// test: /\.(js|vue)$/, // })
// loader: 'eslint-loader', }
// exclude: /node_modules/ },
// })
} // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer
}, devServer: {
https: false,
// Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer port: 8181,
devServer: { open: true // opens browser window automatically
https: false, },
port: 8181,
open: true // opens browser window automatically // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
}, framework: {
iconSet: 'material-icons', // Quasar icon set
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework lang: 'en-us', // Quasar language pack
framework: { config: {},
iconSet: 'material-icons', // Quasar icon set
lang: 'en-us', // Quasar language pack // Possible values for "importStrategy":
config: {}, // * 'auto' - (DEFAULT) Auto-import needed Quasar components & directives
// * 'all' - Manually specify what to import
// Possible values for "importStrategy": importStrategy: 'auto',
// * 'auto' - (DEFAULT) Auto-import needed Quasar components & directives
// * 'all' - Manually specify what to import // For special cases outside of where "auto" importStrategy can have an impact
importStrategy: 'auto', // (like functional components as one of the examples),
// you can manually specify Quasar components/directives to be available everywhere:
// For special cases outside of where "auto" importStrategy can have an impact //
// (like functional components as one of the examples), components: [
// you can manually specify Quasar components/directives to be available everywhere: 'QLayout',
// 'QHeader',
components: [ 'QDrawer',
'QLayout', 'QPageContainer',
'QHeader', 'QPage',
'QDrawer', 'QToolbar',
'QPageContainer', 'QToolbarTitle',
'QPage', 'QBtn',
'QToolbar', 'QIcon',
'QToolbarTitle', 'QList',
'QBtn', 'QItem',
'QIcon', 'QItemSection',
'QList', 'QItemLabel',
'QItem', 'QTabs',
'QItemSection', 'QRouteTab',
'QItemLabel', 'QAvatar',
'QTabs', 'QBtnDropdown',
'QRouteTab', 'QFooter',
'QAvatar', 'QMenu',
'QBtnDropdown', 'QCarousel',
'QFooter', 'QCarouselControl',
'QMenu', 'QCarouselSlide',
'QCarousel', 'QInput',
'QCarouselControl', 'QDate',
'QCarouselSlide', 'QPopupProxy',
'QInput', 'QBanner',
'QDate', 'QSeparator',
'QPopupProxy', 'QChip',
'QBanner', 'QTab',
'QSeparator', 'QSelect',
'QChip', 'QVideo',
'QTab', 'QImg',
'QSelect', 'QResizeObserver',
'QVideo', 'QMarkupTable',
'QImg', 'QForm',
'QResizeObserver', 'QTable',
'QMarkupTable', 'QTh',
'QForm', 'QTr',
'QTable', 'QTd',
'QTh', 'QCard',
'QTr', 'QCheckbox',
'QTd', 'QTree',
'QCard', 'QOptionGroup',
'QCheckbox', 'QRadio'
'QTree', ],
'QOptionGroup', // directives: [],
'QRadio'
], // Quasar plugins
// directives: [], plugins: [
'Meta',
// Quasar plugins 'Notify',
plugins: [ 'Dialog',
'Meta', 'LoadingBar'
'Notify', ]
'Dialog', },
'LoadingBar'
] // animations: 'all', // --- includes all animations
}, // https://quasar.dev/options/animations
animations: [],
// animations: 'all', // --- includes all animations
// https://quasar.dev/options/animations // https://quasar.dev/quasar-cli/developing-ssr/configuring-ssr
animations: [], ssr: {
pwa: false
// https://quasar.dev/quasar-cli/developing-ssr/configuring-ssr },
ssr: {
pwa: false // https://quasar.dev/quasar-cli/developing-pwa/configuring-pwa
}, pwa: {
workboxPluginMode: 'GenerateSW', // 'GenerateSW' or 'InjectManifest'
// https://quasar.dev/quasar-cli/developing-pwa/configuring-pwa workboxOptions: {}, // only for GenerateSW
pwa: { manifest: {
workboxPluginMode: 'GenerateSW', // 'GenerateSW' or 'InjectManifest' name: 'com.viitto.confuius',
workboxOptions: {}, // only for GenerateSW short_name: 'com.viitto.confuius',
manifest: { description: 'jiahe japen school system',
name: 'com.viitto.confuius', display: 'standalone',
short_name: 'com.viitto.confuius', orientation: 'portrait',
description: 'jiahe japen school system', background_color: '#ffffff',
display: 'standalone', theme_color: '#027be3',
orientation: 'portrait', icons: [{
background_color: '#ffffff', src: 'icons/icon-128x128.png',
theme_color: '#027be3', sizes: '128x128',
icons: [{ type: 'image/png'
src: 'icons/icon-128x128.png', },
sizes: '128x128', {
type: 'image/png' src: 'icons/icon-192x192.png',
}, sizes: '192x192',
{ type: 'image/png'
src: 'icons/icon-192x192.png', },
sizes: '192x192', {
type: 'image/png' src: 'icons/icon-256x256.png',
}, sizes: '256x256',
{ type: 'image/png'
src: 'icons/icon-256x256.png', },
sizes: '256x256', {
type: 'image/png' src: 'icons/icon-384x384.png',
}, sizes: '384x384',
{ type: 'image/png'
src: 'icons/icon-384x384.png', },
sizes: '384x384', {
type: 'image/png' src: 'icons/icon-512x512.png',
}, sizes: '512x512',
{ type: 'image/png'
src: 'icons/icon-512x512.png', }
sizes: '512x512', ]
type: 'image/png' }
} },
]
} // Full list of options: https://quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
}, cordova: {
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing
// Full list of options: https://quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova },
cordova: {
// noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing // Full list of options: https://quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
}, capacitor: {
hideSplashscreen: true
// Full list of options: https://quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor },
capacitor: {
hideSplashscreen: true // Full list of options: https://quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
}, electron: {
bundler: 'packager', // 'packager' or 'builder'
// Full list of options: https://quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
electron: { packager: {
bundler: 'packager', // 'packager' or 'builder' // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
packager: { // OS X / Mac App Store
// https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options // appBundleId: '',
// appCategoryType: '',
// OS X / Mac App Store // osxSign: '',
// appBundleId: '', // protocol: 'myapp://path',
// appCategoryType: '',
// osxSign: '', // Windows only
// protocol: 'myapp://path', // win32metadata: { ... }
},
// Windows only
// win32metadata: { ... } builder: {
}, // https://www.electron.build/configuration/configuration
builder: { appId: 'confucius'
// https://www.electron.build/configuration/configuration },
appId: 'confucius' // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration
}, nodeIntegration: true,
// More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration extendWebpack( /* cfg */ ) {
nodeIntegration: true, // do something with Electron main process Webpack cfg
// chainWebpack also available besides this extendWebpack
extendWebpack( /* cfg */ ) { }
// do something with Electron main process Webpack cfg
// chainWebpack also available besides this extendWebpack
}
}
} }
}
} }
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.AssistName" <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.AssistName" label="助教名称"
label="助教名称" maxlength="20" /> maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.AssistTel" <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.AssistTel" label="助教电话"
label="助教电话" maxlength="20" /> maxlength="20" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable filled stack-label option-value="SId" option-label="SName" <q-select @input="resetSearch" clearable filled stack-label option-value="SId" option-label="SName"
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-right-column-table sticky-column-table" separator="none" :data="data" class="sticky-right-column-table sticky-column-table" separator="none" :data="data" :columns="columns"
:columns="columns" row-key="name"> row-key="name">
<template v-slot:top="props"> <template v-slot:top="props">
<div class="col-2 q-table__title">助教信息</div> <div class="col-2 q-table__title">助教信息</div>
<q-space /> <q-space />
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
@click="addObj(props.row)" /> @click="addObj(props.row)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list> <q-list>
<q-item clickable v-close-popup @click="showExamine(props.row)"v-if="props.row.AuditStatus==1"> <q-item clickable v-close-popup @click="showExamine(props.row)" v-if="props.row.AuditStatus==1"
style="display:none">
<q-item-section> <q-item-section>
<q-item-label>审核</q-item-label> <q-item-label>审核</q-item-label>
</q-item-section> </q-item-section>
...@@ -83,7 +84,8 @@ ...@@ -83,7 +84,8 @@
<q-item-label>重置密码</q-item-label> <q-item-label>重置密码</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<q-item clickable v-close-popup @click="reApplyAssisst(props.row.AId)" v-if="props.row.AuditStatus==3"> <q-item clickable v-close-popup @click="reApplyAssisst(props.row.AId)" v-if="props.row.AuditStatus==3"
style="display:none">
<q-item-section> <q-item-section>
<q-item-label>重新申请</q-item-label> <q-item-label>重新申请</q-item-label>
</q-item-section> </q-item-section>
...@@ -130,8 +132,7 @@ ...@@ -130,8 +132,7 @@
data() { data() {
return { return {
currentUrl: "", currentUrl: "",
columns: [ columns: [{
{
name: 'AssistName', name: 'AssistName',
required: true, required: true,
label: '助教名称', label: '助教名称',
...@@ -174,18 +175,18 @@ ...@@ -174,18 +175,18 @@
align: 'left', align: 'left',
field: 'ClassCount' field: 'ClassCount'
}, },
{ // {
name: 'OnlineClassCount', // name: 'OnlineClassCount',
label: '网课产品', // label: '网课产品',
align: 'left', // align: 'left',
field: 'OnlineClassCount' // field: 'OnlineClassCount'
}, // },
{ // {
name: 'OnlineOrderCount', // name: 'OnlineOrderCount',
label: '网课订单', // label: '网课订单',
align: 'left', // align: 'left',
field: 'OnlineOrderCount' // field: 'OnlineOrderCount'
}, // },
{ {
name: 'CreateTimeStr', name: 'CreateTimeStr',
label: '入职时间', label: '入职时间',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment