Skip to content

Commit

Permalink
同意所有表格每页显示行数,修复查询审核页面显示数据数量不正确的问题
Browse files Browse the repository at this point in the history
  • Loading branch information
cookie committed Feb 13, 2019
1 parent a2baeab commit 977f6f2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/core/api/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ def get(self, request, args=None):
else:
try:
pagenumber = SqlOrder.objects.filter(status=1, assigned=request.user).count()
start = int(page) * 10 - 10
end = int(page) * 10
start = (int(page) - 1) * 20
end = int(page) * 20
sql = SqlOrder.objects.raw(
'''
select o.id,o.work_id,o.text,o.backup,o.date,o.assigned,
Expand Down
4 changes: 2 additions & 2 deletions src/core/api/serachsql.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ class Query_order(baseview.SuperUserpermissions):
def get(self, request, args: str = None):
page = request.GET.get('page')
pn = query_order.objects.filter(audit=request.user).count()
start = int(page) * 10 - 10
end = int(page) * 10
start = (int(page) - 1) * 20
end = int(page) * 20
user_list = query_order.objects.all().order_by('-id')[start:end]
serializers = Query_review(user_list, many=True)
return Response({'data': serializers.data, 'pn': pn})
Expand Down
2 changes: 1 addition & 1 deletion webpage/src/components/assistantManger/record.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
:total="this.pagenumber"
show-elevator
@on-change="splicpage"
:page-size="10"
:page-size="20"
ref="page"
></Page>
</Col>
Expand Down
10 changes: 5 additions & 5 deletions webpage/src/libs/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ util.notice = function (vl) {

util.highlight = 'alter|and|as|asc|between|count|create|delete|desc|distinct|drop|from|having|in|insert|into|is|join|like|not|on|or|order|select|set|table|union|update|values|where|accessible|action|add|after|algorithm|all|analyze|asensitive|at|authors|auto_increment|autocommit|avg|avg_row_length|before|binary|binlog|both|btree|cache|call|cascade|cascaded|case|catalog_name|chain|change|changed|character|check|checkpoint|checksum|class_origin|client_statistics|close|coalesce|code|collate|collation|collations|column|columns|comment|commit|committed|completion|concurrent|condition|connection|consistent|constraint|contains|continue|contributors|convert|cross|current_date|current_time|current_timestamp|current_user|cursor|data|database|databases|day_hour|day_microsecond|day_minute|day_second|deallocate|dec|declare|default|delay_key_write|delayed|delimiter|des_key_file|describe|deterministic|dev_pop|dev_samp|deviance|directory|disable|discard|distinctrow|div|dual|dumpfile|each|elseif|enable|enclosed|end|ends|engine|engines|enum|errors|escape|escaped|even|event|events|every|execute|exists|exit|explain|extended|fast|fetch|field|fields|first|flush|for|force|foreign|found_rows|full|fulltext|function|general|global|grant|grants|group|groupby_concat|handler|hash|help|high_priority|hosts|hour_microsecond|hour_minute|hour_second|if|ignore|ignore_server_ids|import|index|index_statistics|infile|inner|innodb|inout|insensitive|insert_method|install|interval|invoker|isolation|iterate|key|keys|kill|language|last|leading|leave|left|level|limit|linear|lines|list|load|local|localtime|localtimestamp|lock|logs|low_priority|master|master_heartbeat_period|master_ssl_verify_server_cert|masters|match|max|max_rows|maxvalue|message_text|middleint|migrate|min|min_rows|minute_microsecond|minute_second|mod|mode|modifies|modify|mutex|mysql_errno|natural|next|no|no_write_to_binlog|offline|offset|one|online|open|optimize|option|optionally|out|outer|outfile|pack_keys|parser|partition|partitions|password|phase|plugin|plugins|prepare|preserve|prev|primary|privileges|procedure|processlist|profile|profiles|purge|query|quick|range|read|read_write|reads|real|rebuild|recover|references|regexp|relaylog|release|remove|rename|reorganize|repair|repeatable|replace|acequire|resignal|restrict|resume|return|returns|revoke|right|rlike|rollback|rollup|row|row_format|rtree|savepoint|schedule|schema|schema_name|schemas|second_microsecond|security|sensitive|separator|serializable|server|session|share|show|signal|slave|slow|smallint|snapshot|soname|spatial|specific|sql|sql_big_result|sql_buffer_result|sql_cache|sql_calc_found_rows|sql_no_cache|sql_small_result|sqlexception|sqlstate|sqlwarning|ssl|start|starting|starts|status|std|stddev|stddev_pop|stddev_samp|storage|straight_join|subclass_origin|sum|suspend|table_name|table_statistics|tables|tablespace|temporary|terminated|to|trailing|transaction|trigger|triggers|truncate|uncommitted|undo|uninstall|unique|unlock|upgrade|usage|use|use_frm|user|user_resources|user_statistics|using|utc_date|utc_time|utc_timestamp|value|variables|varying|view|views|warnings|when|while|with|work|write|xa|xor|year_month|zerofill|begin|do|then|else|loop|repeat|by|bool|boolean|bit|blob|decimal|double|enum|float|long|longblob|longtext|medium|mediumblob|mediumint|mediumtext|time|timestamp|tinyblob|tinyint|tinytext|text|bigint|int|int1|int2|int3|int4|int8|integer|float|float4|float8|double|char|varbinary|varchar|varcharacter|precision|date|datetime|year|unsigned|signed|numeric|ucase|lcase|mid|len|round|rank|now|format|coalesce|ifnull|isnull|nvl'

// util.url = location.protocol + '//' + document.domain + ':8000/api/v1'
//
// util.auth = location.protocol + '//' + document.domain + ':8000/api-token-auth/'
util.url = location.protocol + '//' + document.domain + ':8000/api/v1'

util.url = '/api/v1'
util.auth = location.protocol + '//' + document.domain + ':8000/api-token-auth/'

util.auth = '/api-token-auth/'
// util.url = '/api/v1'
//
// util.auth = '/api-token-auth/'

util.oneOf = function (ele, targetArr) {
if (targetArr.indexOf(ele) >= 0) {
Expand Down

0 comments on commit 977f6f2

Please sign in to comment.