From 878d522029b38648538dfc91ed26e1a51848233e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 11 Jun 2021 10:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9migrations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- duibiao/calsim.py | 6 +- groups/migrations/0001_initial.py | 36 +- groups/migrations/0002_auto_20191017_0929.py | 47 - ...115_2158.py => 0002_auto_20210611_0944.py} | 32 +- groups/migrations/0003_auto_20191024_1056.py | 31 - groups/migrations/0004_auto_20191024_1109.py | 18 - groups/migrations/0005_remove_group_member.py | 17 - groups/migrations/0006_group_members.py | 19 - groups/migrations/0007_role.py | 23 - groups/migrations/0008_delete_role.py | 16 - groups/migrations/0009_groupuser_issuper.py | 18 - requirements.txt | Bin 2130 -> 2054 bytes safesite/datashowview.py | 4 +- safesite/migrations/0001_initial.py | 1784 ++++++++++++++++- .../migrations/0002_auto_20180627_2206.py | 148 -- .../migrations/0003_auto_20180628_1159.py | 60 - .../migrations/0004_auto_20180629_1642.py | 21 - .../migrations/0005_auto_20180703_1551.py | 125 -- .../migrations/0006_troubleaccess_pgsj.py | 21 - safesite/migrations/0007_trouble_todouser.py | 21 - .../migrations/0008_auto_20180703_2139.py | 41 - safesite/migrations/0009_trouble_yhpg.py | 21 - safesite/migrations/0010_trouble_yhnum.py | 20 - .../migrations/0011_troubleaccess_action.py | 20 - safesite/migrations/0012_trouble_usecomp.py | 21 - .../migrations/0013_auto_20180705_2242.py | 46 - .../migrations/0014_auto_20180706_1500.py | 31 - safesite/migrations/0015_trouble_xgsj.py | 20 - .../migrations/0016_auto_20180706_1624.py | 76 - .../migrations/0017_auto_20180706_1633.py | 21 - .../migrations/0018_remove_trouble_zglx.py | 19 - .../migrations/0019_auto_20180714_1457.py | 27 - .../migrations/0020_remove_user_manager.py | 19 - .../migrations/0021_auto_20180714_1602.py | 25 - .../migrations/0022_auto_20180714_2133.py | 20 - .../migrations/0023_auto_20180716_1447.py | 39 - .../migrations/0024_auto_20180717_0926.py | 25 - .../migrations/0025_auto_20180717_0928.py | 20 - .../migrations/0026_auto_20180717_1624.py | 20 - safesite/migrations/0027_trouble_zgsj.py | 20 - .../migrations/0028_auto_20180718_1456.py | 30 - .../migrations/0029_auto_20180718_1514.py | 25 - .../migrations/0030_auto_20180718_2229.py | 30 - safesite/migrations/0031_trouble_sybzt.py | 20 - .../migrations/0032_auto_20180720_0853.py | 20 - safesite/migrations/0033_yjyc.py | 27 - safesite/migrations/0034_yjyc_usecomp.py | 21 - .../migrations/0035_auto_20180830_1022.py | 56 - .../migrations/0036_auto_20180830_1027.py | 20 - .../migrations/0037_auto_20180830_1136.py | 23 - .../migrations/0038_auto_20180830_1452.py | 40 - .../migrations/0039_partment_iscompany.py | 20 - safesite/migrations/0040_yjyc_b.py | 20 - .../migrations/0041_auto_20180904_0850.py | 20 - .../migrations/0042_auto_20180904_0857.py | 20 - .../migrations/0043_auto_20180904_1522.py | 45 - .../migrations/0044_auto_20180904_1532.py | 45 - .../migrations/0045_auto_20180910_0902.py | 21 - .../migrations/0046_auto_20180910_1811.py | 34 - .../migrations/0047_auto_20181002_1113.py | 45 - .../migrations/0048_remove_trouble_csyj.py | 19 - .../migrations/0049_auto_20181010_2255.py | 44 - safesite/migrations/0050_trouble_csqrr.py | 21 - .../migrations/0051_auto_20181017_1115.py | 25 - .../migrations/0052_auto_20181017_1533.py | 20 - .../migrations/0053_auto_20181023_1708.py | 38 - .../migrations/0054_auto_20181025_1134.py | 37 - .../migrations/0055_auto_20181107_1430.py | 25 - .../migrations/0056_auto_20181118_1144.py | 20 - safesite/migrations/0057_user_issuper.py | 20 - .../migrations/0058_auto_20181205_1107.py | 24 - .../migrations/0059_auto_20181205_1113.py | 20 - .../migrations/0060_remove_dickey_usecomps.py | 19 - safesite/migrations/0061_dickey_usecomps.py | 20 - .../migrations/0062_auto_20181205_1144.py | 20 - .../migrations/0063_auto_20181206_1438.py | 53 - .../migrations/0064_auto_20181206_1442.py | 80 - .../migrations/0065_auto_20181206_1524.py | 55 - safesite/migrations/0066_group_usercomp.py | 21 - .../migrations/0067_auto_20181207_1600.py | 20 - safesite/migrations/0068_group_grouptype.py | 20 - safesite/migrations/0069_trouble_pgyj.py | 20 - .../migrations/0070_auto_20181212_1628.py | 30 - .../migrations/0071_auto_20181212_1709.py | 20 - safesite/migrations/0072_menu.py | 27 - .../migrations/0073_auto_20181217_1114.py | 24 - safesite/migrations/0074_menu_parentid.py | 21 - .../migrations/0075_auto_20181218_0847.py | 24 - .../migrations/0076_auto_20181218_0935.py | 20 - safesite/migrations/0077_menu_deletemark.py | 20 - safesite/migrations/0078_user_iselse.py | 20 - .../migrations/0079_auto_20181229_1620.py | 25 - .../migrations/0080_auto_20190101_2031.py | 27 - safesite/migrations/0081_dickey_nousecomps.py | 20 - safesite/migrations/0082_observe.py | 39 - .../migrations/0083_auto_20190108_1646.py | 24 - .../migrations/0084_auto_20190108_1824.py | 59 - .../migrations/0085_auto_20190109_0844.py | 74 - .../migrations/0086_auto_20190109_0942.py | 24 - safesite/migrations/0087_yjyc_buildtime.py | 21 - safesite/migrations/0088_menu_icon.py | 20 - .../migrations/0089_auto_20190116_1353.py | 20 - safesite/migrations/0090_user_menulink.py | 20 - safesite/migrations/0091_miss_relation.py | 48 - safesite/migrations/0092_userprofile.py | 24 - safesite/migrations/0093_socertificate.py | 32 - safesite/migrations/0094_menu_sortnum.py | 18 - .../migrations/0095_remove_user_menulink.py | 17 - .../migrations/0096_socertificate_usecomp.py | 19 - .../migrations/0097_auto_20190217_1535.py | 19 - .../migrations/0098_auto_20190218_1016.py | 38 - safesite/migrations/0099_train_lecturer.py | 19 - safesite/migrations/0100_drill_chief.py | 19 - .../migrations/0101_socertificate_zszt.py | 18 - safesite/migrations/0102_partment_ismain.py | 18 - .../migrations/0103_remove_partment_ismain.py | 17 - safesite/migrations/0104_socertificate_url.py | 18 - safesite/migrations/0105_suggest.py | 33 - .../migrations/0106_auto_20190303_2201.py | 23 - safesite/migrations/0107_user_usecomp.py | 19 - .../migrations/0108_auto_20190303_2337.py | 23 - .../migrations/0109_auto_20190304_0009.py | 18 - .../0110_remove_suggest_deletemark.py | 17 - safesite/migrations/0111_trouble_xzr.py | 18 - .../migrations/0112_auto_20190305_1642.py | 18 - .../migrations/0113_auto_20190306_1709.py | 42 - .../migrations/0114_auto_20190307_1126.py | 23 - safesite/migrations/0115_notice_usecomp.py | 20 - .../migrations/0116_auto_20190307_1201.py | 18 - safesite/migrations/0117_notice_deletemark.py | 18 - safesite/migrations/0118_notice_reads.py | 18 - .../migrations/0119_auto_20190310_1716.py | 27 - .../migrations/0120_auto_20190314_1618.py | 28 - safesite/migrations/0121_yjyc_observevalue.py | 18 - .../0122_operation_operationsetting.py | 34 - .../migrations/0123_auto_20190328_1548.py | 18 - safesite/migrations/0124_delete_operation.py | 16 - safesite/migrations/0125_operation.py | 35 - .../migrations/0126_auto_20190331_2157.py | 25 - safesite/migrations/0127_operation_zynr.py | 18 - .../migrations/0128_auto_20190401_1455.py | 40 - .../migrations/0129_auto_20190402_1651.py | 18 - .../migrations/0130_auto_20190402_1706.py | 41 - .../migrations/0131_auto_20190404_1455.py | 24 - .../migrations/0132_auto_20190405_1207.py | 59 - safesite/migrations/0133_fxcs_submittime.py | 19 - .../migrations/0134_auto_20190405_1402.py | 28 - safesite/migrations/0135_fxcs_cslx.py | 18 - .../migrations/0136_auto_20190405_1825.py | 69 - .../migrations/0137_auto_20190405_1828.py | 17 - .../migrations/0138_auto_20190405_1916.py | 18 - .../0139_remove_operationspjd_deletemark.py | 17 - .../migrations/0140_auto_20190405_2350.py | 83 - .../migrations/0141_auto_20190406_0021.py | 19 - .../migrations/0142_auto_20190406_1305.py | 18 - .../migrations/0142_auto_20190406_1506.py | 35 - .../migrations/0143_merge_20190408_0940.py | 14 - .../migrations/0144_auto_20190408_0940.py | 19 - safesite/migrations/0145_operation_zydd.py | 18 - safesite/migrations/0146_operation_zyimg2.py | 18 - .../migrations/0147_auto_20190408_1359.py | 23 - .../migrations/0148_auto_20190410_0904.py | 18 - .../migrations/0149_auto_20190410_0909.py | 18 - safesite/migrations/0150_trainuser_checked.py | 18 - .../migrations/0151_auto_20190410_1731.py | 23 - .../migrations/0152_auto_20190412_0855.py | 23 - safesite/migrations/0153_dickey_detail.py | 18 - .../migrations/0154_auto_20190418_1706.py | 100 - .../migrations/0155_auto_20190419_1027.py | 37 - .../migrations/0156_question_creatuser.py | 19 - .../migrations/0157_auto_20190419_1130.py | 18 - safesite/migrations/0158_question_station.py | 19 - .../migrations/0159_auto_20190419_1651.py | 23 - .../migrations/0160_auto_20190422_0945.py | 51 - safesite/migrations/0161_examtest.py | 38 - safesite/migrations/0162_exampaper_type.py | 18 - .../migrations/0163_auto_20190422_1114.py | 34 - .../migrations/0164_auto_20190423_0840.py | 103 - safesite/migrations/0165_examtest_name.py | 18 - safesite/migrations/0166_examtest_num.py | 18 - .../migrations/0167_auto_20190423_1745.py | 23 - .../migrations/0168_auto_20190423_1752.py | 19 - .../migrations/0169_auto_20190423_1753.py | 18 - safesite/migrations/0170_examtest_state.py | 18 - .../migrations/0171_examtest_createuser.py | 19 - safesite/migrations/0172_examtest_train.py | 19 - safesite/migrations/0173_examtest_duration.py | 18 - .../0174_remove_examtestdetail_wrongs.py | 17 - .../migrations/0175_auto_20190426_1758.py | 18 - .../0176_examtestdetail_passcode.py | 18 - .../migrations/0177_auto_20190505_0852.py | 23 - .../migrations/0178_auto_20190510_1752.py | 18 - safesite/migrations/0179_dickey_parent.py | 19 - .../migrations/0180_auto_20190514_1151.py | 34 - .../migrations/0181_auto_20190514_1424.py | 27 - .../0182_remove_questioncat_type.py | 17 - .../migrations/0183_questioncat_partlink.py | 18 - .../migrations/0184_auto_20190514_1531.py | 18 - .../migrations/0185_remove_question_cate.py | 17 - .../migrations/0186_auto_20190514_1651.py | 18 - .../migrations/0187_auto_20190521_1119.py | 18 - safesite/migrations/0188_safecert.py | 33 - .../migrations/0189_auto_20190522_0056.py | 18 - .../migrations/0190_auto_20190524_1115.py | 37 - .../migrations/0191_auto_20190528_2250.py | 42 - .../migrations/0192_auto_20190604_1032.py | 30 - safesite/migrations/0193_map_link.py | 18 - .../migrations/0194_auto_20190604_1148.py | 28 - .../migrations/0195_auto_20190604_1437.py | 23 - .../migrations/0196_auto_20190604_1736.py | 18 - safesite/migrations/0197_map_default.py | 18 - .../migrations/0198_auto_20190605_1110.py | 24 - .../migrations/0199_auto_20190605_1636.py | 18 - safesite/migrations/0200_remove_area_point.py | 17 - safesite/migrations/0201_trouble_yhqy.py | 19 - safesite/migrations/0202_miss_missqy.py | 19 - .../migrations/0203_auto_20190614_1732.py | 23 - .../migrations/0204_auto_20190616_1702.py | 30 - .../migrations/0205_auto_20190616_1703.py | 18 - .../migrations/0206_auto_20190617_0856.py | 30 - .../migrations/0207_auto_20190617_1048.py | 75 - .../migrations/0208_auto_20190617_1048.py | 29 - .../migrations/0209_auto_20190617_1157.py | 25 - .../migrations/0210_auto_20190617_1159.py | 18 - safesite/migrations/0211_suggest_clcs.py | 18 - .../migrations/0212_auto_20190618_1039.py | 24 - .../migrations/0213_remove_suggest_jyimg2.py | 17 - safesite/migrations/0214_suggest_jyimg2.py | 19 - .../migrations/0215_auto_20190618_1044.py | 19 - .../migrations/0216_auto_20190618_1445.py | 23 - safesite/migrations/0217_suggest_shyj.py | 18 - .../migrations/0218_auto_20190619_1652.py | 23 - .../migrations/0219_auto_20190628_0807.py | 70 - .../migrations/0220_auto_20190628_1620.py | 29 - .../migrations/0221_auto_20190628_1659.py | 23 - .../migrations/0222_auto_20190701_1756.py | 29 - .../migrations/0223_auto_20190702_1058.py | 18 - safesite/migrations/0224_equipment_state.py | 18 - .../migrations/0225_auto_20190702_1709.py | 40 - .../migrations/0226_auto_20190702_1827.py | 28 - .../migrations/0227_auto_20190702_2144.py | 32 - .../migrations/0228_auto_20190702_2156.py | 24 - safesite/migrations/0229_area_usecomp.py | 19 - .../migrations/0230_auto_20190702_2218.py | 19 - safesite/migrations/0231_inspect_user.py | 19 - safesite/migrations/0232_inspect_trouble.py | 19 - .../migrations/0233_auto_20190709_1720.py | 99 - .../migrations/0234_auto_20190709_1821.py | 43 - .../migrations/0235_auto_20190709_2243.py | 18 - safesite/migrations/0236_risk_gkcj.py | 18 - .../migrations/0237_auto_20190710_1439.py | 39 - .../migrations/0238_auto_20190710_1522.py | 24 - safesite/migrations/0239_area_risklevel.py | 18 - safesite/migrations/0240_riskact_group.py | 19 - .../migrations/0241_auto_20190711_1634.py | 23 - safesite/migrations/0242_equipment_qrcode.py | 18 - .../migrations/0243_auto_20190717_1103.py | 47 - safesite/migrations/0244_operation_zyqy.py | 19 - safesite/migrations/0245_risk_modifytime.py | 18 - .../migrations/0246_auto_20190805_2105.py | 18 - safesite/migrations/0247_train_checkqr.py | 18 - safesite/migrations/0248_risk_frequency.py | 18 - .../migrations/0249_auto_20190808_1452.py | 18 - .../migrations/0250_auto_20190808_1649.py | 45 - .../migrations/0251_auto_20190808_1807.py | 23 - .../migrations/0252_auto_20190809_1009.py | 23 - .../migrations/0253_auto_20190811_0007.py | 33 - safesite/migrations/0254_risktask_type.py | 18 - safesite/migrations/0255_riskcheck.py | 26 - safesite/migrations/0256_riskact_qrcode.py | 18 - safesite/migrations/0257_report.py | 25 - safesite/migrations/0258_yjyc_missvalue.py | 18 - .../migrations/0259_auto_20190902_2129.py | 18 - .../migrations/0260_auto_20190902_2144.py | 68 - .../migrations/0261_auto_20190904_1844.py | 106 - .../migrations/0262_auto_20190904_2246.py | 48 - safesite/migrations/0263_examtest_qrcode.py | 18 - .../migrations/0264_auto_20190909_0916.py | 19 - .../migrations/0265_auto_20190912_1117.py | 83 - .../migrations/0265_auto_20190917_1716.py | 19 - safesite/migrations/0265_companyinfo.py | 35 - .../migrations/0266_auto_20190912_1151.py | 23 - .../migrations/0266_auto_20190917_2314.py | 19 - .../migrations/0267_auto_20190917_1543.py | 23 - .../migrations/0268_merge_20190919_1423.py | 14 - .../migrations/0268_merge_20191009_0952.py | 15 - .../migrations/0269_auto_20190919_1423.py | 18 - .../migrations/0270_auto_20190920_1200.py | 17 - .../migrations/0270_auto_20190923_1017.py | 29 - .../migrations/0271_auto_20190923_1018.py | 18 - .../migrations/0271_auto_20190925_1113.py | 18 - .../migrations/0272_auto_20190923_1026.py | 23 - .../migrations/0272_auto_20190925_1657.py | 18 - .../migrations/0273_auto_20191008_1604.py | 29 - .../migrations/0274_merge_20191011_1415.py | 15 - .../migrations/0275_auto_20191011_1415.py | 33 - .../migrations/0276_merge_20191017_0928.py | 14 - .../0277_remove_companyinfo_liaison_fax.py | 13 - .../migrations/0278_auto_20191018_1723.py | 24 - .../migrations/0279_auto_20191022_1635.py | 23 - .../migrations/0280_auto_20191023_1711.py | 32 - .../0281_remove_companyinfo_liaison_fax.py | 17 - .../0282_remove_companyinfo_liaison_fax.py | 17 - .../0283_remove_companyinfo_liaison_fax.py | 17 - .../0284_remove_companyinfo_liaison_fax.py | 17 - .../0285_remove_companyinfo_liaison_fax.py | 17 - .../migrations/0286_auto_20191030_1632.py | 23 - .../migrations/0287_auto_20191118_2252.py | 23 - .../migrations/0288_auto_20191118_2253.py | 22 - .../migrations/0289_auto_20191118_2256.py | 22 - .../migrations/0290_auto_20191118_2256.py | 21 - .../migrations/0291_auto_20191118_2309.py | 22 - .../migrations/0292_auto_20191119_1805.py | 22 - .../migrations/0293_auto_20191119_1811.py | 27 - .../migrations/0294_auto_20191125_1414.py | 22 - .../migrations/0295_auto_20191205_1702.py | 18 - .../migrations/0296_auto_20191206_1559.py | 21 - .../migrations/0296_auto_20191209_1029.py | 69 - .../migrations/0297_merge_20191216_1700.py | 14 - .../migrations/0297_merge_20191217_1200.py | 14 - .../migrations/0298_auto_20191216_1700.py | 33 - .../migrations/0298_auto_20191217_1200.py | 18 - safesite/migrations/0299_remove_menu_type.py | 17 - safesite/migrations/0300_menu_type.py | 18 - .../migrations/0301_auto_20191217_1414.py | 28 - safesite/migrations/0302_group_menulist.py | 19 - safesite/migrations/0303_trouble_yhlxo.py | 19 - .../migrations/0304_trouble_submituser.py | 19 - .../migrations/0305_merge_20200102_1722.py | 14 - .../migrations/0305_merge_20200108_1211.py | 14 - .../migrations/0306_auto_20200102_1722.py | 68 - .../migrations/0306_auto_20200108_1401.py | 106 - .../migrations/0307_auto_20200106_1125.py | 32 - .../migrations/0307_auto_20200110_1624.py | 36 - .../migrations/0308_auto_20200113_1150.py | 31 - .../0308_remove_companyinfo_liaison_fax.py | 17 - .../migrations/0309_auto_20200107_1704.py | 23 - .../0309_checktable_checkcontent.py | 19 - .../migrations/0310_auto_20200110_1452.py | 33 - .../migrations/0310_auto_20200114_1731.py | 19 - .../migrations/0311_auto_20200110_1604.py | 56 - .../migrations/0311_auto_20200115_1101.py | 82 - .../migrations/0312_auto_20200113_1209.py | 28 - .../migrations/0312_auto_20200115_1112.py | 36 - .../migrations/0313_auto_20200114_1201.py | 28 - .../migrations/0313_checkjob_checkname.py | 18 - .../migrations/0314_auto_20200114_1815.py | 22 - .../migrations/0314_auto_20200115_1414.py | 39 - .../migrations/0315_auto_20200115_0941.py | 23 - .../migrations/0315_auto_20200115_1421.py | 24 - .../migrations/0316_auto_20200115_1653.py | 27 - .../migrations/0316_auto_20200306_1444.py | 23 - .../migrations/0317_auto_20200212_2135.py | 48 - .../migrations/0318_auto_20200214_1427.py | 22 - .../migrations/0319_auto_20200301_1835.py | 27 - .../migrations/0320_auto_20200302_1402.py | 22 - .../0321_remove_companyinfo_liaison_fax.py | 17 - .../migrations/0322_auto_20200305_1411.py | 27 - .../migrations/0323_merge_20200312_0938.py | 14 - .../migrations/0324_auto_20200312_0939.py | 22 - .../migrations/0325_auto_20200312_1501.py | 32 - .../migrations/0326_auto_20200313_1348.py | 22 - .../migrations/0327_auto_20200318_1516.py | 22 - .../migrations/0328_auto_20200318_1652.py | 26 - .../migrations/0329_auto_20200323_0957.py | 27 - .../migrations/0330_auto_20200409_1530.py | 24 - .../migrations/0331_auto_20200414_1009.py | 49 - .../migrations/0332_auto_20200421_1354.py | 24 - .../migrations/0333_auto_20200424_1000.py | 19 - .../migrations/0334_auto_20200512_2244.py | 57 - .../migrations/0335_auto_20200526_2157.py | 22 - .../migrations/0336_auto_20200611_2150.py | 45 - .../migrations/0337_auto_20200614_1729.py | 27 - .../migrations/0338_auto_20200614_2155.py | 27 - .../migrations/0339_auto_20200619_2115.py | 24 - .../migrations/0340_auto_20200723_2206.py | 27 - .../migrations/0341_auto_20200811_2113.py | 22 - .../migrations/0342_auto_20200812_2046.py | 21 - .../migrations/0343_auto_20200812_2104.py | 22 - .../migrations/0344_auto_20200830_2053.py | 23 - .../migrations/0345_auto_20200830_2243.py | 27 - .../migrations/0346_auto_20200905_1756.py | 44 - .../migrations/0347_auto_20200905_1836.py | 35 - .../migrations/0348_auto_20200906_1527.py | 22 - .../migrations/0349_auto_20200906_2341.py | 27 - .../migrations/0350_auto_20200906_2344.py | 37 - .../migrations/0351_auto_20200908_1119.py | 50 - .../migrations/0352_auto_20200908_1151.py | 27 - .../migrations/0353_auto_20200908_1311.py | 35 - .../migrations/0354_auto_20200908_1407.py | 27 - .../0355_remove_companyinfo_liaison_fax.py | 17 - .../migrations/0356_auto_20200908_1646.py | 27 - .../migrations/0357_auto_20200909_1048.py | 42 - .../migrations/0358_auto_20200909_1315.py | 21 - .../migrations/0359_auto_20200926_0933.py | 257 --- .../migrations/0360_auto_20200927_2235.py | 37 - .../migrations/0361_auto_20200929_1423.py | 32 - .../migrations/0362_auto_20201012_0843.py | 142 -- .../migrations/0363_auto_20201015_2158.py | 32 - .../migrations/0364_auto_20201027_1656.py | 23 - .../migrations/0365_auto_20201115_2158.py | 44 - .../migrations/0366_auto_20201117_1314.py | 27 - .../migrations/0367_auto_20201117_1405.py | 22 - .../migrations/0368_auto_20201209_2145.py | 37 - .../migrations/0369_auto_20201223_2215.py | 35 - .../0370_remove_companyinfo_liaison_fax.py | 17 - .../migrations/0371_auto_20201227_1824.py | 31 - safesite/migrations/0372_train_trainplan.py | 19 - .../migrations/0373_trainplan_completion.py | 18 - .../migrations/0374_auto_20210104_2147.py | 23 - .../migrations/0375_auto_20210125_2120.py | 43 - .../0376_troublefollowtask_usable.py | 18 - .../0377_troublefollowtask_gridlevel.py | 19 - safesite/migrations/0378_offence.py | 31 - .../migrations/0379_auto_20210509_1916.py | 31 - .../0380_safefeedback_safeitem_safelist.py | 49 - .../migrations/0381_auto_20210523_1033.py | 18 - .../migrations/0382_auto_20210523_1110.py | 18 - safesite/migrations/0383_safelist_qrcode.py | 18 - 419 files changed, 1830 insertions(+), 11812 deletions(-) delete mode 100644 groups/migrations/0002_auto_20191017_0929.py rename groups/migrations/{0010_auto_20201115_2158.py => 0002_auto_20210611_0944.py} (60%) delete mode 100644 groups/migrations/0003_auto_20191024_1056.py delete mode 100644 groups/migrations/0004_auto_20191024_1109.py delete mode 100644 groups/migrations/0005_remove_group_member.py delete mode 100644 groups/migrations/0006_group_members.py delete mode 100644 groups/migrations/0007_role.py delete mode 100644 groups/migrations/0008_delete_role.py delete mode 100644 groups/migrations/0009_groupuser_issuper.py delete mode 100644 safesite/migrations/0002_auto_20180627_2206.py delete mode 100644 safesite/migrations/0003_auto_20180628_1159.py delete mode 100644 safesite/migrations/0004_auto_20180629_1642.py delete mode 100644 safesite/migrations/0005_auto_20180703_1551.py delete mode 100644 safesite/migrations/0006_troubleaccess_pgsj.py delete mode 100644 safesite/migrations/0007_trouble_todouser.py delete mode 100644 safesite/migrations/0008_auto_20180703_2139.py delete mode 100644 safesite/migrations/0009_trouble_yhpg.py delete mode 100644 safesite/migrations/0010_trouble_yhnum.py delete mode 100644 safesite/migrations/0011_troubleaccess_action.py delete mode 100644 safesite/migrations/0012_trouble_usecomp.py delete mode 100644 safesite/migrations/0013_auto_20180705_2242.py delete mode 100644 safesite/migrations/0014_auto_20180706_1500.py delete mode 100644 safesite/migrations/0015_trouble_xgsj.py delete mode 100644 safesite/migrations/0016_auto_20180706_1624.py delete mode 100644 safesite/migrations/0017_auto_20180706_1633.py delete mode 100644 safesite/migrations/0018_remove_trouble_zglx.py delete mode 100644 safesite/migrations/0019_auto_20180714_1457.py delete mode 100644 safesite/migrations/0020_remove_user_manager.py delete mode 100644 safesite/migrations/0021_auto_20180714_1602.py delete mode 100644 safesite/migrations/0022_auto_20180714_2133.py delete mode 100644 safesite/migrations/0023_auto_20180716_1447.py delete mode 100644 safesite/migrations/0024_auto_20180717_0926.py delete mode 100644 safesite/migrations/0025_auto_20180717_0928.py delete mode 100644 safesite/migrations/0026_auto_20180717_1624.py delete mode 100644 safesite/migrations/0027_trouble_zgsj.py delete mode 100644 safesite/migrations/0028_auto_20180718_1456.py delete mode 100644 safesite/migrations/0029_auto_20180718_1514.py delete mode 100644 safesite/migrations/0030_auto_20180718_2229.py delete mode 100644 safesite/migrations/0031_trouble_sybzt.py delete mode 100644 safesite/migrations/0032_auto_20180720_0853.py delete mode 100644 safesite/migrations/0033_yjyc.py delete mode 100644 safesite/migrations/0034_yjyc_usecomp.py delete mode 100644 safesite/migrations/0035_auto_20180830_1022.py delete mode 100644 safesite/migrations/0036_auto_20180830_1027.py delete mode 100644 safesite/migrations/0037_auto_20180830_1136.py delete mode 100644 safesite/migrations/0038_auto_20180830_1452.py delete mode 100644 safesite/migrations/0039_partment_iscompany.py delete mode 100644 safesite/migrations/0040_yjyc_b.py delete mode 100644 safesite/migrations/0041_auto_20180904_0850.py delete mode 100644 safesite/migrations/0042_auto_20180904_0857.py delete mode 100644 safesite/migrations/0043_auto_20180904_1522.py delete mode 100644 safesite/migrations/0044_auto_20180904_1532.py delete mode 100644 safesite/migrations/0045_auto_20180910_0902.py delete mode 100644 safesite/migrations/0046_auto_20180910_1811.py delete mode 100644 safesite/migrations/0047_auto_20181002_1113.py delete mode 100644 safesite/migrations/0048_remove_trouble_csyj.py delete mode 100644 safesite/migrations/0049_auto_20181010_2255.py delete mode 100644 safesite/migrations/0050_trouble_csqrr.py delete mode 100644 safesite/migrations/0051_auto_20181017_1115.py delete mode 100644 safesite/migrations/0052_auto_20181017_1533.py delete mode 100644 safesite/migrations/0053_auto_20181023_1708.py delete mode 100644 safesite/migrations/0054_auto_20181025_1134.py delete mode 100644 safesite/migrations/0055_auto_20181107_1430.py delete mode 100644 safesite/migrations/0056_auto_20181118_1144.py delete mode 100644 safesite/migrations/0057_user_issuper.py delete mode 100644 safesite/migrations/0058_auto_20181205_1107.py delete mode 100644 safesite/migrations/0059_auto_20181205_1113.py delete mode 100644 safesite/migrations/0060_remove_dickey_usecomps.py delete mode 100644 safesite/migrations/0061_dickey_usecomps.py delete mode 100644 safesite/migrations/0062_auto_20181205_1144.py delete mode 100644 safesite/migrations/0063_auto_20181206_1438.py delete mode 100644 safesite/migrations/0064_auto_20181206_1442.py delete mode 100644 safesite/migrations/0065_auto_20181206_1524.py delete mode 100644 safesite/migrations/0066_group_usercomp.py delete mode 100644 safesite/migrations/0067_auto_20181207_1600.py delete mode 100644 safesite/migrations/0068_group_grouptype.py delete mode 100644 safesite/migrations/0069_trouble_pgyj.py delete mode 100644 safesite/migrations/0070_auto_20181212_1628.py delete mode 100644 safesite/migrations/0071_auto_20181212_1709.py delete mode 100644 safesite/migrations/0072_menu.py delete mode 100644 safesite/migrations/0073_auto_20181217_1114.py delete mode 100644 safesite/migrations/0074_menu_parentid.py delete mode 100644 safesite/migrations/0075_auto_20181218_0847.py delete mode 100644 safesite/migrations/0076_auto_20181218_0935.py delete mode 100644 safesite/migrations/0077_menu_deletemark.py delete mode 100644 safesite/migrations/0078_user_iselse.py delete mode 100644 safesite/migrations/0079_auto_20181229_1620.py delete mode 100644 safesite/migrations/0080_auto_20190101_2031.py delete mode 100644 safesite/migrations/0081_dickey_nousecomps.py delete mode 100644 safesite/migrations/0082_observe.py delete mode 100644 safesite/migrations/0083_auto_20190108_1646.py delete mode 100644 safesite/migrations/0084_auto_20190108_1824.py delete mode 100644 safesite/migrations/0085_auto_20190109_0844.py delete mode 100644 safesite/migrations/0086_auto_20190109_0942.py delete mode 100644 safesite/migrations/0087_yjyc_buildtime.py delete mode 100644 safesite/migrations/0088_menu_icon.py delete mode 100644 safesite/migrations/0089_auto_20190116_1353.py delete mode 100644 safesite/migrations/0090_user_menulink.py delete mode 100644 safesite/migrations/0091_miss_relation.py delete mode 100644 safesite/migrations/0092_userprofile.py delete mode 100644 safesite/migrations/0093_socertificate.py delete mode 100644 safesite/migrations/0094_menu_sortnum.py delete mode 100644 safesite/migrations/0095_remove_user_menulink.py delete mode 100644 safesite/migrations/0096_socertificate_usecomp.py delete mode 100644 safesite/migrations/0097_auto_20190217_1535.py delete mode 100644 safesite/migrations/0098_auto_20190218_1016.py delete mode 100644 safesite/migrations/0099_train_lecturer.py delete mode 100644 safesite/migrations/0100_drill_chief.py delete mode 100644 safesite/migrations/0101_socertificate_zszt.py delete mode 100644 safesite/migrations/0102_partment_ismain.py delete mode 100644 safesite/migrations/0103_remove_partment_ismain.py delete mode 100644 safesite/migrations/0104_socertificate_url.py delete mode 100644 safesite/migrations/0105_suggest.py delete mode 100644 safesite/migrations/0106_auto_20190303_2201.py delete mode 100644 safesite/migrations/0107_user_usecomp.py delete mode 100644 safesite/migrations/0108_auto_20190303_2337.py delete mode 100644 safesite/migrations/0109_auto_20190304_0009.py delete mode 100644 safesite/migrations/0110_remove_suggest_deletemark.py delete mode 100644 safesite/migrations/0111_trouble_xzr.py delete mode 100644 safesite/migrations/0112_auto_20190305_1642.py delete mode 100644 safesite/migrations/0113_auto_20190306_1709.py delete mode 100644 safesite/migrations/0114_auto_20190307_1126.py delete mode 100644 safesite/migrations/0115_notice_usecomp.py delete mode 100644 safesite/migrations/0116_auto_20190307_1201.py delete mode 100644 safesite/migrations/0117_notice_deletemark.py delete mode 100644 safesite/migrations/0118_notice_reads.py delete mode 100644 safesite/migrations/0119_auto_20190310_1716.py delete mode 100644 safesite/migrations/0120_auto_20190314_1618.py delete mode 100644 safesite/migrations/0121_yjyc_observevalue.py delete mode 100644 safesite/migrations/0122_operation_operationsetting.py delete mode 100644 safesite/migrations/0123_auto_20190328_1548.py delete mode 100644 safesite/migrations/0124_delete_operation.py delete mode 100644 safesite/migrations/0125_operation.py delete mode 100644 safesite/migrations/0126_auto_20190331_2157.py delete mode 100644 safesite/migrations/0127_operation_zynr.py delete mode 100644 safesite/migrations/0128_auto_20190401_1455.py delete mode 100644 safesite/migrations/0129_auto_20190402_1651.py delete mode 100644 safesite/migrations/0130_auto_20190402_1706.py delete mode 100644 safesite/migrations/0131_auto_20190404_1455.py delete mode 100644 safesite/migrations/0132_auto_20190405_1207.py delete mode 100644 safesite/migrations/0133_fxcs_submittime.py delete mode 100644 safesite/migrations/0134_auto_20190405_1402.py delete mode 100644 safesite/migrations/0135_fxcs_cslx.py delete mode 100644 safesite/migrations/0136_auto_20190405_1825.py delete mode 100644 safesite/migrations/0137_auto_20190405_1828.py delete mode 100644 safesite/migrations/0138_auto_20190405_1916.py delete mode 100644 safesite/migrations/0139_remove_operationspjd_deletemark.py delete mode 100644 safesite/migrations/0140_auto_20190405_2350.py delete mode 100644 safesite/migrations/0141_auto_20190406_0021.py delete mode 100644 safesite/migrations/0142_auto_20190406_1305.py delete mode 100644 safesite/migrations/0142_auto_20190406_1506.py delete mode 100644 safesite/migrations/0143_merge_20190408_0940.py delete mode 100644 safesite/migrations/0144_auto_20190408_0940.py delete mode 100644 safesite/migrations/0145_operation_zydd.py delete mode 100644 safesite/migrations/0146_operation_zyimg2.py delete mode 100644 safesite/migrations/0147_auto_20190408_1359.py delete mode 100644 safesite/migrations/0148_auto_20190410_0904.py delete mode 100644 safesite/migrations/0149_auto_20190410_0909.py delete mode 100644 safesite/migrations/0150_trainuser_checked.py delete mode 100644 safesite/migrations/0151_auto_20190410_1731.py delete mode 100644 safesite/migrations/0152_auto_20190412_0855.py delete mode 100644 safesite/migrations/0153_dickey_detail.py delete mode 100644 safesite/migrations/0154_auto_20190418_1706.py delete mode 100644 safesite/migrations/0155_auto_20190419_1027.py delete mode 100644 safesite/migrations/0156_question_creatuser.py delete mode 100644 safesite/migrations/0157_auto_20190419_1130.py delete mode 100644 safesite/migrations/0158_question_station.py delete mode 100644 safesite/migrations/0159_auto_20190419_1651.py delete mode 100644 safesite/migrations/0160_auto_20190422_0945.py delete mode 100644 safesite/migrations/0161_examtest.py delete mode 100644 safesite/migrations/0162_exampaper_type.py delete mode 100644 safesite/migrations/0163_auto_20190422_1114.py delete mode 100644 safesite/migrations/0164_auto_20190423_0840.py delete mode 100644 safesite/migrations/0165_examtest_name.py delete mode 100644 safesite/migrations/0166_examtest_num.py delete mode 100644 safesite/migrations/0167_auto_20190423_1745.py delete mode 100644 safesite/migrations/0168_auto_20190423_1752.py delete mode 100644 safesite/migrations/0169_auto_20190423_1753.py delete mode 100644 safesite/migrations/0170_examtest_state.py delete mode 100644 safesite/migrations/0171_examtest_createuser.py delete mode 100644 safesite/migrations/0172_examtest_train.py delete mode 100644 safesite/migrations/0173_examtest_duration.py delete mode 100644 safesite/migrations/0174_remove_examtestdetail_wrongs.py delete mode 100644 safesite/migrations/0175_auto_20190426_1758.py delete mode 100644 safesite/migrations/0176_examtestdetail_passcode.py delete mode 100644 safesite/migrations/0177_auto_20190505_0852.py delete mode 100644 safesite/migrations/0178_auto_20190510_1752.py delete mode 100644 safesite/migrations/0179_dickey_parent.py delete mode 100644 safesite/migrations/0180_auto_20190514_1151.py delete mode 100644 safesite/migrations/0181_auto_20190514_1424.py delete mode 100644 safesite/migrations/0182_remove_questioncat_type.py delete mode 100644 safesite/migrations/0183_questioncat_partlink.py delete mode 100644 safesite/migrations/0184_auto_20190514_1531.py delete mode 100644 safesite/migrations/0185_remove_question_cate.py delete mode 100644 safesite/migrations/0186_auto_20190514_1651.py delete mode 100644 safesite/migrations/0187_auto_20190521_1119.py delete mode 100644 safesite/migrations/0188_safecert.py delete mode 100644 safesite/migrations/0189_auto_20190522_0056.py delete mode 100644 safesite/migrations/0190_auto_20190524_1115.py delete mode 100644 safesite/migrations/0191_auto_20190528_2250.py delete mode 100644 safesite/migrations/0192_auto_20190604_1032.py delete mode 100644 safesite/migrations/0193_map_link.py delete mode 100644 safesite/migrations/0194_auto_20190604_1148.py delete mode 100644 safesite/migrations/0195_auto_20190604_1437.py delete mode 100644 safesite/migrations/0196_auto_20190604_1736.py delete mode 100644 safesite/migrations/0197_map_default.py delete mode 100644 safesite/migrations/0198_auto_20190605_1110.py delete mode 100644 safesite/migrations/0199_auto_20190605_1636.py delete mode 100644 safesite/migrations/0200_remove_area_point.py delete mode 100644 safesite/migrations/0201_trouble_yhqy.py delete mode 100644 safesite/migrations/0202_miss_missqy.py delete mode 100644 safesite/migrations/0203_auto_20190614_1732.py delete mode 100644 safesite/migrations/0204_auto_20190616_1702.py delete mode 100644 safesite/migrations/0205_auto_20190616_1703.py delete mode 100644 safesite/migrations/0206_auto_20190617_0856.py delete mode 100644 safesite/migrations/0207_auto_20190617_1048.py delete mode 100644 safesite/migrations/0208_auto_20190617_1048.py delete mode 100644 safesite/migrations/0209_auto_20190617_1157.py delete mode 100644 safesite/migrations/0210_auto_20190617_1159.py delete mode 100644 safesite/migrations/0211_suggest_clcs.py delete mode 100644 safesite/migrations/0212_auto_20190618_1039.py delete mode 100644 safesite/migrations/0213_remove_suggest_jyimg2.py delete mode 100644 safesite/migrations/0214_suggest_jyimg2.py delete mode 100644 safesite/migrations/0215_auto_20190618_1044.py delete mode 100644 safesite/migrations/0216_auto_20190618_1445.py delete mode 100644 safesite/migrations/0217_suggest_shyj.py delete mode 100644 safesite/migrations/0218_auto_20190619_1652.py delete mode 100644 safesite/migrations/0219_auto_20190628_0807.py delete mode 100644 safesite/migrations/0220_auto_20190628_1620.py delete mode 100644 safesite/migrations/0221_auto_20190628_1659.py delete mode 100644 safesite/migrations/0222_auto_20190701_1756.py delete mode 100644 safesite/migrations/0223_auto_20190702_1058.py delete mode 100644 safesite/migrations/0224_equipment_state.py delete mode 100644 safesite/migrations/0225_auto_20190702_1709.py delete mode 100644 safesite/migrations/0226_auto_20190702_1827.py delete mode 100644 safesite/migrations/0227_auto_20190702_2144.py delete mode 100644 safesite/migrations/0228_auto_20190702_2156.py delete mode 100644 safesite/migrations/0229_area_usecomp.py delete mode 100644 safesite/migrations/0230_auto_20190702_2218.py delete mode 100644 safesite/migrations/0231_inspect_user.py delete mode 100644 safesite/migrations/0232_inspect_trouble.py delete mode 100644 safesite/migrations/0233_auto_20190709_1720.py delete mode 100644 safesite/migrations/0234_auto_20190709_1821.py delete mode 100644 safesite/migrations/0235_auto_20190709_2243.py delete mode 100644 safesite/migrations/0236_risk_gkcj.py delete mode 100644 safesite/migrations/0237_auto_20190710_1439.py delete mode 100644 safesite/migrations/0238_auto_20190710_1522.py delete mode 100644 safesite/migrations/0239_area_risklevel.py delete mode 100644 safesite/migrations/0240_riskact_group.py delete mode 100644 safesite/migrations/0241_auto_20190711_1634.py delete mode 100644 safesite/migrations/0242_equipment_qrcode.py delete mode 100644 safesite/migrations/0243_auto_20190717_1103.py delete mode 100644 safesite/migrations/0244_operation_zyqy.py delete mode 100644 safesite/migrations/0245_risk_modifytime.py delete mode 100644 safesite/migrations/0246_auto_20190805_2105.py delete mode 100644 safesite/migrations/0247_train_checkqr.py delete mode 100644 safesite/migrations/0248_risk_frequency.py delete mode 100644 safesite/migrations/0249_auto_20190808_1452.py delete mode 100644 safesite/migrations/0250_auto_20190808_1649.py delete mode 100644 safesite/migrations/0251_auto_20190808_1807.py delete mode 100644 safesite/migrations/0252_auto_20190809_1009.py delete mode 100644 safesite/migrations/0253_auto_20190811_0007.py delete mode 100644 safesite/migrations/0254_risktask_type.py delete mode 100644 safesite/migrations/0255_riskcheck.py delete mode 100644 safesite/migrations/0256_riskact_qrcode.py delete mode 100644 safesite/migrations/0257_report.py delete mode 100644 safesite/migrations/0258_yjyc_missvalue.py delete mode 100644 safesite/migrations/0259_auto_20190902_2129.py delete mode 100644 safesite/migrations/0260_auto_20190902_2144.py delete mode 100644 safesite/migrations/0261_auto_20190904_1844.py delete mode 100644 safesite/migrations/0262_auto_20190904_2246.py delete mode 100644 safesite/migrations/0263_examtest_qrcode.py delete mode 100644 safesite/migrations/0264_auto_20190909_0916.py delete mode 100644 safesite/migrations/0265_auto_20190912_1117.py delete mode 100644 safesite/migrations/0265_auto_20190917_1716.py delete mode 100644 safesite/migrations/0265_companyinfo.py delete mode 100644 safesite/migrations/0266_auto_20190912_1151.py delete mode 100644 safesite/migrations/0266_auto_20190917_2314.py delete mode 100644 safesite/migrations/0267_auto_20190917_1543.py delete mode 100644 safesite/migrations/0268_merge_20190919_1423.py delete mode 100644 safesite/migrations/0268_merge_20191009_0952.py delete mode 100644 safesite/migrations/0269_auto_20190919_1423.py delete mode 100644 safesite/migrations/0270_auto_20190920_1200.py delete mode 100644 safesite/migrations/0270_auto_20190923_1017.py delete mode 100644 safesite/migrations/0271_auto_20190923_1018.py delete mode 100644 safesite/migrations/0271_auto_20190925_1113.py delete mode 100644 safesite/migrations/0272_auto_20190923_1026.py delete mode 100644 safesite/migrations/0272_auto_20190925_1657.py delete mode 100644 safesite/migrations/0273_auto_20191008_1604.py delete mode 100644 safesite/migrations/0274_merge_20191011_1415.py delete mode 100644 safesite/migrations/0275_auto_20191011_1415.py delete mode 100644 safesite/migrations/0276_merge_20191017_0928.py delete mode 100644 safesite/migrations/0277_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0278_auto_20191018_1723.py delete mode 100644 safesite/migrations/0279_auto_20191022_1635.py delete mode 100644 safesite/migrations/0280_auto_20191023_1711.py delete mode 100644 safesite/migrations/0281_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0282_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0283_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0284_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0285_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0286_auto_20191030_1632.py delete mode 100644 safesite/migrations/0287_auto_20191118_2252.py delete mode 100644 safesite/migrations/0288_auto_20191118_2253.py delete mode 100644 safesite/migrations/0289_auto_20191118_2256.py delete mode 100644 safesite/migrations/0290_auto_20191118_2256.py delete mode 100644 safesite/migrations/0291_auto_20191118_2309.py delete mode 100644 safesite/migrations/0292_auto_20191119_1805.py delete mode 100644 safesite/migrations/0293_auto_20191119_1811.py delete mode 100644 safesite/migrations/0294_auto_20191125_1414.py delete mode 100644 safesite/migrations/0295_auto_20191205_1702.py delete mode 100644 safesite/migrations/0296_auto_20191206_1559.py delete mode 100644 safesite/migrations/0296_auto_20191209_1029.py delete mode 100644 safesite/migrations/0297_merge_20191216_1700.py delete mode 100644 safesite/migrations/0297_merge_20191217_1200.py delete mode 100644 safesite/migrations/0298_auto_20191216_1700.py delete mode 100644 safesite/migrations/0298_auto_20191217_1200.py delete mode 100644 safesite/migrations/0299_remove_menu_type.py delete mode 100644 safesite/migrations/0300_menu_type.py delete mode 100644 safesite/migrations/0301_auto_20191217_1414.py delete mode 100644 safesite/migrations/0302_group_menulist.py delete mode 100644 safesite/migrations/0303_trouble_yhlxo.py delete mode 100644 safesite/migrations/0304_trouble_submituser.py delete mode 100644 safesite/migrations/0305_merge_20200102_1722.py delete mode 100644 safesite/migrations/0305_merge_20200108_1211.py delete mode 100644 safesite/migrations/0306_auto_20200102_1722.py delete mode 100644 safesite/migrations/0306_auto_20200108_1401.py delete mode 100644 safesite/migrations/0307_auto_20200106_1125.py delete mode 100644 safesite/migrations/0307_auto_20200110_1624.py delete mode 100644 safesite/migrations/0308_auto_20200113_1150.py delete mode 100644 safesite/migrations/0308_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0309_auto_20200107_1704.py delete mode 100644 safesite/migrations/0309_checktable_checkcontent.py delete mode 100644 safesite/migrations/0310_auto_20200110_1452.py delete mode 100644 safesite/migrations/0310_auto_20200114_1731.py delete mode 100644 safesite/migrations/0311_auto_20200110_1604.py delete mode 100644 safesite/migrations/0311_auto_20200115_1101.py delete mode 100644 safesite/migrations/0312_auto_20200113_1209.py delete mode 100644 safesite/migrations/0312_auto_20200115_1112.py delete mode 100644 safesite/migrations/0313_auto_20200114_1201.py delete mode 100644 safesite/migrations/0313_checkjob_checkname.py delete mode 100644 safesite/migrations/0314_auto_20200114_1815.py delete mode 100644 safesite/migrations/0314_auto_20200115_1414.py delete mode 100644 safesite/migrations/0315_auto_20200115_0941.py delete mode 100644 safesite/migrations/0315_auto_20200115_1421.py delete mode 100644 safesite/migrations/0316_auto_20200115_1653.py delete mode 100644 safesite/migrations/0316_auto_20200306_1444.py delete mode 100644 safesite/migrations/0317_auto_20200212_2135.py delete mode 100644 safesite/migrations/0318_auto_20200214_1427.py delete mode 100644 safesite/migrations/0319_auto_20200301_1835.py delete mode 100644 safesite/migrations/0320_auto_20200302_1402.py delete mode 100644 safesite/migrations/0321_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0322_auto_20200305_1411.py delete mode 100644 safesite/migrations/0323_merge_20200312_0938.py delete mode 100644 safesite/migrations/0324_auto_20200312_0939.py delete mode 100644 safesite/migrations/0325_auto_20200312_1501.py delete mode 100644 safesite/migrations/0326_auto_20200313_1348.py delete mode 100644 safesite/migrations/0327_auto_20200318_1516.py delete mode 100644 safesite/migrations/0328_auto_20200318_1652.py delete mode 100644 safesite/migrations/0329_auto_20200323_0957.py delete mode 100644 safesite/migrations/0330_auto_20200409_1530.py delete mode 100644 safesite/migrations/0331_auto_20200414_1009.py delete mode 100644 safesite/migrations/0332_auto_20200421_1354.py delete mode 100644 safesite/migrations/0333_auto_20200424_1000.py delete mode 100644 safesite/migrations/0334_auto_20200512_2244.py delete mode 100644 safesite/migrations/0335_auto_20200526_2157.py delete mode 100644 safesite/migrations/0336_auto_20200611_2150.py delete mode 100644 safesite/migrations/0337_auto_20200614_1729.py delete mode 100644 safesite/migrations/0338_auto_20200614_2155.py delete mode 100644 safesite/migrations/0339_auto_20200619_2115.py delete mode 100644 safesite/migrations/0340_auto_20200723_2206.py delete mode 100644 safesite/migrations/0341_auto_20200811_2113.py delete mode 100644 safesite/migrations/0342_auto_20200812_2046.py delete mode 100644 safesite/migrations/0343_auto_20200812_2104.py delete mode 100644 safesite/migrations/0344_auto_20200830_2053.py delete mode 100644 safesite/migrations/0345_auto_20200830_2243.py delete mode 100644 safesite/migrations/0346_auto_20200905_1756.py delete mode 100644 safesite/migrations/0347_auto_20200905_1836.py delete mode 100644 safesite/migrations/0348_auto_20200906_1527.py delete mode 100644 safesite/migrations/0349_auto_20200906_2341.py delete mode 100644 safesite/migrations/0350_auto_20200906_2344.py delete mode 100644 safesite/migrations/0351_auto_20200908_1119.py delete mode 100644 safesite/migrations/0352_auto_20200908_1151.py delete mode 100644 safesite/migrations/0353_auto_20200908_1311.py delete mode 100644 safesite/migrations/0354_auto_20200908_1407.py delete mode 100644 safesite/migrations/0355_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0356_auto_20200908_1646.py delete mode 100644 safesite/migrations/0357_auto_20200909_1048.py delete mode 100644 safesite/migrations/0358_auto_20200909_1315.py delete mode 100644 safesite/migrations/0359_auto_20200926_0933.py delete mode 100644 safesite/migrations/0360_auto_20200927_2235.py delete mode 100644 safesite/migrations/0361_auto_20200929_1423.py delete mode 100644 safesite/migrations/0362_auto_20201012_0843.py delete mode 100644 safesite/migrations/0363_auto_20201015_2158.py delete mode 100644 safesite/migrations/0364_auto_20201027_1656.py delete mode 100644 safesite/migrations/0365_auto_20201115_2158.py delete mode 100644 safesite/migrations/0366_auto_20201117_1314.py delete mode 100644 safesite/migrations/0367_auto_20201117_1405.py delete mode 100644 safesite/migrations/0368_auto_20201209_2145.py delete mode 100644 safesite/migrations/0369_auto_20201223_2215.py delete mode 100644 safesite/migrations/0370_remove_companyinfo_liaison_fax.py delete mode 100644 safesite/migrations/0371_auto_20201227_1824.py delete mode 100644 safesite/migrations/0372_train_trainplan.py delete mode 100644 safesite/migrations/0373_trainplan_completion.py delete mode 100644 safesite/migrations/0374_auto_20210104_2147.py delete mode 100644 safesite/migrations/0375_auto_20210125_2120.py delete mode 100644 safesite/migrations/0376_troublefollowtask_usable.py delete mode 100644 safesite/migrations/0377_troublefollowtask_gridlevel.py delete mode 100644 safesite/migrations/0378_offence.py delete mode 100644 safesite/migrations/0379_auto_20210509_1916.py delete mode 100644 safesite/migrations/0380_safefeedback_safeitem_safelist.py delete mode 100644 safesite/migrations/0381_auto_20210523_1033.py delete mode 100644 safesite/migrations/0382_auto_20210523_1110.py delete mode 100644 safesite/migrations/0383_safelist_qrcode.py diff --git a/duibiao/calsim.py b/duibiao/calsim.py index 09b15b95..fc56c606 100644 --- a/duibiao/calsim.py +++ b/duibiao/calsim.py @@ -4,7 +4,7 @@ import pickle import warnings warnings.filterwarnings(action='ignore', category=UserWarning, module='gensim') from gensim import corpora, models, similarities -from gensim.summarization import bm25 +# from gensim.summarization import bm25 import os from django.conf import settings @@ -14,8 +14,8 @@ basedir = settings.BASE_DIR +'/duibiao/' #初始化部分数据 #设定停用词 stop_words = basedir + 'chineseStopWords.txt' -stopwords = codecs.open(stop_words,'r').readlines() -stopwords = [ w.strip() for w in stopwords ] +#stopwords = codecs.open(stop_words,'r').readlines() +stopwords = [ ] stop_flag = ['x', 'c', 'u','d', 'p', 't', 'uj', 'm', 'f', 'r'] #标准文件列表 diff --git a/groups/migrations/0001_initial.py b/groups/migrations/0001_initial.py index 904a0432..d42efddf 100644 --- a/groups/migrations/0001_initial.py +++ b/groups/migrations/0001_initial.py @@ -1,6 +1,7 @@ -# Generated by Django 2.1.5 on 2019-09-19 14:09 +# Generated by Django 2.2.8 on 2021-06-11 09:44 from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -12,20 +13,41 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='Groups', + name='Group', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=128, unique=True)), - ('password', models.CharField(max_length=256)), ('groupname', models.CharField(max_length=128, unique=True)), ('type', models.CharField(choices=[('real', '集团'), ('fictitious', '组合')], default='集团', max_length=32)), ('createtime', models.DateTimeField(auto_now_add=True)), - ('members', models.ManyToManyField(to='safesite.Partment')), ], options={ - 'ordering': ['-createtime'], - 'verbose_name_plural': '集团', 'verbose_name': '集团', + 'verbose_name_plural': '集团', + 'ordering': ['-createtime'], + }, + ), + migrations.CreateModel( + name='Groupmember', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ], + options={ + 'verbose_name': '集团-公司', + 'verbose_name_plural': '集团-公司', + }, + ), + migrations.CreateModel( + name='GroupUser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('username', models.CharField(max_length=128, unique=True)), + ('password', models.CharField(max_length=256)), + ('issuper', models.IntegerField(default=0)), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group')), + ], + options={ + 'verbose_name': '管理员', + 'verbose_name_plural': '管理员', }, ), ] diff --git a/groups/migrations/0002_auto_20191017_0929.py b/groups/migrations/0002_auto_20191017_0929.py deleted file mode 100644 index d0f4aa7f..00000000 --- a/groups/migrations/0002_auto_20191017_0929.py +++ /dev/null @@ -1,47 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-17 09:29 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0277_remove_companyinfo_liaison_fax'), - ('groups', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Group', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('groupname', models.CharField(max_length=128, unique=True)), - ('type', models.CharField(choices=[('real', '集团'), ('fictitious', '组合')], default='集团', max_length=32)), - ('createtime', models.DateTimeField(auto_now_add=True)), - ('members', models.ManyToManyField(to='safesite.Partment')), - ], - options={ - 'verbose_name': '集团', - 'ordering': ['-createtime'], - 'verbose_name_plural': '集团', - }, - ), - migrations.CreateModel( - name='GroupUser', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('username', models.CharField(max_length=128, unique=True)), - ('password', models.CharField(max_length=256)), - ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group')), - ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.RemoveField( - model_name='groups', - name='members', - ), - migrations.DeleteModel( - name='Groups', - ), - ] diff --git a/groups/migrations/0010_auto_20201115_2158.py b/groups/migrations/0002_auto_20210611_0944.py similarity index 60% rename from groups/migrations/0010_auto_20201115_2158.py rename to groups/migrations/0002_auto_20210611_0944.py index b539bd68..9eb76260 100644 --- a/groups/migrations/0010_auto_20201115_2158.py +++ b/groups/migrations/0002_auto_20210611_0944.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.8 on 2020-11-15 21:58 +# Generated by Django 2.2.8 on 2021-06-11 09:44 from django.db import migrations, models import django.db.models.deletion @@ -6,32 +6,32 @@ import django.db.models.deletion class Migration(migrations.Migration): + initial = True + dependencies = [ - ('groups', '0009_groupuser_issuper'), + ('groups', '0001_initial'), + ('safesite', '0001_initial'), ] operations = [ - migrations.AlterModelOptions( - name='groupmember', - options={'verbose_name': '集团-公司', 'verbose_name_plural': '集团-公司'}, + migrations.AddField( + model_name='groupuser', + name='user', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), ), - migrations.AlterModelOptions( - name='groupuser', - options={'verbose_name': '管理员', 'verbose_name_plural': '管理员'}, - ), - migrations.AlterField( - model_name='group', - name='members', - field=models.ManyToManyField(related_name='group_members', through='groups.Groupmember', to='safesite.Partment'), - ), - migrations.AlterField( + migrations.AddField( model_name='groupmember', name='group', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_group', to='groups.Group'), ), - migrations.AlterField( + migrations.AddField( model_name='groupmember', name='member', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groupmember_member', to='safesite.Partment'), ), + migrations.AddField( + model_name='group', + name='members', + field=models.ManyToManyField(related_name='group_members', through='groups.Groupmember', to='safesite.Partment'), + ), ] diff --git a/groups/migrations/0003_auto_20191024_1056.py b/groups/migrations/0003_auto_20191024_1056.py deleted file mode 100644 index 7b723403..00000000 --- a/groups/migrations/0003_auto_20191024_1056.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 10:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0281_remove_companyinfo_liaison_fax'), - ('groups', '0002_auto_20191017_0929'), - ] - - operations = [ - migrations.CreateModel( - name='Groupmember', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ], - ), - migrations.AddField( - model_name='groupmember', - name='group', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.Group'), - ), - migrations.AddField( - model_name='groupmember', - name='member', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/groups/migrations/0004_auto_20191024_1109.py b/groups/migrations/0004_auto_20191024_1109.py deleted file mode 100644 index 4f15b44a..00000000 --- a/groups/migrations/0004_auto_20191024_1109.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:09 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('groups', '0003_auto_20191024_1056'), - ] - - operations = [ - migrations.RenameField( - model_name='group', - old_name='members', - new_name='member', - ), - ] diff --git a/groups/migrations/0005_remove_group_member.py b/groups/migrations/0005_remove_group_member.py deleted file mode 100644 index d72f809e..00000000 --- a/groups/migrations/0005_remove_group_member.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('groups', '0004_auto_20191024_1109'), - ] - - operations = [ - migrations.RemoveField( - model_name='group', - name='member', - ), - ] diff --git a/groups/migrations/0006_group_members.py b/groups/migrations/0006_group_members.py deleted file mode 100644 index 6076ee27..00000000 --- a/groups/migrations/0006_group_members.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0285_remove_companyinfo_liaison_fax'), - ('groups', '0005_remove_group_member'), - ] - - operations = [ - migrations.AddField( - model_name='group', - name='members', - field=models.ManyToManyField(through='groups.Groupmember', to='safesite.Partment'), - ), - ] diff --git a/groups/migrations/0007_role.py b/groups/migrations/0007_role.py deleted file mode 100644 index 582923d4..00000000 --- a/groups/migrations/0007_role.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-02 17:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0306_auto_20200102_1722'), - ('groups', '0006_group_members'), - ] - - operations = [ - migrations.CreateModel( - name='Role', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=32, unique=True, verbose_name='角色')), - ('desc', models.CharField(blank=True, max_length=50, null=True, verbose_name='描述')), - ('permissions', models.ManyToManyField(blank=True, to='safesite.Menu', verbose_name='URL授权')), - ], - ), - ] diff --git a/groups/migrations/0008_delete_role.py b/groups/migrations/0008_delete_role.py deleted file mode 100644 index bc46547f..00000000 --- a/groups/migrations/0008_delete_role.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-06 11:25 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('groups', '0007_role'), - ] - - operations = [ - migrations.DeleteModel( - name='Role', - ), - ] diff --git a/groups/migrations/0009_groupuser_issuper.py b/groups/migrations/0009_groupuser_issuper.py deleted file mode 100644 index bfc93b84..00000000 --- a/groups/migrations/0009_groupuser_issuper.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-06 21:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('groups', '0008_delete_role'), - ] - - operations = [ - migrations.AddField( - model_name='groupuser', - name='issuper', - field=models.IntegerField(default=0), - ), - ] diff --git a/requirements.txt b/requirements.txt index 0d352b4f17d4cf333758f6f527d709f88abe8301..48593fad469e6000b330fc5bf3d2a84e58b88bda 100644 GIT binary patch delta 17 Ycmca4&?d0Khk0`pvkBAYGpub)05{?V$^ZZW delta 83 zcmZn@xFoQ_hnd%w!Ir_8L65-%hz&M-Gn+CQ7c*2cBs1hQ6fmSS7y+eifutUT1y~U; a0~bR8P~M9noFN1(X9yHG-(1Q%kqH2MtPVW@ diff --git a/safesite/datashowview.py b/safesite/datashowview.py index ad133865..4eaff043 100644 --- a/safesite/datashowview.py +++ b/safesite/datashowview.py @@ -16,7 +16,7 @@ from .export import exportdoc,exportxlsx,exportyjdoc,exportsimplexlsx,exportdoc2 from .daoru import drusers,drequipments,drrisks from django.forms.models import model_to_dict from .safespider import getTzzs,getAqzs -from duibiao import calsim +# from duibiao import calsim from django.db.models import Q from django.core.serializers.json import DjangoJSONEncoder from io import StringIO @@ -50,4 +50,4 @@ def getcompany(x): if a.ubelongpart.iscompany == 1: return str(a.ubelongpart.partid) else: - return a.ubelongpart.partlink.split(',')[1] \ No newline at end of file + return a.ubelongpart.partlink.split(',')[1] diff --git a/safesite/migrations/0001_initial.py b/safesite/migrations/0001_initial.py index 134fc805..03ad99bb 100644 --- a/safesite/migrations/0001_initial.py +++ b/safesite/migrations/0001_initial.py @@ -1,14 +1,1790 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-06-27 22:06 -from __future__ import unicode_literals +# Generated by Django 2.2.8 on 2021-06-11 09:44 -from django.db import migrations +import django.contrib.postgres.fields +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone class Migration(migrations.Migration): + initial = True + dependencies = [ + ('django_celery_beat', '0012_periodictask_expire_seconds'), ] operations = [ + migrations.CreateModel( + name='Area', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('name', models.CharField(max_length=50)), + ('polygon', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), + ('order', models.IntegerField(default=0)), + ('link', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('risklevel', models.CharField(blank=True, max_length=50, null=True)), + ('qrcode', models.CharField(blank=True, max_length=200, null=True)), + ], + ), + migrations.CreateModel( + name='Checkproject', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('checktitle', models.TextField()), + ('checkcontent', models.TextField()), + ('requirements', models.TextField()), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ], + ), + migrations.CreateModel( + name='Checktable', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('checktitle', models.TextField()), + ('checkcontent', models.TextField()), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('checkprjtype', models.ManyToManyField(to='safesite.Checkproject')), + ], + ), + migrations.CreateModel( + name='Dicclass', + fields=[ + ('dicid', models.AutoField(primary_key=True, serialize=False)), + ('dicname', models.CharField(max_length=30)), + ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')), + ], + ), + migrations.CreateModel( + name='Dickey', + fields=[ + ('dickeyid', models.AutoField(primary_key=True, serialize=False)), + ('dickeyname', models.CharField(max_length=200)), + ('usecomps', models.TextField(default=',1,')), + ('nousecomps', models.TextField(default='')), + ('detail', models.TextField(default='')), + ('deletemark', models.IntegerField(default='1')), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('dicparent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ], + ), + migrations.CreateModel( + name='Drill', + fields=[ + ('drillid', models.AutoField(primary_key=True, serialize=False)), + ('drillnum', models.CharField(default='1', max_length=100)), + ('drillname', models.CharField(max_length=100)), + ('drillplace', models.CharField(max_length=200)), + ('starttime', models.DateTimeField(default=django.utils.timezone.now)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('detailcontent', models.TextField(blank=True, null=True)), + ('commander', models.CharField(blank=True, max_length=200, null=True)), + ('otherparticipant', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('state', models.IntegerField(default='0')), + ('participantnum', models.IntegerField(blank=True, default='1', null=True)), + ('knownum', models.IntegerField(blank=True, default='1', null=True)), + ('plan', models.TextField(blank=True, null=True)), + ('material', models.TextField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='Edulesson', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('num', models.CharField(max_length=50)), + ('title', models.CharField(max_length=50)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('desciption', models.TextField(blank=True, null=True)), + ('type', models.IntegerField(default=1)), + ('deletemark', models.IntegerField(default=1)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('url', models.CharField(blank=True, max_length=200, null=True)), + ('downnum', models.IntegerField(default=0)), + ], + ), + migrations.CreateModel( + name='EFormItems', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('submittime', models.DateField(default=django.utils.timezone.now)), + ], + ), + migrations.CreateModel( + name='Equipment', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('num', models.CharField(blank=True, max_length=100, null=True)), + ('name', models.CharField(max_length=100)), + ('type', models.CharField(blank=True, max_length=100, null=True)), + ('catename', models.CharField(blank=True, max_length=100, null=True)), + ('parameter', models.TextField(blank=True, null=True)), + ('oem', models.CharField(blank=True, max_length=100, null=True)), + ('fnum', models.CharField(blank=True, max_length=100, null=True)), + ('fdate', models.DateField(blank=True, null=True)), + ('udate', models.DateField(blank=True, null=True)), + ('place', models.CharField(blank=True, max_length=100, null=True)), + ('note', models.TextField(blank=True, null=True)), + ('state', models.IntegerField(default=1)), + ('deletemark', models.IntegerField(default=1)), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('iskey', models.IntegerField(default=0)), + ('istz', models.IntegerField(default=0)), + ('img', models.CharField(blank=True, max_length=1000, null=True)), + ('qrcode', models.CharField(blank=True, max_length=200, null=True)), + ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area')), + ('cate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ], + ), + migrations.CreateModel( + name='EquipmentCheckItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, verbose_name='检查项目')), + ('content', models.TextField(verbose_name='检查内容')), + ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ], + ), + migrations.CreateModel( + name='ExamPaper', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('num', models.CharField(default='', max_length=200)), + ('name', models.CharField(max_length=200)), + ('state', models.IntegerField(default=1)), + ('deletemark', models.IntegerField(default=1)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('usecomps', models.TextField(default=',1,')), + ('nousecomps', models.TextField(default='')), + ('total', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), + ('is_open', models.BooleanField(default=False, verbose_name='公开可考')), + ], + ), + migrations.CreateModel( + name='ExamTest', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('num', models.CharField(default='', max_length=200)), + ('name', models.CharField(default='', max_length=200)), + ('type', models.IntegerField(default=1)), + ('state', models.IntegerField(default=1)), + ('ispublic', models.IntegerField(default=0)), + ('starttime', models.DateTimeField(blank=True, null=True)), + ('endtime', models.DateTimeField(blank=True, null=True)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('totalscore', models.IntegerField(default=100)), + ('passscore', models.IntegerField(default=60)), + ('duration', models.IntegerField(default=60)), + ('usecomps', models.TextField(default=',1,')), + ('nousecomps', models.TextField(default='')), + ('qrcode', models.CharField(blank=True, max_length=200, null=True)), + ('testnum', models.IntegerField(default=10, verbose_name='考试机会')), + ], + ), + migrations.CreateModel( + name='ExamTestDetail', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('testnum', models.IntegerField(default=0)), + ('remainnum', models.IntegerField(default=1, verbose_name='剩余次数')), + ('starttime', models.DateTimeField(blank=True, null=True)), + ('endtime', models.DateTimeField(blank=True, null=True)), + ('took', models.IntegerField(default=0)), + ('rights', models.IntegerField(default=1)), + ('passcode', models.IntegerField(default=0)), + ('testdetail', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), + ('score', models.FloatField(default=0)), + ('tms', models.TextField(default=',')), + ('wrongs', models.TextField(default=',')), + ('examtest', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest')), + ], + ), + migrations.CreateModel( + name='GridTaskSet', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('note', models.TextField(null=True, verbose_name='备注')), + ('expire', models.IntegerField(blank=True, null=True, verbose_name='执行有效期')), + ('count', models.IntegerField(default=0, verbose_name='派发次数')), + ('last_run_at', models.DateTimeField(blank=True, null=True, verbose_name='最近派发时间')), + ('gridlevel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey', verbose_name='网格化层级')), + ], + ), + migrations.CreateModel( + name='Group', + fields=[ + ('groupid', models.AutoField(primary_key=True, serialize=False)), + ('groupname', models.CharField(blank=True, max_length=30, null=True)), + ('grouptype', models.IntegerField(default=4)), + ('menulink', models.TextField(default='11')), + ('menulist', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None)), + ], + ), + migrations.CreateModel( + name='Inspect', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('state', models.IntegerField(default=1)), + ('content', models.TextField(blank=True, null=True)), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('equipment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Equipment')), + ], + ), + migrations.CreateModel( + name='Menu', + fields=[ + ('menuid', models.AutoField(primary_key=True, serialize=False, verbose_name='ID')), + ('menuname', models.CharField(blank=True, max_length=30, null=True, verbose_name='名称')), + ('menucode', models.CharField(blank=True, max_length=30, null=True, verbose_name='菜单标识')), + ('url', models.CharField(blank=True, max_length=30, null=True, verbose_name='操作地址')), + ('detail', models.CharField(blank=True, max_length=100, null=True, verbose_name='描述')), + ('icon', models.CharField(blank=True, max_length=100, null=True, verbose_name='图标')), + ('sortnum', models.IntegerField(default=1, verbose_name='排序号')), + ('deletemark', models.IntegerField(default=1, verbose_name='删除标记')), + ('type', models.IntegerField(choices=[(1, '菜单'), (2, '按钮')], default=1, verbose_name='类型')), + ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Menu', verbose_name='上级')), + ], + options={ + 'verbose_name': '菜单&按钮', + 'verbose_name_plural': '菜单&按钮', + }, + ), + migrations.CreateModel( + name='Miss', + fields=[ + ('missid', models.AutoField(primary_key=True, serialize=False)), + ('missnum', models.CharField(default='1', max_length=100)), + ('missplace', models.CharField(max_length=200)), + ('misstime', models.DateTimeField(default=django.utils.timezone.now)), + ('description', models.TextField(blank=True, null=True)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('deletemark', models.IntegerField(default='1')), + ('missimg', models.TextField(blank=True, null=True)), + ('prevent', models.TextField(blank=True, null=True)), + ('lesson', models.TextField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='Notice', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.CharField(max_length=100, verbose_name='标题')), + ('content', models.TextField(verbose_name='详情')), + ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('modifytime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新时间')), + ('material', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('reads', models.IntegerField(default=0)), + ('isgg', models.IntegerField(default='1')), + ('usecomps', models.TextField(blank=True, null=True)), + ('like', models.IntegerField(default=0)), + ('poster', models.CharField(blank=True, max_length=200, null=True, verbose_name='封面图')), + ], + ), + migrations.CreateModel( + name='Observe', + fields=[ + ('lookid', models.AutoField(primary_key=True, serialize=False)), + ('looknum', models.CharField(default='1', max_length=100)), + ('actname', models.CharField(max_length=100)), + ('lookplace', models.CharField(max_length=200)), + ('looktime', models.DateTimeField(default=django.utils.timezone.now)), + ('looktime2', models.DateTimeField(blank=True, null=True)), + ('lookeder', models.CharField(blank=True, max_length=100, null=True)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('otherunsafe', models.TextField(blank=True, null=True)), + ('makeresult', models.TextField(blank=True, null=True)), + ('safecontent', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('lookimg', models.TextField(blank=True, null=True)), + ('record1', models.TextField(blank=True, null=True)), + ('record2', models.TextField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='Operation', + fields=[ + ('zyid', models.AutoField(primary_key=True, serialize=False)), + ('zynum', models.CharField(max_length=100)), + ('zydd', models.CharField(blank=True, max_length=100, null=True)), + ('zynr', models.TextField(blank=True, null=True)), + ('kssj', models.DateTimeField(default=django.utils.timezone.now)), + ('jssj', models.DateTimeField(default=django.utils.timezone.now)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('zyimg', models.TextField(default='')), + ('zyimg2', models.TextField(default='')), + ('deletemark', models.IntegerField(default='1')), + ('zyzt', django.contrib.postgres.fields.jsonb.JSONField()), + ('fxcs', models.TextField()), + ('todousers', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None)), + ], + ), + migrations.CreateModel( + name='Operproce', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.CharField(max_length=50)), + ('operprocepath', models.CharField(blank=True, max_length=200, null=True)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('filepath', models.CharField(blank=True, max_length=200, null=True)), + ('reads', models.IntegerField(default='0')), + ], + ), + migrations.CreateModel( + name='Partment', + fields=[ + ('partid', models.AutoField(primary_key=True, serialize=False)), + ('partname', models.CharField(default='生产部', max_length=200)), + ('partlink', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('iscompany', models.IntegerField(default=0)), + ('aqy', models.TextField(default=',')), + ('bmzg', models.TextField(default=',')), + ('bsq', models.TextField(default=',')), + ('position', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='坐标')), + ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Risk', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('order', models.IntegerField(default=1)), + ('step', models.TextField(blank=True, null=True)), + ('hazard', models.TextField(blank=True, null=True)), + ('result', models.TextField(blank=True, null=True)), + ('measure1', models.TextField(blank=True, null=True)), + ('measure2', models.TextField(blank=True, null=True)), + ('measure3', models.TextField(blank=True, null=True)), + ('measure4', models.TextField(blank=True, null=True)), + ('measure5', models.TextField(blank=True, null=True)), + ('gkcj', models.CharField(blank=True, max_length=100, null=True)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now)), + ('riskl', models.DecimalField(decimal_places=1, max_digits=6)), + ('riske', models.DecimalField(decimal_places=1, max_digits=6)), + ('riskc', models.DecimalField(decimal_places=1, max_digits=6)), + ('riskd', models.DecimalField(decimal_places=1, max_digits=6)), + ('level', models.CharField(blank=True, max_length=50, null=True)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('tasktype', models.IntegerField(default=0)), + ('tasktime', models.DateTimeField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='RiskAct', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('kind', models.IntegerField(choices=[(1, '工厂'), (2, '矿山')], default=1, verbose_name='类型')), + ('place', models.CharField(blank=True, max_length=50, null=True)), + ('name', models.CharField(blank=True, max_length=200, null=True)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now)), + ('level', models.CharField(blank=True, max_length=50, null=True)), + ('qrcode', models.CharField(blank=True, max_length=200, null=True)), + ('gkcj', models.CharField(blank=True, max_length=50, null=True)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('tasktype', models.IntegerField(default=0)), + ('tasktime', models.DateTimeField(blank=True, null=True)), + ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskactarea', to='safesite.Area')), + ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('zrbm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrbm2', to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='RiskActTask', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('taskadd', models.DateTimeField(blank=True, null=True)), + ('taskdo', models.DateTimeField(blank=True, null=True)), + ('taskexpire', models.DateTimeField(blank=True, null=True)), + ('usable', models.IntegerField(default=1)), + ('type', models.IntegerField(default=1)), + ('note', models.TextField(blank=True, null=True)), + ('state', models.IntegerField(default=1)), + ('istask', models.IntegerField(default=0)), + ('tasknote', models.TextField(blank=True, null=True, verbose_name='任务检查说明')), + ('riskact', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct')), + ('taskset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.GridTaskSet', verbose_name='由哪个设置派发')), + ], + ), + migrations.CreateModel( + name='Suggest', + fields=[ + ('jyid', models.AutoField(primary_key=True, serialize=False)), + ('jynum', models.CharField(default='1', max_length=100)), + ('jyrq', models.DateField(default=django.utils.timezone.now)), + ('jyimg', models.TextField(blank=True, null=True)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('dqxz', models.TextField(blank=True, null=True)), + ('jynr', models.TextField(blank=True, null=True)), + ('qwxg', models.TextField(blank=True, null=True)), + ('jyfk', models.TextField(blank=True, null=True)), + ('clcs', models.TextField(blank=True, null=True)), + ('clms', models.TextField(blank=True, null=True)), + ('jyimg2', django.contrib.postgres.fields.jsonb.JSONField()), + ('jyzt', models.IntegerField(blank=True, choices=[(1, '待评估'), (2, '待处理'), (3, '待确认'), (4, '已归档')], null=True)), + ('jydd', models.CharField(blank=True, max_length=200, null=True)), + ('yjwcsj', models.DateTimeField(blank=True, null=True)), + ('sjwcsj', models.DateTimeField(blank=True, null=True)), + ('shyj', models.TextField(blank=True, null=True)), + ('accept', models.IntegerField(default=1)), + ], + ), + migrations.CreateModel( + name='Train', + fields=[ + ('trainid', models.AutoField(primary_key=True, serialize=False)), + ('trainnum', models.CharField(default='1', max_length=100)), + ('trainname', models.TextField()), + ('trainplace', models.TextField()), + ('starttime', models.DateTimeField(default=django.utils.timezone.now)), + ('duration', models.FloatField(default='1')), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('detailcontent', models.TextField(blank=True, null=True)), + ('teacher', models.CharField(blank=True, max_length=200, null=True)), + ('otherparticipant', models.TextField(blank=True, null=True)), + ('deletemark', models.IntegerField(default='1')), + ('state', models.IntegerField(default='0')), + ('jsqd', models.IntegerField(default=0, verbose_name='结束签到')), + ('participantnum', models.IntegerField(blank=True, default='1', null=True)), + ('knownum', models.IntegerField(blank=True, default='1', null=True)), + ('pxxg', models.TextField(blank=True, null=True)), + ('material', models.TextField(blank=True, null=True)), + ('checkqr', models.CharField(blank=True, max_length=200, null=True)), + ('examtest', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest')), + ], + ), + migrations.CreateModel( + name='Trouble', + fields=[ + ('deletemark', models.IntegerField(default='1')), + ('troubleid', models.AutoField(primary_key=True, serialize=False)), + ('yhnum', models.CharField(blank=True, max_length=100, null=True)), + ('fxsj', models.DateTimeField(default=django.utils.timezone.now)), + ('yhdd', models.CharField(default='test', max_length=400)), + ('yhms', models.TextField(blank=True)), + ('zgms', models.TextField(blank=True)), + ('yyfx', models.TextField(blank=True)), + ('zgcs', models.TextField(blank=True)), + ('yhtp', models.TextField(blank=True)), + ('zghtp', models.TextField(blank=True)), + ('yhzt', models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True)), + ('tbsj', models.DateTimeField(default=django.utils.timezone.now)), + ('xzr', models.CharField(default='', max_length=200)), + ('zgqx', models.DateTimeField(blank=True, null=True)), + ('zgsj', models.DateTimeField(blank=True, null=True)), + ('material', models.TextField(blank=True, null=True)), + ('xgsj', models.DateTimeField(auto_now=True)), + ('sybzt', models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True)), + ('shresult', models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改'), (5, '评估未通过'), (6, '未采纳')], null=True)), + ('fcyj', models.TextField(blank=True, null=True)), + ('shyj', models.TextField(blank=True, null=True)), + ('pgyj', models.TextField(blank=True, null=True)), + ], + ), + migrations.CreateModel( + name='User', + fields=[ + ('userid', models.AutoField(primary_key=True, serialize=False)), + ('empid', models.CharField(blank=True, max_length=20, null=True)), + ('username', models.CharField(max_length=30, unique=True)), + ('name', models.CharField(max_length=20)), + ('password', models.CharField(max_length=200)), + ('epassword', models.CharField(blank=True, max_length=200, null=True)), + ('openid', models.CharField(blank=True, max_length=200, null=True)), + ('nickname', models.CharField(blank=True, max_length=200, null=True)), + ('headimgurl', models.CharField(blank=True, max_length=200, null=True)), + ('issuper', models.IntegerField(default='0')), + ('deletemark', models.IntegerField(default='1')), + ('mpopenid', models.CharField(blank=True, max_length=200, null=True)), + ('ubelongpart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='upart', to='safesite.Partment')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Yjyc', + fields=[ + ('yjycid', models.AutoField(primary_key=True, serialize=False)), + ('buildtime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('year', models.IntegerField(blank=True, default=1, null=True)), + ('month', models.IntegerField(blank=True, default=1, null=True)), + ('week', models.IntegerField(blank=True, default=0, null=True)), + ('yjz', models.FloatField(default=0)), + ('ycz', models.FloatField(default=0)), + ('b', models.FloatField(default=0)), + ('troublevalue', models.FloatField(default=0)), + ('trainvalue', models.FloatField(default=0)), + ('drillvalue', models.FloatField(default=0)), + ('observevalue', models.FloatField(default=0)), + ('missvalue', models.FloatField(default=0)), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Yjsetup', + fields=[ + ('yjsetupid', models.AutoField(primary_key=True, serialize=False)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('monthyhavg', models.IntegerField(blank=True, default='100', null=True)), + ('safev', models.IntegerField(blank=True, default='10', null=True)), + ('warnv', models.IntegerField(blank=True, default='15', null=True)), + ('alertv', models.IntegerField(blank=True, default='20', null=True)), + ('maxv', models.IntegerField(blank=True, default='50', null=True)), + ('yhpgqz', models.IntegerField(blank=True, default='4', null=True)), + ('yhdjqz', models.IntegerField(blank=True, default='4', null=True)), + ('yhsblqz', models.IntegerField(blank=True, default='1', null=True)), + ('yhzglqz', models.IntegerField(blank=True, default='4', null=True)), + ('pxdjqz', models.IntegerField(blank=True, default='3', null=True)), + ('pxxgqz', models.IntegerField(blank=True, default='4', null=True)), + ('yldjqz', models.IntegerField(blank=True, default='3', null=True)), + ('ylxgqz', models.IntegerField(blank=True, default='3', null=True)), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Userprofile', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('realname', models.CharField(default='', max_length=50)), + ('gender', models.CharField(default='男', max_length=50)), + ('cardnum', models.CharField(default='', max_length=50)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='userprofile', to='safesite.User')), + ], + ), + migrations.CreateModel( + name='Unsafes', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('observe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe')), + ('unsafedicclass', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unsafedicclass', to='safesite.Dicclass')), + ('unsafedickey', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unsafedickey', to='safesite.Dickey')), + ], + ), + migrations.CreateModel( + name='TroubleFollowTask', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('taskadd', models.DateTimeField(blank=True, null=True, verbose_name='任务创建时间')), + ('taskdo', models.DateTimeField(blank=True, null=True, verbose_name='任务执行时间')), + ('taskexpire', models.DateTimeField(blank=True, null=True, verbose_name='任务过期时间')), + ('desc', models.TextField(blank=True, null=True, verbose_name='跟踪描述')), + ('tasknote', models.TextField(blank=True, null=True, verbose_name='任务执行说明')), + ('usable', models.IntegerField(default=1)), + ('gridlevel', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey', verbose_name='网格化层级')), + ('taskset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.GridTaskSet', verbose_name='由哪个设置派发')), + ('trouble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='跟踪人')), + ], + ), + migrations.CreateModel( + name='TroubleAccess', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('action', models.CharField(blank=True, max_length=100, null=True)), + ('opinion', models.CharField(max_length=500)), + ('result', models.IntegerField(blank=True, null=True)), + ('yhzt', models.IntegerField(default='1')), + ('accesssj', models.DateTimeField(default=django.utils.timezone.now)), + ('clr', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('troubleid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ], + ), + migrations.AddField( + model_name='trouble', + name='csqrr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='csqrr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='fcr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fcr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='fxbm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='trouble', + name='fxr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='jclx', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='trouble', + name='pgr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='pgsh', + field=models.ManyToManyField(related_name='pgsh', through='safesite.TroubleAccess', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='shr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='submituser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submituser', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='todouser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todor', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.AddField( + model_name='trouble', + name='yhdj', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='trouble', + name='yhlb', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='trouble', + name='yhlx', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'), + ), + migrations.AddField( + model_name='trouble', + name='yhlxo', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlxo', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='trouble', + name='yhpg', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='trouble', + name='yhqy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), + ), + migrations.AddField( + model_name='trouble', + name='zgbm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='trouble', + name='zgr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgr', to='safesite.User'), + ), + migrations.AddField( + model_name='trouble', + name='zpr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zpr', to='safesite.User'), + ), + migrations.CreateModel( + name='Trainuser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('checked', models.IntegerField(default=0)), + ('qdsj', models.DateTimeField(blank=True, null=True)), + ('jsqd', models.DateTimeField(blank=True, null=True, verbose_name='结束签到时间')), + ('isnew', models.IntegerField(default=0)), + ('opinion', models.TextField(blank=True, null=True, verbose_name='建议想法')), + ('score', models.IntegerField(blank=True, null=True, verbose_name='评价总体打分')), + ('examtestdetail', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTestDetail')), + ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('train', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Train')), + ], + ), + migrations.CreateModel( + name='TrainPlan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('purpose', models.TextField(verbose_name='培训目的')), + ('year', models.IntegerField(default=2021, verbose_name='年份')), + ('month', models.IntegerField(default=1, verbose_name='月份')), + ('period', models.IntegerField(default=0, verbose_name='预计学时')), + ('createtime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('deletemark', models.IntegerField(default=1)), + ('completion', models.FloatField(default=0, verbose_name='完成度')), + ('createby', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_createby', to='safesite.User')), + ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='trainplan_group', to='safesite.Group', verbose_name='组')), + ('manager', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_manager', to='safesite.User', verbose_name='负责人')), + ('updateby', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_updateby', to='safesite.User')), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.AddField( + model_name='train', + name='lecturer', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='train', + name='manlevel', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='rylx', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='train', + name='participant', + field=models.ManyToManyField(related_name='cjr', through='safesite.Trainuser', to='safesite.User'), + ), + migrations.AddField( + model_name='train', + name='submituser', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='tbr', to='safesite.User'), + ), + migrations.AddField( + model_name='train', + name='traincontent', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxnr', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='train', + name='trainlevel', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxjb', to='safesite.Dicclass'), + ), + migrations.AddField( + model_name='train', + name='trainpart', + field=models.ManyToManyField(default='1', related_name='pxbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='train', + name='trainplan', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.TrainPlan'), + ), + migrations.AddField( + model_name='train', + name='traintype', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxlx', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='train', + name='usecomp', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.CreateModel( + name='Suggestflow', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('action', models.CharField(blank=True, max_length=100, null=True)), + ('opinion', models.CharField(max_length=500)), + ('result', models.IntegerField(default=1)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('suggest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Suggest')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='suggest', + name='clr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sclr', to='safesite.User'), + ), + migrations.AddField( + model_name='suggest', + name='flow', + field=models.ManyToManyField(related_name='jyflow', through='safesite.Suggestflow', to='safesite.User'), + ), + migrations.AddField( + model_name='suggest', + name='jybm', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jybm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='suggest', + name='jylb', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jylb', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='suggest', + name='jyqy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), + ), + migrations.AddField( + model_name='suggest', + name='jyr', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jyr', to='safesite.User'), + ), + migrations.AddField( + model_name='suggest', + name='pgr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spgr', to='safesite.User'), + ), + migrations.AddField( + model_name='suggest', + name='todouser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stodouser', to='safesite.User'), + ), + migrations.AddField( + model_name='suggest', + name='usecomp', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.CreateModel( + name='Socertificate', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('realname', models.CharField(max_length=50)), + ('gender', models.CharField(max_length=50)), + ('cardnum', models.CharField(max_length=50)), + ('zylb', models.CharField(max_length=50)), + ('czxm', models.CharField(max_length=50)), + ('fzjg', models.CharField(max_length=100)), + ('ccfzrq', models.DateField(blank=True, null=True)), + ('yfsrq', models.DateField(blank=True, null=True)), + ('yxqkssj', models.DateField(blank=True, null=True)), + ('yxqjssj', models.DateField(blank=True, null=True)), + ('sjfssj', models.DateField(blank=True, null=True)), + ('zszt', models.IntegerField(blank=True, choices=[(1, '正常'), (2, '待复查'), (3, '超期')], null=True)), + ('url', models.TextField(blank=True, null=True)), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.CreateModel( + name='SafeList', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, verbose_name='清单名称')), + ('qrcode', models.CharField(blank=True, max_length=200, null=True)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('updatetime', models.DateTimeField(auto_now=True)), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='责任人')), + ], + ), + migrations.CreateModel( + name='SafeItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.TextField(verbose_name='清单项目名称')), + ('type', models.IntegerField(default=1)), + ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('updatetime', models.DateTimeField(auto_now=True)), + ('safelist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.SafeList', verbose_name='所属清单')), + ], + ), + migrations.CreateModel( + name='SafeFeedBack', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('isdone', models.IntegerField(default=1)), + ('content', models.TextField(verbose_name='反馈内容')), + ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('updatetime', models.DateTimeField(auto_now=True)), + ('safeitem', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.SafeItem')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='反馈人')), + ], + ), + migrations.CreateModel( + name='Safecert', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('realname', models.CharField(max_length=50)), + ('gender', models.CharField(max_length=50)), + ('cardnum', models.CharField(max_length=50)), + ('zglx', models.CharField(max_length=50)), + ('dwlx', models.CharField(max_length=50)), + ('fzjg', models.CharField(max_length=100)), + ('yfsrq', models.DateField(blank=True, null=True)), + ('yxqkssj', models.DateField(blank=True, null=True)), + ('yxqjssj', models.DateField(blank=True, null=True)), + ('zszt', models.IntegerField(blank=True, choices=[(1, '正常'), (2, '待复查'), (3, '超期')], null=True)), + ('url', models.TextField(blank=True, null=True)), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.CreateModel( + name='Role', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, unique=True, verbose_name='角色')), + ('desc', models.CharField(blank=True, max_length=200, null=True, verbose_name='描述')), + ('permissions', models.ManyToManyField(blank=True, to='safesite.Menu', verbose_name='URL授权')), + ], + ), + migrations.CreateModel( + name='Risktask', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('taskadd', models.DateTimeField(blank=True, null=True)), + ('taskdo', models.DateTimeField(blank=True, null=True)), + ('taskexpire', models.DateTimeField(blank=True, null=True)), + ('usable', models.IntegerField(default=1)), + ('type', models.IntegerField(default=1)), + ('note', models.TextField(blank=True, null=True)), + ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('risk', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk')), + ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.CreateModel( + name='Riskcheck2', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('dotime', models.DateTimeField(blank=True, null=True)), + ('note', models.TextField(blank=True, null=True)), + ('risk', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk')), + ('riskacttask', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskActTask')), + ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ], + ), + migrations.CreateModel( + name='Riskcheck', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('dotime', models.DateTimeField(blank=True, null=True)), + ('note', models.TextField(blank=True, null=True)), + ('risk', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk')), + ('risktask', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risktask')), + ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='riskacttask', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='riskact', + name='zrr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrr2', to='safesite.User'), + ), + migrations.AddField( + model_name='risk', + name='createuser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskcjr', to='safesite.User'), + ), + migrations.AddField( + model_name='risk', + name='group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), + ), + migrations.AddField( + model_name='risk', + name='riskact', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), + ), + migrations.AddField( + model_name='risk', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskusecomp', to='safesite.Partment'), + ), + migrations.AddField( + model_name='risk', + name='zrbm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='risk', + name='zrr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrr', to='safesite.User'), + ), + migrations.CreateModel( + name='Resbility', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.CharField(max_length=50)), + ('resbilitypath', models.CharField(blank=True, max_length=200, null=True)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('filepath', models.CharField(blank=True, max_length=200, null=True)), + ('reads', models.IntegerField(default='0')), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbbm', to='safesite.Partment')), + ('homeworktype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ('jobs', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbgs', to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Report', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('year', models.IntegerField(blank=True, null=True)), + ('month', models.IntegerField(blank=True, null=True)), + ('cause', models.TextField(blank=True, null=True)), + ('suggest', models.TextField(blank=True, null=True)), + ('part', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Relation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('remark', models.CharField(blank=True, max_length=200, null=True)), + ('drill', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Drill')), + ('miss', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Miss')), + ('observe', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe')), + ('train', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Train')), + ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), + ], + ), + migrations.CreateModel( + name='Regulations', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('typename', models.CharField(max_length=50)), + ('sortorder', models.IntegerField(default=0)), + ('deletemark', models.IntegerField(default=1)), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('createuser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rgs', to='safesite.User')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Regulations')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='ReaderOperproce', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('num', models.CharField(max_length=50)), + ('readertime', models.DateTimeField(default=django.utils.timezone.now)), + ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operproce')), + ], + ), + migrations.CreateModel( + name='Readerblility', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('num', models.CharField(max_length=50)), + ('readertime', models.DateTimeField(default=django.utils.timezone.now)), + ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Resbility')), + ], + ), + migrations.CreateModel( + name='Questioncat', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('name', models.CharField(max_length=30)), + ('deletemark', models.IntegerField(default='1')), + ('link', models.TextField(blank=True, default=',', null=True)), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('isopen', models.IntegerField(default=0)), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Question', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('title', models.TextField()), + ('type', models.IntegerField(default=1)), + ('level', models.IntegerField(default=1)), + ('mark', models.TextField(blank=True)), + ('answer', django.contrib.postgres.fields.jsonb.JSONField()), + ('right', django.contrib.postgres.fields.jsonb.JSONField()), + ('resolution', models.TextField()), + ('deletemark', models.IntegerField(default=1)), + ('creattime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('usecomps', models.TextField(default=',1,')), + ('nousecomps', models.TextField(default='')), + ('createuser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Question')), + ('questioncat', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat')), + ('station', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ], + ), + migrations.AddField( + model_name='partment', + name='role', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Role'), + ), + migrations.CreateModel( + name='Operzyry', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('checked', models.IntegerField(default=0)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('oper', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation')), + ('operzyry', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.CreateModel( + name='Operspxq', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('jdmc', models.CharField(max_length=200)), + ('action', models.CharField(max_length=200)), + ('checked', models.IntegerField(default=1)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('oper', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation')), + ('spbm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('spr', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='operproce', + name='createuser', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='operproce', + name='department', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='operproce', + name='homeworktype', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), + ), + migrations.AddField( + model_name='operproce', + name='jobs', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), + ), + migrations.AddField( + model_name='operproce', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optgs', to='safesite.Partment'), + ), + migrations.CreateModel( + name='Operationspjd', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('jdmc', models.CharField(max_length=100)), + ('sprs', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), + ('modifytime', models.DateTimeField(auto_now=True)), + ('spbm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spbm', to='safesite.Partment')), + ('spr', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spr', to='safesite.User')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('zylx', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ], + ), + migrations.AddField( + model_name='operation', + name='sdbm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sdbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='operation', + name='todouser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zyclr', to='safesite.User'), + ), + migrations.AddField( + model_name='operation', + name='usecomp', + field=models.ForeignKey(blank=True, default=1, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.AddField( + model_name='operation', + name='zybm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zybm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='operation', + name='zyfzr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zyfzr', to='safesite.User'), + ), + migrations.AddField( + model_name='operation', + name='zylx', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), + ), + migrations.AddField( + model_name='operation', + name='zyqy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), + ), + migrations.AddField( + model_name='operation', + name='zyry', + field=models.ManyToManyField(related_name='zyry', through='safesite.Operzyry', to='safesite.User'), + ), + migrations.CreateModel( + name='Offence', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type', models.CharField(default='公司员工', max_length=200, verbose_name='人员类型')), + ('dept', models.CharField(default='', max_length=200, verbose_name='车间')), + ('post', models.CharField(default='', max_length=200, verbose_name='岗位')), + ('place', models.CharField(default='', max_length=200, verbose_name='具体地点')), + ('parter', models.CharField(default='', max_length=200, verbose_name='当事人')), + ('description', models.TextField(blank=True, null=True, verbose_name='描述')), + ('imgs', models.TextField(blank=True, null=True, verbose_name='图片地址')), + ('happentime', models.DateTimeField(verbose_name='发生时间')), + ('createtime', models.DateTimeField(auto_now_add=True)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Area', verbose_name='区域')), + ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='举报人')), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司')), + ], + ), + migrations.CreateModel( + name='Observeto', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('read', models.IntegerField(default=0)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('observe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='observe', + name='looker', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='gcr', to='safesite.User'), + ), + migrations.AddField( + model_name='observe', + name='lookers', + field=models.ManyToManyField(related_name='gcrs', to='safesite.User'), + ), + migrations.AddField( + model_name='observe', + name='lookpart', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gcbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='observe', + name='reads', + field=models.ManyToManyField(related_name='observetouser', through='safesite.Observeto', to='safesite.User'), + ), + migrations.AddField( + model_name='observe', + name='unsafe', + field=models.ManyToManyField(related_name='baqxw', through='safesite.Unsafes', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='observe', + name='usecomp', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.CreateModel( + name='Noticeto', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('comment', models.CharField(max_length=500)), + ('read', models.IntegerField(default=0)), + ('islike', models.IntegerField(default=0)), + ('noticeid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Notice')), + ('receiver', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='notice', + name='pubpart', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fbbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='notice', + name='pubuser', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fbz', to='safesite.User'), + ), + migrations.AddField( + model_name='notice', + name='supply_part', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tgbm', to='safesite.Partment', verbose_name='资料提供部门'), + ), + migrations.AddField( + model_name='notice', + name='tousers', + field=models.ManyToManyField(related_name='tzry', through='safesite.Noticeto', to='safesite.User'), + ), + migrations.CreateModel( + name='MySchedule', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, verbose_name='名称')), + ('typeset', models.CharField(default=1, max_length=10, verbose_name='类型')), + ('crontab', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_celery_beat.CrontabSchedule')), + ('interval', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_celery_beat.IntervalSchedule')), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Missto', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('read', models.IntegerField(default=0)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('miss', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Miss')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='miss', + name='misser', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fsr', to='safesite.User'), + ), + migrations.AddField( + model_name='miss', + name='misspart', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fsbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='miss', + name='missqy', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), + ), + migrations.AddField( + model_name='miss', + name='reads', + field=models.ManyToManyField(related_name='misstouser', through='safesite.Missto', to='safesite.User'), + ), + migrations.AddField( + model_name='miss', + name='usecomp', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.CreateModel( + name='Mgtsystem', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('mgtname', models.CharField(max_length=50)), + ('mgtpath', models.CharField(blank=True, max_length=200, null=True)), + ('publisdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='Map', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('name', models.CharField(max_length=50)), + ('pic', models.TextField(blank=True)), + ('link', models.TextField(blank=True, null=True)), + ('default', models.IntegerField(default=0)), + ('deletemark', models.IntegerField(default='1')), + ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Map')), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.CreateModel( + name='InspectItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('checked', models.BooleanField(default=True, verbose_name='是否已检查')), + ('state', models.CharField(choices=[('正常', '正常'), ('异常待处理', '异常待处理'), ('异常已处理', '异常已处理')], default='正常', max_length=200, verbose_name='状态')), + ('handletime', models.DateTimeField(blank=True, null=True, verbose_name='处理时间')), + ('desc', models.TextField(blank=True, null=True, verbose_name='描述')), + ('img', models.TextField(blank=True, null=True, verbose_name='现场图片')), + ('img2', models.TextField(blank=True, null=True, verbose_name='处理后图片')), + ('desc2', models.TextField(blank=True, null=True, verbose_name='处理后描述')), + ('checkitem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckItem')), + ('inspect', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Inspect')), + ('todouser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='inspect', + name='trouble', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble'), + ), + migrations.AddField( + model_name='inspect', + name='type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Dickey', verbose_name='巡检类型'), + ), + migrations.AddField( + model_name='inspect', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.AddField( + model_name='inspect', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.CreateModel( + name='Groupuser2', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), + ('part', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='group', + name='usecomp', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='usecompg', to='safesite.Partment'), + ), + migrations.AddField( + model_name='group', + name='users', + field=models.ManyToManyField(related_name='userg', to='safesite.User'), + ), + migrations.AddField( + model_name='group', + name='users2', + field=models.ManyToManyField(related_name='userg2', through='safesite.Groupuser2', to='safesite.User'), + ), + migrations.AddField( + model_name='gridtaskset', + name='myschedule', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.MySchedule'), + ), + migrations.AddField( + model_name='gridtaskset', + name='periodictask', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_periodictask', to='django_celery_beat.PeriodicTask'), + ), + migrations.AddField( + model_name='gridtaskset', + name='riskact', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_riskact', to='safesite.RiskAct'), + ), + migrations.AddField( + model_name='gridtaskset', + name='trouble', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_trouble', to='safesite.Trouble'), + ), + migrations.AddField( + model_name='gridtaskset', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='执行人'), + ), + migrations.CreateModel( + name='Fxcs', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('fxfx', models.TextField()), + ('aqcs', models.TextField()), + ('cslx', models.TextField(blank=True, null=True)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('deletemark', models.IntegerField(default='1')), + ('usecomps', models.TextField(default=',1,')), + ('nousecomps', models.TextField(default='')), + ('zylx', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), + ], + ), + migrations.CreateModel( + name='FileReader', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('kindnum', models.CharField(max_length=50)), + ('readertime', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.CreateModel( + name='FileManage', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('maragename', models.CharField(max_length=100)), + ('maragepath', models.CharField(blank=True, max_length=200, null=True)), + ('readernum', models.IntegerField(default=0)), + ('publisdate', models.DateTimeField(default=django.utils.timezone.now)), + ('versionnum', models.CharField(max_length=100)), + ('maragestate', models.IntegerField(default=1)), + ('accessorytype', models.CharField(max_length=100)), + ('actualizedata', models.DateTimeField(default=django.utils.timezone.now)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('downnum', models.IntegerField(default=0)), + ('deletemark', models.IntegerField(default=1)), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ('maragetype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Regulations')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), + ], + ), + migrations.AddField( + model_name='examtestdetail', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='examtest', + name='createuser', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='kscjr', to='safesite.User'), + ), + migrations.AddField( + model_name='examtest', + name='exampaper', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamPaper'), + ), + migrations.AddField( + model_name='examtest', + name='user', + field=models.ManyToManyField(through='safesite.ExamTestDetail', to='safesite.User'), + ), + migrations.CreateModel( + name='ExamPaperDetail', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('score', models.IntegerField(default=0)), + ('exampaper', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamPaper')), + ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Question')), + ], + ), + migrations.AddField( + model_name='exampaper', + name='question', + field=models.ManyToManyField(through='safesite.ExamPaperDetail', to='safesite.Question'), + ), + migrations.CreateModel( + name='EquipmentCheckForm', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=200, verbose_name='名称')), + ('desc', models.TextField(verbose_name='描述')), + ('deletemark', models.IntegerField(default=1, verbose_name='删除标记')), + ('createby', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='创建人')), + ('items', models.ManyToManyField(related_name='checkitems', through='safesite.EFormItems', to='safesite.EquipmentCheckItem')), + ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司')), + ], + ), + migrations.AddField( + model_name='equipment', + name='checkform', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckForm'), + ), + migrations.AddField( + model_name='equipment', + name='riskact', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), + ), + migrations.AddField( + model_name='equipment', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sbssgs', to='safesite.Partment'), + ), + migrations.AddField( + model_name='equipment', + name='zrbm', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sbzrbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='equipment', + name='zrr', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='eformitems', + name='equipment_check_form', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckForm'), + ), + migrations.AddField( + model_name='eformitems', + name='equipment_check_item', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckItem'), + ), + migrations.CreateModel( + name='EdulessonWatch', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('submittime', models.DateTimeField(default=django.utils.timezone.now)), + ('edulesson', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Edulesson')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='edulesson', + name='cate', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat'), + ), + migrations.AddField( + model_name='edulesson', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.AddField( + model_name='edulesson', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='scr', to='safesite.User'), + ), + migrations.AddField( + model_name='edulesson', + name='watchrecord', + field=models.ManyToManyField(related_name='gkr', through='safesite.EdulessonWatch', to='safesite.User'), + ), + migrations.CreateModel( + name='Drilluser', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('score', models.IntegerField(blank=True, null=True)), + ('drillid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Drill')), + ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='drill', + name='chief', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='drill', + name='drillcontent', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='ylnr', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='drill', + name='drilllevel', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dicclass'), + ), + migrations.AddField( + model_name='drill', + name='drillpart', + field=models.ManyToManyField(default='1', related_name='ylbm', to='safesite.Partment'), + ), + migrations.AddField( + model_name='drill', + name='drilltype', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yllx', to='safesite.Dickey'), + ), + migrations.AddField( + model_name='drill', + name='participant', + field=models.ManyToManyField(related_name='ylcjr', through='safesite.Drilluser', to='safesite.User'), + ), + migrations.AddField( + model_name='drill', + name='submituser', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yltbr', to='safesite.User'), + ), + migrations.AddField( + model_name='drill', + name='usecomp', + field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), + migrations.CreateModel( + name='CompanyInfo', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=64, verbose_name='公司名称')), + ('nature', models.SmallIntegerField(choices=[(0, '国企'), (1, '私企')], default=0, verbose_name='企业性质')), + ('address', models.CharField(max_length=128, verbose_name='公司地址')), + ('fixed_assets', models.IntegerField(blank=True, null=True, verbose_name='固定资产')), + ('website', models.CharField(blank=True, max_length=64, null=True, verbose_name='公司网址')), + ('peoplenum', models.IntegerField(blank=True, null=True, verbose_name='公司人数')), + ('legalperson', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人代表')), + ('legalperson_phone', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人电话')), + ('liaison', models.CharField(max_length=24, verbose_name='联系人')), + ('liaison_phone', models.CharField(max_length=24, verbose_name='联系人电话')), + ('introduce', models.TextField(blank=True, null=True, verbose_name='公司概况')), + ('createtime', models.DateTimeField(auto_now_add=True)), + ('modifytime', models.DateTimeField(auto_now=True)), + ('partment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='公司ID')), + ], + ), + migrations.CreateModel( + name='Checktask', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('checktaskname', models.CharField(max_length=300)), + ('checktime', models.DateTimeField(blank=True, null=True)), + ('checkplace', models.TextField(default='')), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('tasktype', models.IntegerField(default=0)), + ('userlist', models.TextField(default='')), + ('zxstate', models.IntegerField(default=1)), + ('taskstate', models.IntegerField(default=1)), + ('checkname', models.ManyToManyField(related_name='jiancha', to='safesite.User')), + ('checktype', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Checktable')), + ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chuangjians', to='safesite.User')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taskscomp', to='safesite.Partment')), + ], + ), + migrations.AddField( + model_name='checktable', + name='createuser', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='checktable', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checktabcomp', to='safesite.Partment'), + ), + migrations.AddField( + model_name='checkproject', + name='createuser', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), + ), + migrations.AddField( + model_name='checkproject', + name='usecomp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checkcomp', to='safesite.Partment'), + ), + migrations.CreateModel( + name='Checkjob', + fields=[ + ('id', models.AutoField(primary_key=True, serialize=False)), + ('checkquestion', models.TextField(null=True)), + ('zgtime', models.DateTimeField(blank=True, null=True)), + ('jctime', models.DateTimeField(blank=True, null=True)), + ('createdate', models.DateTimeField(default=django.utils.timezone.now)), + ('deletemark', models.IntegerField(default=1)), + ('taskstate', models.IntegerField(default=1)), + ('starttime', models.DateTimeField(blank=True, null=True)), + ('endtime', models.DateTimeField(blank=True, null=True)), + ('jobstate', models.IntegerField(default=1)), + ('zgyq', models.TextField(null=True)), + ('zgjg', models.TextField(null=True)), + ('yanshou', models.DateTimeField(blank=True, null=True)), + ('content', models.TextField(null=True)), + ('yhtp', models.TextField(blank=True, null=True)), + ('zghtp', models.TextField(blank=True, null=True)), + ('checkname', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jianchas', to='safesite.User')), + ('checktask', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Checktask')), + ('createuser', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='chuangjian', to='safesite.User')), + ('pmpeople', models.ManyToManyField(related_name='bcfr', to='safesite.User')), + ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taskcomps', to='safesite.Partment')), + ('yanshouren', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yanshouren', to='safesite.User')), + ('zguser', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), + ], + ), + migrations.AddField( + model_name='area', + name='belongmap', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='belongmap', to='safesite.Map'), + ), + migrations.AddField( + model_name='area', + name='containmap', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='containmap', to='safesite.Map'), + ), + migrations.AddField( + model_name='area', + name='parent', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), + ), + migrations.AddField( + model_name='area', + name='usecomp', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), + ), ] diff --git a/safesite/migrations/0002_auto_20180627_2206.py b/safesite/migrations/0002_auto_20180627_2206.py deleted file mode 100644 index 5c1daae8..00000000 --- a/safesite/migrations/0002_auto_20180627_2206.py +++ /dev/null @@ -1,148 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-06-27 22:06 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('safesite', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Dicclass', - fields=[ - ('dicid', models.AutoField(primary_key=True, serialize=False)), - ('dicname', models.CharField(max_length=30)), - ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')), - ], - ), - migrations.CreateModel( - name='Dickey', - fields=[ - ('dickeyid', models.AutoField(primary_key=True, serialize=False)), - ('dickeyname', models.CharField(max_length=200)), - ('dicparent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Dicclass')), - ], - ), - migrations.CreateModel( - name='Partment', - fields=[ - ('partid', models.AutoField(primary_key=True, serialize=False)), - ('partname', models.CharField(default='生产部', max_length=30)), - ('partlink', models.CharField(blank=True, max_length=200)), - ('partmanager', models.IntegerField(blank=True, null=True)), - ('parentid', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.CreateModel( - name='Train', - fields=[ - ('trainid', models.AutoField(primary_key=True, serialize=False)), - ('trainname', models.CharField(max_length=100)), - ('trainplace', models.CharField(max_length=200)), - ('starttime', models.DateTimeField(default=django.utils.timezone.now)), - ('duration', models.FloatField(default='1')), - ('detailcontent', models.CharField(blank=True, max_length=1000, null=True)), - ('teacher', models.CharField(blank=True, max_length=200, null=True)), - ('otherparticipant', models.CharField(blank=True, max_length=1000, null=True)), - ('deletemark', models.IntegerField(default='1')), - ('state', models.IntegerField(default='0')), - ('participantnum', models.IntegerField(blank=True, default='1', null=True)), - ('knownum', models.IntegerField(blank=True, default='1', null=True)), - ('material', models.CharField(blank=True, max_length=1000, null=True)), - ('manlevel', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='rylx', to='safesite.Dickey')), - ], - ), - migrations.CreateModel( - name='Trouble', - fields=[ - ('troubleid', models.AutoField(primary_key=True, serialize=False)), - ('yhfxsj', models.DateTimeField(default=django.utils.timezone.now)), - ('zglx', models.IntegerField(choices=[(1, '立即整改'), (2, '限期整改'), (3, '限期整改B')], default='1')), - ('jclx', models.IntegerField(default='1')), - ('yhdd', models.CharField(default='test', max_length=200)), - ('yhdj', models.IntegerField(default='1')), - ('yhlx', models.IntegerField(default='1')), - ('yhlb', models.IntegerField(default='1')), - ('yhms', models.TextField(default='1')), - ('yhyyfx', models.TextField(blank=True)), - ('yhzgcs', models.TextField(blank=True)), - ('yhtp', models.CharField(blank=True, max_length=1000)), - ('zghtp', models.CharField(blank=True, max_length=1000)), - ('yhzt', models.IntegerField(choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭')], default='3')), - ('yhtbsj', models.DateTimeField(default=django.utils.timezone.now)), - ('yhfxbm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.CreateModel( - name='User', - fields=[ - ('userid', models.AutoField(primary_key=True, serialize=False)), - ('empid', models.CharField(blank=True, max_length=20)), - ('username', models.CharField(max_length=30)), - ('name', models.CharField(max_length=20)), - ('password', models.CharField(max_length=30)), - ('openid', models.CharField(default='0', max_length=200)), - ('manager', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('ubelongpart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='upart', to='safesite.Partment')), - ], - ), - migrations.AddField( - model_name='trouble', - name='yhfxr', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yhfxrname', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='yhtbr', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yhtbrname', to='safesite.User'), - ), - migrations.AddField( - model_name='train', - name='participant', - field=models.ManyToManyField(related_name='cjr', to='safesite.User'), - ), - migrations.AddField( - model_name='train', - name='submituser', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='tbr', to='safesite.User'), - ), - migrations.AddField( - model_name='train', - name='traincontent', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxnr', to='safesite.Dickey'), - ), - migrations.AddField( - model_name='train', - name='trainlevel', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxjb', to='safesite.Dicclass'), - ), - migrations.AddField( - model_name='train', - name='trainpart', - field=models.ManyToManyField(default='1', related_name='pxbm', to='safesite.Partment'), - ), - migrations.AddField( - model_name='train', - name='traintype', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='pxlx', to='safesite.Dickey'), - ), - migrations.AddField( - model_name='train', - name='usecomp', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - migrations.AddField( - model_name='dickey', - name='usecomp', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0003_auto_20180628_1159.py b/safesite/migrations/0003_auto_20180628_1159.py deleted file mode 100644 index f897bc99..00000000 --- a/safesite/migrations/0003_auto_20180628_1159.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-06-28 11:59 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0002_auto_20180627_2206'), - ] - - operations = [ - migrations.CreateModel( - name='Drill', - fields=[ - ('drillid', models.AutoField(primary_key=True, serialize=False)), - ('drillnum', models.CharField(default='1', max_length=100)), - ('drillname', models.CharField(max_length=100)), - ('drillplace', models.CharField(max_length=200)), - ('starttime', models.DateTimeField(default=django.utils.timezone.now)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('detailcontent', models.CharField(blank=True, max_length=1000, null=True)), - ('commander', models.CharField(blank=True, max_length=200, null=True)), - ('otherparticipant', models.CharField(blank=True, max_length=1000, null=True)), - ('deletemark', models.IntegerField(default='1')), - ('state', models.IntegerField(default='0')), - ('participantnum', models.IntegerField(blank=True, default='1', null=True)), - ('knownum', models.IntegerField(blank=True, default='1', null=True)), - ('plan', models.CharField(blank=True, max_length=1000, null=True)), - ('material', models.CharField(blank=True, max_length=1000, null=True)), - ('drillcontent', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='ylnr', to='safesite.Dickey')), - ('drilllevel', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dicclass')), - ('drillpart', models.ManyToManyField(default='1', related_name='ylbm', to='safesite.Partment')), - ('drilltype', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yllx', to='safesite.Dickey')), - ('participant', models.ManyToManyField(related_name='ylcjr', to='safesite.User')), - ('submituser', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yltbr', to='safesite.User')), - ('usecomp', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.AddField( - model_name='train', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AddField( - model_name='train', - name='submittime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='train', - name='trainnum', - field=models.CharField(default='1', max_length=100), - ), - ] diff --git a/safesite/migrations/0004_auto_20180629_1642.py b/safesite/migrations/0004_auto_20180629_1642.py deleted file mode 100644 index f30185e4..00000000 --- a/safesite/migrations/0004_auto_20180629_1642.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-06-29 16:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0003_auto_20180628_1159'), - ] - - operations = [ - migrations.AlterField( - model_name='drill', - name='drilllevel', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0005_auto_20180703_1551.py b/safesite/migrations/0005_auto_20180703_1551.py deleted file mode 100644 index 7a22ae6d..00000000 --- a/safesite/migrations/0005_auto_20180703_1551.py +++ /dev/null @@ -1,125 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-03 15:51 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0004_auto_20180629_1642'), - ] - - operations = [ - migrations.CreateModel( - name='TroubleAccess', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('opinion', models.CharField(max_length=500)), - ('result', models.IntegerField(default='1')), - ], - ), - migrations.RenameField( - model_name='trouble', - old_name='yhfxsj', - new_name='fxsj', - ), - migrations.RenameField( - model_name='trouble', - old_name='yhtbsj', - new_name='tbsj', - ), - migrations.RenameField( - model_name='trouble', - old_name='yhyyfx', - new_name='yyfx', - ), - migrations.RemoveField( - model_name='trouble', - name='yhfxbm', - ), - migrations.RemoveField( - model_name='trouble', - name='yhfxr', - ), - migrations.RemoveField( - model_name='trouble', - name='yhtbr', - ), - migrations.RemoveField( - model_name='trouble', - name='yhzgcs', - ), - migrations.AddField( - model_name='partment', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AddField( - model_name='trouble', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AddField( - model_name='trouble', - name='fxbm', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fxbm', to='safesite.Partment'), - ), - migrations.AddField( - model_name='trouble', - name='fxr', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fxr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='material', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='trouble', - name='tbr', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhtbr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='zgbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgbm', to='safesite.Partment'), - ), - migrations.AddField( - model_name='trouble', - name='zgcs', - field=models.TextField(blank=True), - ), - migrations.AddField( - model_name='trouble', - name='zgr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgr', to='safesite.User'), - ), - migrations.AddField( - model_name='user', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AlterField( - model_name='trouble', - name='zglx', - field=models.IntegerField(choices=[(1, '立即整改'), (2, '限期整改')], default='1'), - ), - migrations.AddField( - model_name='troubleaccess', - name='pgshr', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='troubleaccess', - name='troubleid', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble'), - ), - migrations.AddField( - model_name='trouble', - name='pgsh', - field=models.ManyToManyField(related_name='pgsh', through='safesite.TroubleAccess', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0006_troubleaccess_pgsj.py b/safesite/migrations/0006_troubleaccess_pgsj.py deleted file mode 100644 index accf3a85..00000000 --- a/safesite/migrations/0006_troubleaccess_pgsj.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-03 15:54 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0005_auto_20180703_1551'), - ] - - operations = [ - migrations.AddField( - model_name='troubleaccess', - name='pgsj', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/safesite/migrations/0007_trouble_todouser.py b/safesite/migrations/0007_trouble_todouser.py deleted file mode 100644 index 6ab0da48..00000000 --- a/safesite/migrations/0007_trouble_todouser.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-03 17:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0006_troubleaccess_pgsj'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='todouser', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='todor', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0008_auto_20180703_2139.py b/safesite/migrations/0008_auto_20180703_2139.py deleted file mode 100644 index f4a105fd..00000000 --- a/safesite/migrations/0008_auto_20180703_2139.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-03 21:39 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0007_trouble_todouser'), - ] - - operations = [ - migrations.AddField( - model_name='dickey', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AlterField( - model_name='trouble', - name='jclx', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhdj', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlb', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlx', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'), - ), - ] diff --git a/safesite/migrations/0009_trouble_yhpg.py b/safesite/migrations/0009_trouble_yhpg.py deleted file mode 100644 index 467eda83..00000000 --- a/safesite/migrations/0009_trouble_yhpg.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-03 21:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0008_auto_20180703_2139'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='yhpg', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0010_trouble_yhnum.py b/safesite/migrations/0010_trouble_yhnum.py deleted file mode 100644 index b7782d26..00000000 --- a/safesite/migrations/0010_trouble_yhnum.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-04 10:43 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0009_trouble_yhpg'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='yhnum', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0011_troubleaccess_action.py b/safesite/migrations/0011_troubleaccess_action.py deleted file mode 100644 index b1ff5a72..00000000 --- a/safesite/migrations/0011_troubleaccess_action.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-05 10:02 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0010_trouble_yhnum'), - ] - - operations = [ - migrations.AddField( - model_name='troubleaccess', - name='action', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0012_trouble_usecomp.py b/safesite/migrations/0012_trouble_usecomp.py deleted file mode 100644 index 5acc421b..00000000 --- a/safesite/migrations/0012_trouble_usecomp.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-05 14:48 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0011_troubleaccess_action'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='usecomp', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0013_auto_20180705_2242.py b/safesite/migrations/0013_auto_20180705_2242.py deleted file mode 100644 index 251ded88..00000000 --- a/safesite/migrations/0013_auto_20180705_2242.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-05 22:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0012_trouble_usecomp'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='zgxq', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhdj', - field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlb', - field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlx', - field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'), - ), - migrations.AlterField( - model_name='trouble', - name='yhms', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhpg', - field=models.ForeignKey(blank=True, default='1', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0014_auto_20180706_1500.py b/safesite/migrations/0014_auto_20180706_1500.py deleted file mode 100644 index 859f5603..00000000 --- a/safesite/migrations/0014_auto_20180706_1500.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-06 15:00 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0013_auto_20180705_2242'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='todouser2', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='todor2', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='zgms', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhzt', - field=models.IntegerField(choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭'), (5, '措施/方案待确认')], default='3'), - ), - ] diff --git a/safesite/migrations/0015_trouble_xgsj.py b/safesite/migrations/0015_trouble_xgsj.py deleted file mode 100644 index 334505f1..00000000 --- a/safesite/migrations/0015_trouble_xgsj.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-06 16:02 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0014_auto_20180706_1500'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='xgsj', - field=models.DateTimeField(auto_now=True), - ), - ] diff --git a/safesite/migrations/0016_auto_20180706_1624.py b/safesite/migrations/0016_auto_20180706_1624.py deleted file mode 100644 index a5cd410d..00000000 --- a/safesite/migrations/0016_auto_20180706_1624.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-06 16:24 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0015_trouble_xgsj'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='fxbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxbm', to='safesite.Partment'), - ), - migrations.AlterField( - model_name='trouble', - name='fxr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fxr', to='safesite.User'), - ), - migrations.AlterField( - model_name='trouble', - name='jclx', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='tbr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhtbr', to='safesite.User'), - ), - migrations.AlterField( - model_name='trouble', - name='todouser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todor', to='safesite.User'), - ), - migrations.AlterField( - model_name='trouble', - name='todouser2', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todor2', to='safesite.User'), - ), - migrations.AlterField( - model_name='trouble', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - migrations.AlterField( - model_name='trouble', - name='yhdj', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhdj', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlb', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlb', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhlx', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlx', to='safesite.Dicclass'), - ), - migrations.AlterField( - model_name='trouble', - name='yhpg', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhpg', to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='trouble', - name='yhzt', - field=models.IntegerField(blank=True, choices=[(3, '待关闭'), (1, '待评估'), (2, '待整改'), (4, '已关闭'), (5, '措施/方案待确认')], null=True), - ), - ] diff --git a/safesite/migrations/0017_auto_20180706_1633.py b/safesite/migrations/0017_auto_20180706_1633.py deleted file mode 100644 index 3dc7ef47..00000000 --- a/safesite/migrations/0017_auto_20180706_1633.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-06 16:33 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0016_auto_20180706_1624'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='jclx', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='jclx', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0018_remove_trouble_zglx.py b/safesite/migrations/0018_remove_trouble_zglx.py deleted file mode 100644 index aa9c9fd2..00000000 --- a/safesite/migrations/0018_remove_trouble_zglx.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-13 17:51 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0017_auto_20180706_1633'), - ] - - operations = [ - migrations.RemoveField( - model_name='trouble', - name='zglx', - ), - ] diff --git a/safesite/migrations/0019_auto_20180714_1457.py b/safesite/migrations/0019_auto_20180714_1457.py deleted file mode 100644 index 6f6dcc53..00000000 --- a/safesite/migrations/0019_auto_20180714_1457.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-14 14:57 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0018_remove_trouble_zglx'), - ] - - operations = [ - migrations.CreateModel( - name='Group', - fields=[ - ('groupid', models.AutoField(primary_key=True, serialize=False)), - ('groupname', models.CharField(blank=True, max_length=30, null=True)), - ('users', models.ManyToManyField(related_name='userg', to='safesite.User')), - ], - ), - migrations.RemoveField( - model_name='partment', - name='partmanager', - ), - ] diff --git a/safesite/migrations/0020_remove_user_manager.py b/safesite/migrations/0020_remove_user_manager.py deleted file mode 100644 index 12d7336e..00000000 --- a/safesite/migrations/0020_remove_user_manager.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-14 15:39 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0019_auto_20180714_1457'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='manager', - ), - ] diff --git a/safesite/migrations/0021_auto_20180714_1602.py b/safesite/migrations/0021_auto_20180714_1602.py deleted file mode 100644 index 2442ec06..00000000 --- a/safesite/migrations/0021_auto_20180714_1602.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-14 16:02 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0020_remove_user_manager'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='isaqy', - field=models.IntegerField(default='0'), - ), - migrations.AddField( - model_name='user', - name='isbmzg', - field=models.IntegerField(default='0'), - ), - ] diff --git a/safesite/migrations/0022_auto_20180714_2133.py b/safesite/migrations/0022_auto_20180714_2133.py deleted file mode 100644 index fb1a71a9..00000000 --- a/safesite/migrations/0022_auto_20180714_2133.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-14 21:33 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0021_auto_20180714_1602'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='username', - field=models.CharField(max_length=30, unique=True), - ), - ] diff --git a/safesite/migrations/0023_auto_20180716_1447.py b/safesite/migrations/0023_auto_20180716_1447.py deleted file mode 100644 index 24ba7c02..00000000 --- a/safesite/migrations/0023_auto_20180716_1447.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-16 14:47 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0022_auto_20180714_2133'), - ] - - operations = [ - migrations.RemoveField( - model_name='trouble', - name='tbr', - ), - migrations.RemoveField( - model_name='trouble', - name='todouser2', - ), - migrations.AddField( - model_name='trouble', - name='pgfcr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgfcr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='zgshr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zgshr', to='safesite.User'), - ), - migrations.AlterField( - model_name='trouble', - name='yhzt', - field=models.IntegerField(blank=True, choices=[(5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核')], null=True), - ), - ] diff --git a/safesite/migrations/0024_auto_20180717_0926.py b/safesite/migrations/0024_auto_20180717_0926.py deleted file mode 100644 index 44e97752..00000000 --- a/safesite/migrations/0024_auto_20180717_0926.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-17 09:26 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0023_auto_20180716_1447'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='shresult', - field=models.IntegerField(default='1'), - ), - migrations.AlterField( - model_name='trouble', - name='yhzt', - field=models.IntegerField(blank=True, choices=[(5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True), - ), - ] diff --git a/safesite/migrations/0025_auto_20180717_0928.py b/safesite/migrations/0025_auto_20180717_0928.py deleted file mode 100644 index 4f6297db..00000000 --- a/safesite/migrations/0025_auto_20180717_0928.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-17 09:28 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0024_auto_20180717_0926'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='shresult', - field=models.IntegerField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0026_auto_20180717_1624.py b/safesite/migrations/0026_auto_20180717_1624.py deleted file mode 100644 index cd03ae0a..00000000 --- a/safesite/migrations/0026_auto_20180717_1624.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-17 16:24 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0025_auto_20180717_0928'), - ] - - operations = [ - migrations.RenameField( - model_name='trouble', - old_name='zgxq', - new_name='zgqx', - ), - ] diff --git a/safesite/migrations/0027_trouble_zgsj.py b/safesite/migrations/0027_trouble_zgsj.py deleted file mode 100644 index 16c45ec5..00000000 --- a/safesite/migrations/0027_trouble_zgsj.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-17 22:20 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0026_auto_20180717_1624'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='zgsj', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0028_auto_20180718_1456.py b/safesite/migrations/0028_auto_20180718_1456.py deleted file mode 100644 index b564b7d4..00000000 --- a/safesite/migrations/0028_auto_20180718_1456.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-18 14:56 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0027_trouble_zgsj'), - ] - - operations = [ - migrations.RenameField( - model_name='troubleaccess', - old_name='pgsj', - new_name='accesssj', - ), - migrations.AddField( - model_name='troubleaccess', - name='yhzt', - field=models.IntegerField(default='1'), - ), - migrations.AlterField( - model_name='troubleaccess', - name='result', - field=models.IntegerField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0029_auto_20180718_1514.py b/safesite/migrations/0029_auto_20180718_1514.py deleted file mode 100644 index 46963a00..00000000 --- a/safesite/migrations/0029_auto_20180718_1514.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-18 15:14 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0028_auto_20180718_1456'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='fcyj', - field=models.TextField(blank=True), - ), - migrations.AddField( - model_name='trouble', - name='shyj', - field=models.TextField(blank=True), - ), - ] diff --git a/safesite/migrations/0030_auto_20180718_2229.py b/safesite/migrations/0030_auto_20180718_2229.py deleted file mode 100644 index 236cfb33..00000000 --- a/safesite/migrations/0030_auto_20180718_2229.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-07-18 22:29 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0029_auto_20180718_1514'), - ] - - operations = [ - migrations.RenameField( - model_name='troubleaccess', - old_name='pgshr', - new_name='clr', - ), - migrations.AddField( - model_name='trouble', - name='csyj', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhzt', - field=models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True), - ), - ] diff --git a/safesite/migrations/0031_trouble_sybzt.py b/safesite/migrations/0031_trouble_sybzt.py deleted file mode 100644 index ee0cffc7..00000000 --- a/safesite/migrations/0031_trouble_sybzt.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-19 10:55 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0030_auto_20180718_2229'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='sybzt', - field=models.IntegerField(blank=True, choices=[(7, '措施/方案待提交'), (5, '待复查'), (1, '待评估'), (3, '待整改'), (6, '已归档'), (2, '措施/方案待确认'), (4, '待审核'), (0, '待新增')], null=True), - ), - ] diff --git a/safesite/migrations/0032_auto_20180720_0853.py b/safesite/migrations/0032_auto_20180720_0853.py deleted file mode 100644 index cb44d0c7..00000000 --- a/safesite/migrations/0032_auto_20180720_0853.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-07-20 08:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0031_trouble_sybzt'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='shresult', - field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改')], null=True), - ), - ] diff --git a/safesite/migrations/0033_yjyc.py b/safesite/migrations/0033_yjyc.py deleted file mode 100644 index 58d8d2f2..00000000 --- a/safesite/migrations/0033_yjyc.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-29 15:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0032_auto_20180720_0853'), - ] - - operations = [ - migrations.CreateModel( - name='Yjyc', - fields=[ - ('yjycid', models.AutoField(primary_key=True, serialize=False)), - ('yjsj', models.CharField(max_length=20)), - ('yjz', models.IntegerField(blank=True, null=True)), - ('ycz', models.IntegerField(blank=True, null=True)), - ('troublevalue', models.IntegerField(blank=True, null=True)), - ('trainvalue', models.IntegerField(blank=True, null=True)), - ('drillvalue', models.IntegerField(blank=True, null=True)), - ], - ), - ] diff --git a/safesite/migrations/0034_yjyc_usecomp.py b/safesite/migrations/0034_yjyc_usecomp.py deleted file mode 100644 index a3dbf1a2..00000000 --- a/safesite/migrations/0034_yjyc_usecomp.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-30 08:53 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0033_yjyc'), - ] - - operations = [ - migrations.AddField( - model_name='yjyc', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0035_auto_20180830_1022.py b/safesite/migrations/0035_auto_20180830_1022.py deleted file mode 100644 index 3c65b079..00000000 --- a/safesite/migrations/0035_auto_20180830_1022.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-30 10:22 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0034_yjyc_usecomp'), - ] - - operations = [ - migrations.AddField( - model_name='partment', - name='creattime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='partment', - name='drillavg', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='partment', - name='modifytime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='partment', - name='monthpass', - field=models.IntegerField(default='0'), - ), - migrations.AddField( - model_name='partment', - name='trainavg', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='partment', - name='troubleavg', - field=models.IntegerField(blank=True, null=True), - ), - migrations.AddField( - model_name='yjyc', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.CharField(max_length=100), - ), - ] diff --git a/safesite/migrations/0036_auto_20180830_1027.py b/safesite/migrations/0036_auto_20180830_1027.py deleted file mode 100644 index 4dbc2b96..00000000 --- a/safesite/migrations/0036_auto_20180830_1027.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-30 10:27 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0035_auto_20180830_1022'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.IntegerField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0037_auto_20180830_1136.py b/safesite/migrations/0037_auto_20180830_1136.py deleted file mode 100644 index f55c554e..00000000 --- a/safesite/migrations/0037_auto_20180830_1136.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-30 11:36 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0036_auto_20180830_1027'), - ] - - operations = [ - migrations.RemoveField( - model_name='partment', - name='modifytime', - ), - migrations.RemoveField( - model_name='partment', - name='monthpass', - ), - ] diff --git a/safesite/migrations/0038_auto_20180830_1452.py b/safesite/migrations/0038_auto_20180830_1452.py deleted file mode 100644 index 72254bb2..00000000 --- a/safesite/migrations/0038_auto_20180830_1452.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-08-30 14:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0037_auto_20180830_1136'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='drillvalue', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='trainvalue', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='troublevalue', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='yjz', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0039_partment_iscompany.py b/safesite/migrations/0039_partment_iscompany.py deleted file mode 100644 index 412c1e0d..00000000 --- a/safesite/migrations/0039_partment_iscompany.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-03 16:21 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0038_auto_20180830_1452'), - ] - - operations = [ - migrations.AddField( - model_name='partment', - name='iscompany', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0040_yjyc_b.py b/safesite/migrations/0040_yjyc_b.py deleted file mode 100644 index 95013185..00000000 --- a/safesite/migrations/0040_yjyc_b.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-03 18:05 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0039_partment_iscompany'), - ] - - operations = [ - migrations.AddField( - model_name='yjyc', - name='b', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0041_auto_20180904_0850.py b/safesite/migrations/0041_auto_20180904_0850.py deleted file mode 100644 index 6c6e338a..00000000 --- a/safesite/migrations/0041_auto_20180904_0850.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-04 08:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0040_yjyc_b'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='yjsj', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0042_auto_20180904_0857.py b/safesite/migrations/0042_auto_20180904_0857.py deleted file mode 100644 index 3d896f27..00000000 --- a/safesite/migrations/0042_auto_20180904_0857.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-04 08:57 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0041_auto_20180904_0850'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='yjsj', - field=models.CharField(max_length=20), - ), - ] diff --git a/safesite/migrations/0043_auto_20180904_1522.py b/safesite/migrations/0043_auto_20180904_1522.py deleted file mode 100644 index d74c7643..00000000 --- a/safesite/migrations/0043_auto_20180904_1522.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-04 15:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0042_auto_20180904_0857'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='b', - field=models.DecimalField(decimal_places=2, max_digits=5), - ), - migrations.AlterField( - model_name='yjyc', - name='drillvalue', - field=models.DecimalField(decimal_places=2, max_digits=5), - ), - migrations.AlterField( - model_name='yjyc', - name='trainvalue', - field=models.DecimalField(decimal_places=2, max_digits=5), - ), - migrations.AlterField( - model_name='yjyc', - name='troublevalue', - field=models.DecimalField(decimal_places=2, max_digits=5), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.DecimalField(decimal_places=2, max_digits=6), - ), - migrations.AlterField( - model_name='yjyc', - name='yjz', - field=models.DecimalField(decimal_places=2, max_digits=6), - ), - ] diff --git a/safesite/migrations/0044_auto_20180904_1532.py b/safesite/migrations/0044_auto_20180904_1532.py deleted file mode 100644 index b98bdb8a..00000000 --- a/safesite/migrations/0044_auto_20180904_1532.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-04 15:32 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0043_auto_20180904_1522'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='b', - field=models.FloatField(), - ), - migrations.AlterField( - model_name='yjyc', - name='drillvalue', - field=models.FloatField(), - ), - migrations.AlterField( - model_name='yjyc', - name='trainvalue', - field=models.FloatField(), - ), - migrations.AlterField( - model_name='yjyc', - name='troublevalue', - field=models.FloatField(), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.FloatField(), - ), - migrations.AlterField( - model_name='yjyc', - name='yjz', - field=models.FloatField(), - ), - ] diff --git a/safesite/migrations/0045_auto_20180910_0902.py b/safesite/migrations/0045_auto_20180910_0902.py deleted file mode 100644 index 87524b98..00000000 --- a/safesite/migrations/0045_auto_20180910_0902.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-10 09:02 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0044_auto_20180904_1532'), - ] - - operations = [ - migrations.AlterField( - model_name='drill', - name='drilllevel', - field=models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='yljb', to='safesite.Dicclass'), - ), - ] diff --git a/safesite/migrations/0046_auto_20180910_1811.py b/safesite/migrations/0046_auto_20180910_1811.py deleted file mode 100644 index bf268bfc..00000000 --- a/safesite/migrations/0046_auto_20180910_1811.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-09-10 18:11 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0045_auto_20180910_0902'), - ] - - operations = [ - migrations.RemoveField( - model_name='yjyc', - name='yjsj', - ), - migrations.AddField( - model_name='yjyc', - name='month', - field=models.IntegerField(blank=True, default='1', null=True), - ), - migrations.AddField( - model_name='yjyc', - name='week', - field=models.IntegerField(blank=True, default='0', null=True), - ), - migrations.AddField( - model_name='yjyc', - name='year', - field=models.IntegerField(blank=True, default='1', null=True), - ), - ] diff --git a/safesite/migrations/0047_auto_20181002_1113.py b/safesite/migrations/0047_auto_20181002_1113.py deleted file mode 100644 index 1377c4d9..00000000 --- a/safesite/migrations/0047_auto_20181002_1113.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-10-02 11:13 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0046_auto_20180910_1811'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='b', - field=models.FloatField(default='0'), - ), - migrations.AlterField( - model_name='yjyc', - name='drillvalue', - field=models.FloatField(default='0'), - ), - migrations.AlterField( - model_name='yjyc', - name='trainvalue', - field=models.FloatField(default='0'), - ), - migrations.AlterField( - model_name='yjyc', - name='troublevalue', - field=models.FloatField(default='0'), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.FloatField(default='0'), - ), - migrations.AlterField( - model_name='yjyc', - name='yjz', - field=models.FloatField(default='0'), - ), - ] diff --git a/safesite/migrations/0048_remove_trouble_csyj.py b/safesite/migrations/0048_remove_trouble_csyj.py deleted file mode 100644 index 734b061a..00000000 --- a/safesite/migrations/0048_remove_trouble_csyj.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-10 17:14 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0047_auto_20181002_1113'), - ] - - operations = [ - migrations.RemoveField( - model_name='trouble', - name='csyj', - ), - ] diff --git a/safesite/migrations/0049_auto_20181010_2255.py b/safesite/migrations/0049_auto_20181010_2255.py deleted file mode 100644 index 733dd089..00000000 --- a/safesite/migrations/0049_auto_20181010_2255.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-10-10 22:55 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0048_remove_trouble_csyj'), - ] - - operations = [ - migrations.RemoveField( - model_name='trouble', - name='pgfcr', - ), - migrations.RemoveField( - model_name='trouble', - name='zgshr', - ), - migrations.AddField( - model_name='trouble', - name='fcr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='fcr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='pgr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='shr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shr', to='safesite.User'), - ), - migrations.AddField( - model_name='trouble', - name='zpr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zpr', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0050_trouble_csqrr.py b/safesite/migrations/0050_trouble_csqrr.py deleted file mode 100644 index 2d1f463d..00000000 --- a/safesite/migrations/0050_trouble_csqrr.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-12 18:11 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0049_auto_20181010_2255'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='csqrr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='csqrr', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0051_auto_20181017_1115.py b/safesite/migrations/0051_auto_20181017_1115.py deleted file mode 100644 index f48f457b..00000000 --- a/safesite/migrations/0051_auto_20181017_1115.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-17 11:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0050_trouble_csqrr'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='headimgurl', - field=models.CharField(default='0', max_length=200), - ), - migrations.AddField( - model_name='user', - name='nickname', - field=models.CharField(default='0', max_length=200), - ), - ] diff --git a/safesite/migrations/0052_auto_20181017_1533.py b/safesite/migrations/0052_auto_20181017_1533.py deleted file mode 100644 index 61679433..00000000 --- a/safesite/migrations/0052_auto_20181017_1533.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-17 15:33 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0051_auto_20181017_1115'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='nickname', - field=models.CharField(default='wechartname', max_length=200), - ), - ] diff --git a/safesite/migrations/0053_auto_20181023_1708.py b/safesite/migrations/0053_auto_20181023_1708.py deleted file mode 100644 index 919de6e9..00000000 --- a/safesite/migrations/0053_auto_20181023_1708.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-23 17:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0052_auto_20181017_1533'), - ] - - operations = [ - migrations.CreateModel( - name='Trainuser', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('score', models.IntegerField(blank=True, null=True)), - ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.RemoveField( - model_name='train', - name='participant', - ), - migrations.AddField( - model_name='train', - name='participant', - field=models.ManyToManyField(related_name='cjr', through='safesite.Trainuser', to='safesite.User'), - ), - migrations.AddField( - model_name='trainuser', - name='trainid', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Train'), - ), - ] diff --git a/safesite/migrations/0054_auto_20181025_1134.py b/safesite/migrations/0054_auto_20181025_1134.py deleted file mode 100644 index 8383b799..00000000 --- a/safesite/migrations/0054_auto_20181025_1134.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-10-25 11:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0053_auto_20181023_1708'), - ] - - operations = [ - migrations.CreateModel( - name='Drilluser', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('score', models.IntegerField(blank=True, null=True)), - ], - ), - migrations.RemoveField( - model_name='drill', - name='participant', - ), - migrations.AddField( - model_name='drilluser', - name='drillid', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Drill'), - ), - migrations.AddField( - model_name='drilluser', - name='participant', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0055_auto_20181107_1430.py b/safesite/migrations/0055_auto_20181107_1430.py deleted file mode 100644 index f1ed67dd..00000000 --- a/safesite/migrations/0055_auto_20181107_1430.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-11-07 14:30 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0054_auto_20181025_1134'), - ] - - operations = [ - migrations.AddField( - model_name='drill', - name='participant', - field=models.ManyToManyField(related_name='ylcjr', through='safesite.Drilluser', to='safesite.User'), - ), - migrations.AddField( - model_name='user', - name='mpoenid', - field=models.CharField(default='0', max_length=200), - ), - ] diff --git a/safesite/migrations/0056_auto_20181118_1144.py b/safesite/migrations/0056_auto_20181118_1144.py deleted file mode 100644 index b732b692..00000000 --- a/safesite/migrations/0056_auto_20181118_1144.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2018-11-18 11:44 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0055_auto_20181107_1430'), - ] - - operations = [ - migrations.RenameField( - model_name='user', - old_name='mpoenid', - new_name='mpopenid', - ), - ] diff --git a/safesite/migrations/0057_user_issuper.py b/safesite/migrations/0057_user_issuper.py deleted file mode 100644 index c5612adc..00000000 --- a/safesite/migrations/0057_user_issuper.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-03 16:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0056_auto_20181118_1144'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='issuper', - field=models.IntegerField(default='0'), - ), - ] diff --git a/safesite/migrations/0058_auto_20181205_1107.py b/safesite/migrations/0058_auto_20181205_1107.py deleted file mode 100644 index 8c0ba595..00000000 --- a/safesite/migrations/0058_auto_20181205_1107.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-05 11:07 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0057_user_issuper'), - ] - - operations = [ - migrations.RemoveField( - model_name='dickey', - name='usecomp', - ), - migrations.AddField( - model_name='dickey', - name='usecomps', - field=models.CharField(default=',', max_length=200), - ), - ] diff --git a/safesite/migrations/0059_auto_20181205_1113.py b/safesite/migrations/0059_auto_20181205_1113.py deleted file mode 100644 index 06e341ef..00000000 --- a/safesite/migrations/0059_auto_20181205_1113.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-05 11:13 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0058_auto_20181205_1107'), - ] - - operations = [ - migrations.AlterField( - model_name='dickey', - name='usecomps', - field=models.CharField(default=',1,', max_length=200), - ), - ] diff --git a/safesite/migrations/0060_remove_dickey_usecomps.py b/safesite/migrations/0060_remove_dickey_usecomps.py deleted file mode 100644 index 85dd9080..00000000 --- a/safesite/migrations/0060_remove_dickey_usecomps.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-05 11:14 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0059_auto_20181205_1113'), - ] - - operations = [ - migrations.RemoveField( - model_name='dickey', - name='usecomps', - ), - ] diff --git a/safesite/migrations/0061_dickey_usecomps.py b/safesite/migrations/0061_dickey_usecomps.py deleted file mode 100644 index d3e394c8..00000000 --- a/safesite/migrations/0061_dickey_usecomps.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-05 11:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0060_remove_dickey_usecomps'), - ] - - operations = [ - migrations.AddField( - model_name='dickey', - name='usecomps', - field=models.CharField(default=',1,', max_length=200), - ), - ] diff --git a/safesite/migrations/0062_auto_20181205_1144.py b/safesite/migrations/0062_auto_20181205_1144.py deleted file mode 100644 index 2a143a7e..00000000 --- a/safesite/migrations/0062_auto_20181205_1144.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-05 11:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0061_dickey_usecomps'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='empid', - field=models.CharField(blank=True, max_length=20, null=True), - ), - ] diff --git a/safesite/migrations/0063_auto_20181206_1438.py b/safesite/migrations/0063_auto_20181206_1438.py deleted file mode 100644 index 21e45453..00000000 --- a/safesite/migrations/0063_auto_20181206_1438.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-06 14:38 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0062_auto_20181205_1144'), - ] - - operations = [ - migrations.CreateModel( - name='Yjsetup', - fields=[ - ('yjsetupid', models.AutoField(primary_key=True, serialize=False)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('monthyhavg', models.IntegerField(default='100')), - ('safev', models.IntegerField(default='10')), - ('warnv', models.IntegerField(default='15')), - ('alertv', models.IntegerField(default='20')), - ('maxv', models.IntegerField(default='50')), - ('yhpg', models.IntegerField(default='4')), - ('yhdj', models.IntegerField(default='4')), - ('yhsbl', models.IntegerField(default='1')), - ('yhzgl', models.IntegerField(default='4')), - ('pxdj', models.IntegerField(default='3')), - ('pxxg', models.IntegerField(default='4')), - ('yldj', models.IntegerField(default='3')), - ('ylxg', models.IntegerField(default='3')), - ], - ), - migrations.RemoveField( - model_name='partment', - name='drillavg', - ), - migrations.RemoveField( - model_name='partment', - name='trainavg', - ), - migrations.RemoveField( - model_name='partment', - name='troubleavg', - ), - migrations.AddField( - model_name='yjsetup', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0064_auto_20181206_1442.py b/safesite/migrations/0064_auto_20181206_1442.py deleted file mode 100644 index 6d3c172d..00000000 --- a/safesite/migrations/0064_auto_20181206_1442.py +++ /dev/null @@ -1,80 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-06 14:42 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0063_auto_20181206_1438'), - ] - - operations = [ - migrations.AlterField( - model_name='yjsetup', - name='alertv', - field=models.IntegerField(blank=True, default='20', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='maxv', - field=models.IntegerField(blank=True, default='50', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='monthyhavg', - field=models.IntegerField(blank=True, default='100', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='pxdj', - field=models.IntegerField(blank=True, default='3', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='pxxg', - field=models.IntegerField(blank=True, default='4', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='safev', - field=models.IntegerField(blank=True, default='10', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='warnv', - field=models.IntegerField(blank=True, default='15', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='yhdj', - field=models.IntegerField(blank=True, default='4', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='yhpg', - field=models.IntegerField(blank=True, default='4', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='yhsbl', - field=models.IntegerField(blank=True, default='1', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='yhzgl', - field=models.IntegerField(blank=True, default='4', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='yldj', - field=models.IntegerField(blank=True, default='3', null=True), - ), - migrations.AlterField( - model_name='yjsetup', - name='ylxg', - field=models.IntegerField(blank=True, default='3', null=True), - ), - ] diff --git a/safesite/migrations/0065_auto_20181206_1524.py b/safesite/migrations/0065_auto_20181206_1524.py deleted file mode 100644 index 691f2261..00000000 --- a/safesite/migrations/0065_auto_20181206_1524.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-06 15:24 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0064_auto_20181206_1442'), - ] - - operations = [ - migrations.RenameField( - model_name='yjsetup', - old_name='pxdj', - new_name='pxdjqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='pxxg', - new_name='pxxgqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='yhdj', - new_name='yhdjqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='yhpg', - new_name='yhpgqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='yhsbl', - new_name='yhsblqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='yhzgl', - new_name='yhzglqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='yldj', - new_name='yldjqz', - ), - migrations.RenameField( - model_name='yjsetup', - old_name='ylxg', - new_name='ylxgqz', - ), - ] diff --git a/safesite/migrations/0066_group_usercomp.py b/safesite/migrations/0066_group_usercomp.py deleted file mode 100644 index 3b3ef6b7..00000000 --- a/safesite/migrations/0066_group_usercomp.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-07 15:56 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0065_auto_20181206_1524'), - ] - - operations = [ - migrations.AddField( - model_name='group', - name='usercomp', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='usecompg', to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0067_auto_20181207_1600.py b/safesite/migrations/0067_auto_20181207_1600.py deleted file mode 100644 index f36c71b9..00000000 --- a/safesite/migrations/0067_auto_20181207_1600.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-07 16:00 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0066_group_usercomp'), - ] - - operations = [ - migrations.RenameField( - model_name='group', - old_name='usercomp', - new_name='usecomp', - ), - ] diff --git a/safesite/migrations/0068_group_grouptype.py b/safesite/migrations/0068_group_grouptype.py deleted file mode 100644 index 1ce48223..00000000 --- a/safesite/migrations/0068_group_grouptype.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-07 16:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0067_auto_20181207_1600'), - ] - - operations = [ - migrations.AddField( - model_name='group', - name='grouptype', - field=models.IntegerField(default=3), - ), - ] diff --git a/safesite/migrations/0069_trouble_pgyj.py b/safesite/migrations/0069_trouble_pgyj.py deleted file mode 100644 index fb19fa94..00000000 --- a/safesite/migrations/0069_trouble_pgyj.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-12 15:25 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0068_group_grouptype'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='pgyj', - field=models.TextField(blank=True), - ), - ] diff --git a/safesite/migrations/0070_auto_20181212_1628.py b/safesite/migrations/0070_auto_20181212_1628.py deleted file mode 100644 index 157a2f17..00000000 --- a/safesite/migrations/0070_auto_20181212_1628.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-12 16:28 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0069_trouble_pgyj'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='fcyj', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='pgyj', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='shyj', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0071_auto_20181212_1709.py b/safesite/migrations/0071_auto_20181212_1709.py deleted file mode 100644 index 13b1c415..00000000 --- a/safesite/migrations/0071_auto_20181212_1709.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-12 17:09 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0070_auto_20181212_1628'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='shresult', - field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改'), (5, '评估未通过')], null=True), - ), - ] diff --git a/safesite/migrations/0072_menu.py b/safesite/migrations/0072_menu.py deleted file mode 100644 index 3ea7d3f1..00000000 --- a/safesite/migrations/0072_menu.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-17 11:07 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0071_auto_20181212_1709'), - ] - - operations = [ - migrations.CreateModel( - name='Menu', - fields=[ - ('menuid', models.AutoField(primary_key=True, serialize=False)), - ('menuname', models.CharField(blank=True, max_length=30, null=True)), - ('menucode', models.CharField(blank=True, max_length=30, null=True)), - ('url', models.CharField(blank=True, max_length=30, null=True)), - ('detail', models.CharField(blank=True, max_length=100, null=True)), - ('bgroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), - ], - ), - ] diff --git a/safesite/migrations/0073_auto_20181217_1114.py b/safesite/migrations/0073_auto_20181217_1114.py deleted file mode 100644 index aee9bc3f..00000000 --- a/safesite/migrations/0073_auto_20181217_1114.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-17 11:14 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0072_menu'), - ] - - operations = [ - migrations.RemoveField( - model_name='menu', - name='bgroup', - ), - migrations.AddField( - model_name='menu', - name='bgroup', - field=models.ManyToManyField(related_name='bgroup', to='safesite.Group'), - ), - ] diff --git a/safesite/migrations/0074_menu_parentid.py b/safesite/migrations/0074_menu_parentid.py deleted file mode 100644 index 8229d143..00000000 --- a/safesite/migrations/0074_menu_parentid.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-17 11:17 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0073_auto_20181217_1114'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='parentid', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Menu'), - ), - ] diff --git a/safesite/migrations/0075_auto_20181218_0847.py b/safesite/migrations/0075_auto_20181218_0847.py deleted file mode 100644 index 2284ccb0..00000000 --- a/safesite/migrations/0075_auto_20181218_0847.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-18 08:47 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0074_menu_parentid'), - ] - - operations = [ - migrations.RemoveField( - model_name='menu', - name='bgroup', - ), - migrations.AddField( - model_name='group', - name='menulink', - field=models.CharField(default=',11,', max_length=200), - ), - ] diff --git a/safesite/migrations/0076_auto_20181218_0935.py b/safesite/migrations/0076_auto_20181218_0935.py deleted file mode 100644 index e476b751..00000000 --- a/safesite/migrations/0076_auto_20181218_0935.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-18 09:35 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0075_auto_20181218_0847'), - ] - - operations = [ - migrations.AlterField( - model_name='group', - name='menulink', - field=models.CharField(default='11,', max_length=200), - ), - ] diff --git a/safesite/migrations/0077_menu_deletemark.py b/safesite/migrations/0077_menu_deletemark.py deleted file mode 100644 index 5d644c0f..00000000 --- a/safesite/migrations/0077_menu_deletemark.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-18 16:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0076_auto_20181218_0935'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='deletemark', - field=models.IntegerField(default='1'), - ), - ] diff --git a/safesite/migrations/0078_user_iselse.py b/safesite/migrations/0078_user_iselse.py deleted file mode 100644 index 50c2aacd..00000000 --- a/safesite/migrations/0078_user_iselse.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-18 17:35 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0077_menu_deletemark'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='iselse', - field=models.IntegerField(default='1'), - ), - ] diff --git a/safesite/migrations/0079_auto_20181229_1620.py b/safesite/migrations/0079_auto_20181229_1620.py deleted file mode 100644 index 752997a2..00000000 --- a/safesite/migrations/0079_auto_20181229_1620.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2018-12-29 16:20 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0078_user_iselse'), - ] - - operations = [ - migrations.AddField( - model_name='partment', - name='aqy', - field=models.CharField(default=',', max_length=200), - ), - migrations.AddField( - model_name='partment', - name='bmzg', - field=models.CharField(default=',', max_length=200), - ), - ] diff --git a/safesite/migrations/0080_auto_20190101_2031.py b/safesite/migrations/0080_auto_20190101_2031.py deleted file mode 100644 index fe42db20..00000000 --- a/safesite/migrations/0080_auto_20190101_2031.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.3 on 2019-01-01 20:31 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0079_auto_20181229_1620'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='isaqy', - ), - migrations.RemoveField( - model_name='user', - name='isbmzg', - ), - migrations.RemoveField( - model_name='user', - name='iselse', - ), - ] diff --git a/safesite/migrations/0081_dickey_nousecomps.py b/safesite/migrations/0081_dickey_nousecomps.py deleted file mode 100644 index 9713046d..00000000 --- a/safesite/migrations/0081_dickey_nousecomps.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-07 14:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0080_auto_20190101_2031'), - ] - - operations = [ - migrations.AddField( - model_name='dickey', - name='nousecomps', - field=models.CharField(default='', max_length=200), - ), - ] diff --git a/safesite/migrations/0082_observe.py b/safesite/migrations/0082_observe.py deleted file mode 100644 index 775c0419..00000000 --- a/safesite/migrations/0082_observe.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-08 11:11 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0081_dickey_nousecomps'), - ] - - operations = [ - migrations.CreateModel( - name='Observe', - fields=[ - ('lookid', models.AutoField(primary_key=True, serialize=False)), - ('looknum', models.CharField(default='1', max_length=100)), - ('actname', models.CharField(max_length=100)), - ('lookplace', models.CharField(max_length=200)), - ('looktime', models.DateTimeField(default=django.utils.timezone.now)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('unsafe', models.CharField(blank=True, max_length=1000, null=True)), - ('otherunsafe', models.CharField(blank=True, max_length=1000, null=True)), - ('makeresult', models.CharField(blank=True, max_length=1000, null=True)), - ('safecontent', models.CharField(blank=True, max_length=1000, null=True)), - ('deletemark', models.IntegerField(default='1')), - ('lookimg', models.CharField(blank=True, max_length=1000, null=True)), - ('lookeder', models.ManyToManyField(related_name='bgcr', to='safesite.User')), - ('looker', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='gcr', to='safesite.User')), - ('lookpart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gcbm', to='safesite.Partment')), - ('usecomp', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0083_auto_20190108_1646.py b/safesite/migrations/0083_auto_20190108_1646.py deleted file mode 100644 index 77544f75..00000000 --- a/safesite/migrations/0083_auto_20190108_1646.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-08 16:46 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0082_observe'), - ] - - operations = [ - migrations.RemoveField( - model_name='observe', - name='unsafe', - ), - migrations.AddField( - model_name='observe', - name='unsafe', - field=models.ManyToManyField(related_name='unsafe', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0084_auto_20190108_1824.py b/safesite/migrations/0084_auto_20190108_1824.py deleted file mode 100644 index 40f6bafa..00000000 --- a/safesite/migrations/0084_auto_20190108_1824.py +++ /dev/null @@ -1,59 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-08 18:24 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0083_auto_20190108_1646'), - ] - - operations = [ - migrations.AddField( - model_name='observe', - name='unsafe1', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe2', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe3', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe4', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe5', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe6', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AddField( - model_name='observe', - name='unsafe7', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.RemoveField( - model_name='observe', - name='unsafe', - ), - migrations.AddField( - model_name='observe', - name='unsafe', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0085_auto_20190109_0844.py b/safesite/migrations/0085_auto_20190109_0844.py deleted file mode 100644 index 571b5f78..00000000 --- a/safesite/migrations/0085_auto_20190109_0844.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-09 08:44 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0084_auto_20190108_1824'), - ] - - operations = [ - migrations.CreateModel( - name='Unsafes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ], - ), - migrations.RemoveField( - model_name='observe', - name='unsafe1', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe2', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe3', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe4', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe5', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe6', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe7', - ), - migrations.RemoveField( - model_name='observe', - name='unsafe', - ), - migrations.AddField( - model_name='unsafes', - name='observe', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe'), - ), - migrations.AddField( - model_name='unsafes', - name='unsafedicclass', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unsafedicclass', to='safesite.Dicclass'), - ), - migrations.AddField( - model_name='unsafes', - name='unsafedickey', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='unsafedickey', to='safesite.Dickey'), - ), - migrations.AddField( - model_name='observe', - name='unsafe', - field=models.ManyToManyField(related_name='baqxw', through='safesite.Unsafes', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0086_auto_20190109_0942.py b/safesite/migrations/0086_auto_20190109_0942.py deleted file mode 100644 index e74d429b..00000000 --- a/safesite/migrations/0086_auto_20190109_0942.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-09 09:42 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0085_auto_20190109_0844'), - ] - - operations = [ - migrations.RemoveField( - model_name='observe', - name='lookeder', - ), - migrations.AddField( - model_name='observe', - name='lookeder', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0087_yjyc_buildtime.py b/safesite/migrations/0087_yjyc_buildtime.py deleted file mode 100644 index 3ba28ad6..00000000 --- a/safesite/migrations/0087_yjyc_buildtime.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-10 09:16 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0086_auto_20190109_0942'), - ] - - operations = [ - migrations.AddField( - model_name='yjyc', - name='buildtime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/safesite/migrations/0088_menu_icon.py b/safesite/migrations/0088_menu_icon.py deleted file mode 100644 index 5ef67519..00000000 --- a/safesite/migrations/0088_menu_icon.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-10 10:37 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0087_yjyc_buildtime'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='icon', - field=models.CharField(default='', max_length=100), - ), - ] diff --git a/safesite/migrations/0089_auto_20190116_1353.py b/safesite/migrations/0089_auto_20190116_1353.py deleted file mode 100644 index dc97a4bc..00000000 --- a/safesite/migrations/0089_auto_20190116_1353.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-16 13:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0088_menu_icon'), - ] - - operations = [ - migrations.AlterField( - model_name='group', - name='grouptype', - field=models.IntegerField(default=4), - ), - ] diff --git a/safesite/migrations/0090_user_menulink.py b/safesite/migrations/0090_user_menulink.py deleted file mode 100644 index 27c3e050..00000000 --- a/safesite/migrations/0090_user_menulink.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-16 14:49 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0089_auto_20190116_1353'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='menulink', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0091_miss_relation.py b/safesite/migrations/0091_miss_relation.py deleted file mode 100644 index 95a7937d..00000000 --- a/safesite/migrations/0091_miss_relation.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.5 on 2019-01-17 17:43 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0090_user_menulink'), - ] - - operations = [ - migrations.CreateModel( - name='Miss', - fields=[ - ('missid', models.AutoField(primary_key=True, serialize=False)), - ('missnum', models.CharField(default='1', max_length=100)), - ('missplace', models.CharField(max_length=200)), - ('misstime', models.DateTimeField(default=django.utils.timezone.now)), - ('description', models.CharField(blank=True, max_length=1000, null=True)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('deletemark', models.IntegerField(default='1')), - ('missimg', models.CharField(blank=True, max_length=1000, null=True)), - ('prevent', models.CharField(blank=True, max_length=1000, null=True)), - ('lesson', models.CharField(blank=True, max_length=1000, null=True)), - ('misser', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, related_name='fsr', to='safesite.User')), - ('misspart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fsbm', to='safesite.Partment')), - ('usecomp', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.CreateModel( - name='Relation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('remark', models.CharField(blank=True, max_length=1000, null=True)), - ('drill', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Drill')), - ('miss', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Miss')), - ('observe', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe')), - ('train', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Train')), - ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), - ], - ), - ] diff --git a/safesite/migrations/0092_userprofile.py b/safesite/migrations/0092_userprofile.py deleted file mode 100644 index bc5710b7..00000000 --- a/safesite/migrations/0092_userprofile.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-15 17:37 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0091_miss_relation'), - ] - - operations = [ - migrations.CreateModel( - name='Userprofile', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('realname', models.CharField(max_length=50)), - ('gender', models.CharField(max_length=50)), - ('cardnum', models.CharField(max_length=50)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0093_socertificate.py b/safesite/migrations/0093_socertificate.py deleted file mode 100644 index 404c78dc..00000000 --- a/safesite/migrations/0093_socertificate.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-16 21:57 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0092_userprofile'), - ] - - operations = [ - migrations.CreateModel( - name='Socertificate', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('realname', models.CharField(max_length=50)), - ('gender', models.CharField(max_length=50)), - ('cardnum', models.CharField(max_length=50)), - ('zylb', models.CharField(max_length=50)), - ('czxm', models.CharField(max_length=50)), - ('fzjg', models.CharField(max_length=100)), - ('ccfzrq', models.DateTimeField(blank=True, null=True)), - ('yfsrq', models.DateTimeField(blank=True, null=True)), - ('yxqkssj', models.DateTimeField(blank=True, null=True)), - ('yxqjssj', models.DateTimeField(blank=True, null=True)), - ('sjfssj', models.DateTimeField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0094_menu_sortnum.py b/safesite/migrations/0094_menu_sortnum.py deleted file mode 100644 index b790c0b6..00000000 --- a/safesite/migrations/0094_menu_sortnum.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-16 23:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0093_socertificate'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='sortnum', - field=models.IntegerField(default='1'), - ), - ] diff --git a/safesite/migrations/0095_remove_user_menulink.py b/safesite/migrations/0095_remove_user_menulink.py deleted file mode 100644 index 79219385..00000000 --- a/safesite/migrations/0095_remove_user_menulink.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-16 23:44 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0094_menu_sortnum'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='menulink', - ), - ] diff --git a/safesite/migrations/0096_socertificate_usecomp.py b/safesite/migrations/0096_socertificate_usecomp.py deleted file mode 100644 index 9161756a..00000000 --- a/safesite/migrations/0096_socertificate_usecomp.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-17 00:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0095_remove_user_menulink'), - ] - - operations = [ - migrations.AddField( - model_name='socertificate', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0097_auto_20190217_1535.py b/safesite/migrations/0097_auto_20190217_1535.py deleted file mode 100644 index 668c3f7e..00000000 --- a/safesite/migrations/0097_auto_20190217_1535.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-17 15:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0096_socertificate_usecomp'), - ] - - operations = [ - migrations.AlterField( - model_name='userprofile', - name='user', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0098_auto_20190218_1016.py b/safesite/migrations/0098_auto_20190218_1016.py deleted file mode 100644 index 6a419b07..00000000 --- a/safesite/migrations/0098_auto_20190218_1016.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-18 10:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0097_auto_20190217_1535'), - ] - - operations = [ - migrations.AlterField( - model_name='socertificate', - name='ccfzrq', - field=models.DateField(blank=True, null=True), - ), - migrations.AlterField( - model_name='socertificate', - name='sjfssj', - field=models.DateField(blank=True, null=True), - ), - migrations.AlterField( - model_name='socertificate', - name='yfsrq', - field=models.DateField(blank=True, null=True), - ), - migrations.AlterField( - model_name='socertificate', - name='yxqjssj', - field=models.DateField(blank=True, null=True), - ), - migrations.AlterField( - model_name='socertificate', - name='yxqkssj', - field=models.DateField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0099_train_lecturer.py b/safesite/migrations/0099_train_lecturer.py deleted file mode 100644 index bfed46ed..00000000 --- a/safesite/migrations/0099_train_lecturer.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-22 14:37 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0098_auto_20190218_1016'), - ] - - operations = [ - migrations.AddField( - model_name='train', - name='lecturer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0100_drill_chief.py b/safesite/migrations/0100_drill_chief.py deleted file mode 100644 index e342e756..00000000 --- a/safesite/migrations/0100_drill_chief.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-22 15:31 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0099_train_lecturer'), - ] - - operations = [ - migrations.AddField( - model_name='drill', - name='chief', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0101_socertificate_zszt.py b/safesite/migrations/0101_socertificate_zszt.py deleted file mode 100644 index 810671a1..00000000 --- a/safesite/migrations/0101_socertificate_zszt.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-02-22 16:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0100_drill_chief'), - ] - - operations = [ - migrations.AddField( - model_name='socertificate', - name='zszt', - field=models.IntegerField(blank=True, choices=[(1, '正常'), (2, '待复查'), (3, '超期')], null=True), - ), - ] diff --git a/safesite/migrations/0102_partment_ismain.py b/safesite/migrations/0102_partment_ismain.py deleted file mode 100644 index 7b041c56..00000000 --- a/safesite/migrations/0102_partment_ismain.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-01 09:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0101_socertificate_zszt'), - ] - - operations = [ - migrations.AddField( - model_name='partment', - name='ismain', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0103_remove_partment_ismain.py b/safesite/migrations/0103_remove_partment_ismain.py deleted file mode 100644 index e46a967d..00000000 --- a/safesite/migrations/0103_remove_partment_ismain.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-01 10:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0102_partment_ismain'), - ] - - operations = [ - migrations.RemoveField( - model_name='partment', - name='ismain', - ), - ] diff --git a/safesite/migrations/0104_socertificate_url.py b/safesite/migrations/0104_socertificate_url.py deleted file mode 100644 index babf5ac2..00000000 --- a/safesite/migrations/0104_socertificate_url.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-03 00:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0103_remove_partment_ismain'), - ] - - operations = [ - migrations.AddField( - model_name='socertificate', - name='url', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0105_suggest.py b/safesite/migrations/0105_suggest.py deleted file mode 100644 index c2f4a4c1..00000000 --- a/safesite/migrations/0105_suggest.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-03 21:13 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0104_socertificate_url'), - ] - - operations = [ - migrations.CreateModel( - name='Suggest', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('jynum', models.CharField(default='1', max_length=100)), - ('jyrq', models.DateField(default=django.utils.timezone.now)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('deletemark', models.IntegerField(default='1')), - ('dqxz', models.CharField(blank=True, max_length=1000, null=True)), - ('ndjy', models.CharField(blank=True, max_length=1000, null=True)), - ('qwxg', models.CharField(blank=True, max_length=1000, null=True)), - ('jybm', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jybm', to='safesite.Partment')), - ('jylb', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jylb', to='safesite.Dickey')), - ('jyr', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jyr', to='safesite.User')), - ('usecomp', models.ForeignKey(default='1', on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0106_auto_20190303_2201.py b/safesite/migrations/0106_auto_20190303_2201.py deleted file mode 100644 index c359d565..00000000 --- a/safesite/migrations/0106_auto_20190303_2201.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-03 22:01 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0105_suggest'), - ] - - operations = [ - migrations.RenameField( - model_name='suggest', - old_name='ndjy', - new_name='img', - ), - migrations.AddField( - model_name='suggest', - name='jynr', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0107_user_usecomp.py b/safesite/migrations/0107_user_usecomp.py deleted file mode 100644 index 67b2ea0f..00000000 --- a/safesite/migrations/0107_user_usecomp.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-03 22:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0106_auto_20190303_2201'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0108_auto_20190303_2337.py b/safesite/migrations/0108_auto_20190303_2337.py deleted file mode 100644 index ec06c89a..00000000 --- a/safesite/migrations/0108_auto_20190303_2337.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-03 23:37 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0107_user_usecomp'), - ] - - operations = [ - migrations.RenameField( - model_name='suggest', - old_name='id', - new_name='jyid', - ), - migrations.RenameField( - model_name='suggest', - old_name='img', - new_name='jyimg', - ), - ] diff --git a/safesite/migrations/0109_auto_20190304_0009.py b/safesite/migrations/0109_auto_20190304_0009.py deleted file mode 100644 index 1b413568..00000000 --- a/safesite/migrations/0109_auto_20190304_0009.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-04 00:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0108_auto_20190303_2337'), - ] - - operations = [ - migrations.AlterField( - model_name='group', - name='menulink', - field=models.CharField(default='11', max_length=200), - ), - ] diff --git a/safesite/migrations/0110_remove_suggest_deletemark.py b/safesite/migrations/0110_remove_suggest_deletemark.py deleted file mode 100644 index cb21b07c..00000000 --- a/safesite/migrations/0110_remove_suggest_deletemark.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-05 09:00 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0109_auto_20190304_0009'), - ] - - operations = [ - migrations.RemoveField( - model_name='suggest', - name='deletemark', - ), - ] diff --git a/safesite/migrations/0111_trouble_xzr.py b/safesite/migrations/0111_trouble_xzr.py deleted file mode 100644 index c1234c67..00000000 --- a/safesite/migrations/0111_trouble_xzr.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-05 16:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0110_remove_suggest_deletemark'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='xzr', - field=models.CharField(default=',', max_length=200), - ), - ] diff --git a/safesite/migrations/0112_auto_20190305_1642.py b/safesite/migrations/0112_auto_20190305_1642.py deleted file mode 100644 index f531769c..00000000 --- a/safesite/migrations/0112_auto_20190305_1642.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-05 16:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0111_trouble_xzr'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='xzr', - field=models.CharField(default='', max_length=200), - ), - ] diff --git a/safesite/migrations/0113_auto_20190306_1709.py b/safesite/migrations/0113_auto_20190306_1709.py deleted file mode 100644 index 020f155e..00000000 --- a/safesite/migrations/0113_auto_20190306_1709.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-06 17:09 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0112_auto_20190305_1642'), - ] - - operations = [ - migrations.CreateModel( - name='Notice', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=100, verbose_name='标题')), - ('content', models.TextField(verbose_name='详情')), - ('creattime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('modifytime', models.DateTimeField(auto_now=True)), - ('pubpart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fbbm', to='safesite.Partment')), - ('pubuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fbz', to='safesite.User')), - ], - ), - migrations.CreateModel( - name='Noticeto', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('comment', models.CharField(max_length=500)), - ('get', models.IntegerField(default='0')), - ('noticeid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Notice')), - ('receiver', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.AddField( - model_name='notice', - name='tousers', - field=models.ManyToManyField(related_name='tzry', through='safesite.Noticeto', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0114_auto_20190307_1126.py b/safesite/migrations/0114_auto_20190307_1126.py deleted file mode 100644 index d23f7333..00000000 --- a/safesite/migrations/0114_auto_20190307_1126.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-07 11:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0113_auto_20190306_1709'), - ] - - operations = [ - migrations.RenameField( - model_name='noticeto', - old_name='get', - new_name='read', - ), - migrations.AddField( - model_name='notice', - name='material', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0115_notice_usecomp.py b/safesite/migrations/0115_notice_usecomp.py deleted file mode 100644 index 84621fd8..00000000 --- a/safesite/migrations/0115_notice_usecomp.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-07 12:00 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0114_auto_20190307_1126'), - ] - - operations = [ - migrations.AddField( - model_name='notice', - name='usecomp', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='fbgs', to='safesite.Partment'), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0116_auto_20190307_1201.py b/safesite/migrations/0116_auto_20190307_1201.py deleted file mode 100644 index 90cbf9d0..00000000 --- a/safesite/migrations/0116_auto_20190307_1201.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-07 12:01 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0115_notice_usecomp'), - ] - - operations = [ - migrations.RenameField( - model_name='notice', - old_name='creattime', - new_name='submittime', - ), - ] diff --git a/safesite/migrations/0117_notice_deletemark.py b/safesite/migrations/0117_notice_deletemark.py deleted file mode 100644 index 2bf6bac9..00000000 --- a/safesite/migrations/0117_notice_deletemark.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-07 12:48 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0116_auto_20190307_1201'), - ] - - operations = [ - migrations.AddField( - model_name='notice', - name='deletemark', - field=models.IntegerField(default='1'), - ), - ] diff --git a/safesite/migrations/0118_notice_reads.py b/safesite/migrations/0118_notice_reads.py deleted file mode 100644 index affa0a22..00000000 --- a/safesite/migrations/0118_notice_reads.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-10 16:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0117_notice_deletemark'), - ] - - operations = [ - migrations.AddField( - model_name='notice', - name='reads', - field=models.IntegerField(default='0'), - ), - ] diff --git a/safesite/migrations/0119_auto_20190310_1716.py b/safesite/migrations/0119_auto_20190310_1716.py deleted file mode 100644 index 4d617789..00000000 --- a/safesite/migrations/0119_auto_20190310_1716.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-10 17:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0118_notice_reads'), - ] - - operations = [ - migrations.RemoveField( - model_name='notice', - name='usecomp', - ), - migrations.AddField( - model_name='notice', - name='isgg', - field=models.IntegerField(default='1'), - ), - migrations.AddField( - model_name='notice', - name='usecomps', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0120_auto_20190314_1618.py b/safesite/migrations/0120_auto_20190314_1618.py deleted file mode 100644 index 6016af8d..00000000 --- a/safesite/migrations/0120_auto_20190314_1618.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-14 16:18 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0119_auto_20190310_1716'), - ] - - operations = [ - migrations.AddField( - model_name='partment', - name='bsq', - field=models.CharField(default=',', max_length=1000), - ), - migrations.AlterField( - model_name='partment', - name='aqy', - field=models.CharField(default=',', max_length=1000), - ), - migrations.AlterField( - model_name='partment', - name='bmzg', - field=models.CharField(default=',', max_length=1000), - ), - ] diff --git a/safesite/migrations/0121_yjyc_observevalue.py b/safesite/migrations/0121_yjyc_observevalue.py deleted file mode 100644 index 4a9fa5a1..00000000 --- a/safesite/migrations/0121_yjyc_observevalue.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-25 17:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0120_auto_20190314_1618'), - ] - - operations = [ - migrations.AddField( - model_name='yjyc', - name='observevalue', - field=models.FloatField(default='0'), - ), - ] diff --git a/safesite/migrations/0122_operation_operationsetting.py b/safesite/migrations/0122_operation_operationsetting.py deleted file mode 100644 index 7416e58f..00000000 --- a/safesite/migrations/0122_operation_operationsetting.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-28 10:03 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0121_yjyc_observevalue'), - ] - - operations = [ - migrations.CreateModel( - name='Operation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ], - ), - migrations.CreateModel( - name='Operationsetting', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=100, verbose_name='许可证类型')), - ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('modifytime', models.DateTimeField(auto_now=True)), - ('deletemark', models.IntegerField(default='1')), - ('usecomps', models.CharField(default=',1,', max_length=200)), - ('nousecomps', models.CharField(default='', max_length=200)), - ('wxfx', models.TextField()), - ('aqcs', models.TextField()), - ], - ), - ] diff --git a/safesite/migrations/0123_auto_20190328_1548.py b/safesite/migrations/0123_auto_20190328_1548.py deleted file mode 100644 index a5b2e223..00000000 --- a/safesite/migrations/0123_auto_20190328_1548.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-28 15:48 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0122_operation_operationsetting'), - ] - - operations = [ - migrations.RenameField( - model_name='operationsetting', - old_name='wxfx', - new_name='fxfx', - ), - ] diff --git a/safesite/migrations/0124_delete_operation.py b/safesite/migrations/0124_delete_operation.py deleted file mode 100644 index f2514bac..00000000 --- a/safesite/migrations/0124_delete_operation.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-31 19:39 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0123_auto_20190328_1548'), - ] - - operations = [ - migrations.DeleteModel( - name='Operation', - ), - ] diff --git a/safesite/migrations/0125_operation.py b/safesite/migrations/0125_operation.py deleted file mode 100644 index f2aa8334..00000000 --- a/safesite/migrations/0125_operation.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-31 20:04 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0124_delete_operation'), - ] - - operations = [ - migrations.CreateModel( - name='Operation', - fields=[ - ('zyid', models.AutoField(primary_key=True, serialize=False)), - ('zynum', models.CharField(max_length=100)), - ('zyry', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), - ('kssj', models.DateTimeField(default=django.utils.timezone.now)), - ('jssj', models.DateTimeField(default=django.utils.timezone.now)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('zyimg', models.CharField(blank=True, max_length=1000, null=True)), - ('deletemark', models.IntegerField(default='1')), - ('zyzt', models.IntegerField(blank=True, choices=[(1, '确认中'), (2, '作业中'), (3, '待关闭'), (4, '已关闭')], null=True)), - ('spry', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), - ('sdbm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sdbm', to='safesite.Partment')), - ('zybm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zybm', to='safesite.Partment')), - ('zyfzr', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zyfzr', to='safesite.User')), - ('zylx', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zylx', to='safesite.Dicclass')), - ], - ), - ] diff --git a/safesite/migrations/0126_auto_20190331_2157.py b/safesite/migrations/0126_auto_20190331_2157.py deleted file mode 100644 index bafdee92..00000000 --- a/safesite/migrations/0126_auto_20190331_2157.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-31 21:57 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0125_operation'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='fxcs', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AddField( - model_name='operation', - name='usecomp', - field=models.ForeignKey(blank=True, default=1, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0127_operation_zynr.py b/safesite/migrations/0127_operation_zynr.py deleted file mode 100644 index 712f0cf0..00000000 --- a/safesite/migrations/0127_operation_zynr.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-03-31 22:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0126_auto_20190331_2157'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='zynr', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0128_auto_20190401_1455.py b/safesite/migrations/0128_auto_20190401_1455.py deleted file mode 100644 index 30a25505..00000000 --- a/safesite/migrations/0128_auto_20190401_1455.py +++ /dev/null @@ -1,40 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-01 14:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0127_operation_zynr'), - ] - - operations = [ - migrations.CreateModel( - name='Operzyry', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('checked', models.IntegerField(default=0)), - ], - ), - migrations.RemoveField( - model_name='operation', - name='zyry', - ), - migrations.AddField( - model_name='operzyry', - name='oper', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation'), - ), - migrations.AddField( - model_name='operzyry', - name='operzyry', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='operation', - name='zyry', - field=models.ManyToManyField(related_name='zyry', through='safesite.Operzyry', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0129_auto_20190402_1651.py b/safesite/migrations/0129_auto_20190402_1651.py deleted file mode 100644 index e03ee309..00000000 --- a/safesite/migrations/0129_auto_20190402_1651.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-02 16:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0128_auto_20190401_1455'), - ] - - operations = [ - migrations.AlterField( - model_name='operation', - name='zyzt', - field=models.IntegerField(blank=True, choices=[(1, '确认中'), (2, '审批中'), (3, '待关闭'), (4, '已关闭')], null=True), - ), - ] diff --git a/safesite/migrations/0130_auto_20190402_1706.py b/safesite/migrations/0130_auto_20190402_1706.py deleted file mode 100644 index 745763dd..00000000 --- a/safesite/migrations/0130_auto_20190402_1706.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-02 17:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0129_auto_20190402_1651'), - ] - - operations = [ - migrations.CreateModel( - name='Operspry', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('checked', models.IntegerField(default=0)), - ('sort', models.IntegerField(default=1)), - ], - ), - migrations.RemoveField( - model_name='operation', - name='spry', - ), - migrations.AddField( - model_name='operspry', - name='oper', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation'), - ), - migrations.AddField( - model_name='operspry', - name='operspry', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='operation', - name='spry', - field=models.ManyToManyField(related_name='spry', through='safesite.Operspry', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0131_auto_20190404_1455.py b/safesite/migrations/0131_auto_20190404_1455.py deleted file mode 100644 index fcfea795..00000000 --- a/safesite/migrations/0131_auto_20190404_1455.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-04 14:55 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0130_auto_20190402_1706'), - ] - - operations = [ - migrations.AddField( - model_name='operspry', - name='submittime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='operzyry', - name='submittime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/safesite/migrations/0132_auto_20190405_1207.py b/safesite/migrations/0132_auto_20190405_1207.py deleted file mode 100644 index 296d1147..00000000 --- a/safesite/migrations/0132_auto_20190405_1207.py +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 12:07 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0131_auto_20190404_1455'), - ] - - operations = [ - migrations.CreateModel( - name='Fxcs', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('fxfx', models.TextField()), - ('aqcs', models.TextField()), - ('modifytime', models.DateTimeField(auto_now=True)), - ('zylx', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ], - ), - migrations.RemoveField( - model_name='operationsetting', - name='aqcs', - ), - migrations.RemoveField( - model_name='operationsetting', - name='fxfx', - ), - migrations.RemoveField( - model_name='operationsetting', - name='name', - ), - migrations.RemoveField( - model_name='operationsetting', - name='nousecomps', - ), - migrations.RemoveField( - model_name='operationsetting', - name='usecomps', - ), - migrations.AddField( - model_name='operationsetting', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - migrations.AddField( - model_name='operationsetting', - name='zylx', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - migrations.AlterField( - model_name='operation', - name='zylx', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0133_fxcs_submittime.py b/safesite/migrations/0133_fxcs_submittime.py deleted file mode 100644 index 1b3faa0e..00000000 --- a/safesite/migrations/0133_fxcs_submittime.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 12:54 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0132_auto_20190405_1207'), - ] - - operations = [ - migrations.AddField( - model_name='fxcs', - name='submittime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - ] diff --git a/safesite/migrations/0134_auto_20190405_1402.py b/safesite/migrations/0134_auto_20190405_1402.py deleted file mode 100644 index 1958399e..00000000 --- a/safesite/migrations/0134_auto_20190405_1402.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 14:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0133_fxcs_submittime'), - ] - - operations = [ - migrations.AddField( - model_name='fxcs', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AddField( - model_name='fxcs', - name='nousecomps', - field=models.CharField(default='', max_length=200), - ), - migrations.AddField( - model_name='fxcs', - name='usecomps', - field=models.CharField(default=',1,', max_length=200), - ), - ] diff --git a/safesite/migrations/0135_fxcs_cslx.py b/safesite/migrations/0135_fxcs_cslx.py deleted file mode 100644 index 3b87cebc..00000000 --- a/safesite/migrations/0135_fxcs_cslx.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 14:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0134_auto_20190405_1402'), - ] - - operations = [ - migrations.AddField( - model_name='fxcs', - name='cslx', - field=models.CharField(default='', max_length=100), - ), - ] diff --git a/safesite/migrations/0136_auto_20190405_1825.py b/safesite/migrations/0136_auto_20190405_1825.py deleted file mode 100644 index cb97250f..00000000 --- a/safesite/migrations/0136_auto_20190405_1825.py +++ /dev/null @@ -1,69 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 18:25 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0135_fxcs_cslx'), - ] - - operations = [ - migrations.CreateModel( - name='Operationsplc', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('spmc', models.CharField(max_length=100)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('modifytime', models.DateTimeField(auto_now=True)), - ('deletemark', models.IntegerField(default='1')), - ('spbm', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spbm', to='safesite.Partment')), - ('spr', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spr', to='safesite.User')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ('zylx', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ], - ), - migrations.RemoveField( - model_name='operationsetting', - name='usecomp', - ), - migrations.RemoveField( - model_name='operationsetting', - name='zylx', - ), - migrations.RemoveField( - model_name='operspry', - name='sort', - ), - migrations.AddField( - model_name='operspry', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AddField( - model_name='operzyry', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='operation', - name='fxcs', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='operation', - name='zyzt', - field=models.CharField(default='', max_length=100), - ), - migrations.AlterField( - model_name='operspry', - name='id', - field=models.AutoField(primary_key=True, serialize=False), - ), - migrations.DeleteModel( - name='Operationsetting', - ), - ] diff --git a/safesite/migrations/0137_auto_20190405_1828.py b/safesite/migrations/0137_auto_20190405_1828.py deleted file mode 100644 index 2b9ea657..00000000 --- a/safesite/migrations/0137_auto_20190405_1828.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 18:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0136_auto_20190405_1825'), - ] - - operations = [ - migrations.RenameModel( - old_name='Operationsplc', - new_name='Operationspjd', - ), - ] diff --git a/safesite/migrations/0138_auto_20190405_1916.py b/safesite/migrations/0138_auto_20190405_1916.py deleted file mode 100644 index b8f61397..00000000 --- a/safesite/migrations/0138_auto_20190405_1916.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 19:16 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0137_auto_20190405_1828'), - ] - - operations = [ - migrations.RenameField( - model_name='operationspjd', - old_name='spmc', - new_name='jdmc', - ), - ] diff --git a/safesite/migrations/0139_remove_operationspjd_deletemark.py b/safesite/migrations/0139_remove_operationspjd_deletemark.py deleted file mode 100644 index bd7a8e29..00000000 --- a/safesite/migrations/0139_remove_operationspjd_deletemark.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 19:35 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0138_auto_20190405_1916'), - ] - - operations = [ - migrations.RemoveField( - model_name='operationspjd', - name='deletemark', - ), - ] diff --git a/safesite/migrations/0140_auto_20190405_2350.py b/safesite/migrations/0140_auto_20190405_2350.py deleted file mode 100644 index 55cec37f..00000000 --- a/safesite/migrations/0140_auto_20190405_2350.py +++ /dev/null @@ -1,83 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-05 23:50 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0139_remove_operationspjd_deletemark'), - ] - - operations = [ - migrations.CreateModel( - name='Opersplc', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('jdmc', models.CharField(max_length=100)), - ('spbm', models.CharField(max_length=200)), - ('ison', models.IntegerField(default=0)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ], - ), - migrations.CreateModel( - name='Operspxq', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('jdmc', models.CharField(max_length=200)), - ('spbm', models.CharField(max_length=200)), - ('action', models.CharField(max_length=200)), - ('checked', models.IntegerField(default=1)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ], - ), - migrations.RemoveField( - model_name='operspry', - name='oper', - ), - migrations.RemoveField( - model_name='operspry', - name='operspry', - ), - migrations.RemoveField( - model_name='operation', - name='spry', - ), - migrations.AlterField( - model_name='operation', - name='zyzt', - field=django.contrib.postgres.fields.jsonb.JSONField(), - ), - migrations.AlterField( - model_name='operzyry', - name='id', - field=models.AutoField(primary_key=True, serialize=False), - ), - migrations.DeleteModel( - name='Operspry', - ), - migrations.AddField( - model_name='operspxq', - name='oper', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation'), - ), - migrations.AddField( - model_name='operspxq', - name='spr', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='opersplc', - name='oper', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operation'), - ), - migrations.AddField( - model_name='opersplc', - name='spr', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0141_auto_20190406_0021.py b/safesite/migrations/0141_auto_20190406_0021.py deleted file mode 100644 index 5703cc9e..00000000 --- a/safesite/migrations/0141_auto_20190406_0021.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-06 00:21 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0140_auto_20190405_2350'), - ] - - operations = [ - migrations.AlterField( - model_name='operation', - name='fxcs', - field=django.contrib.postgres.fields.jsonb.JSONField(), - ), - ] diff --git a/safesite/migrations/0142_auto_20190406_1305.py b/safesite/migrations/0142_auto_20190406_1305.py deleted file mode 100644 index 9f9b2d40..00000000 --- a/safesite/migrations/0142_auto_20190406_1305.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-06 13:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0141_auto_20190406_0021'), - ] - - operations = [ - migrations.AlterField( - model_name='operation', - name='fxcs', - field=models.CharField(max_length=200), - ), - ] diff --git a/safesite/migrations/0142_auto_20190406_1506.py b/safesite/migrations/0142_auto_20190406_1506.py deleted file mode 100644 index a315cadd..00000000 --- a/safesite/migrations/0142_auto_20190406_1506.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-06 15:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0141_auto_20190406_0021'), - ] - - operations = [ - migrations.RemoveField( - model_name='opersplc', - name='oper', - ), - migrations.RemoveField( - model_name='opersplc', - name='spr', - ), - migrations.AddField( - model_name='operation', - name='todouser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='zyclr', to='safesite.User'), - ), - migrations.AlterField( - model_name='operation', - name='fxcs', - field=models.CharField(max_length=200), - ), - migrations.DeleteModel( - name='Opersplc', - ), - ] diff --git a/safesite/migrations/0143_merge_20190408_0940.py b/safesite/migrations/0143_merge_20190408_0940.py deleted file mode 100644 index f1a54881..00000000 --- a/safesite/migrations/0143_merge_20190408_0940.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-08 09:40 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0142_auto_20190406_1305'), - ('safesite', '0142_auto_20190406_1506'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0144_auto_20190408_0940.py b/safesite/migrations/0144_auto_20190408_0940.py deleted file mode 100644 index ad1eca59..00000000 --- a/safesite/migrations/0144_auto_20190408_0940.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-08 09:40 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0143_merge_20190408_0940'), - ] - - operations = [ - migrations.AlterField( - model_name='operspxq', - name='spbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0145_operation_zydd.py b/safesite/migrations/0145_operation_zydd.py deleted file mode 100644 index 67e16558..00000000 --- a/safesite/migrations/0145_operation_zydd.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-08 10:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0144_auto_20190408_0940'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='zydd', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0146_operation_zyimg2.py b/safesite/migrations/0146_operation_zyimg2.py deleted file mode 100644 index 69ee98fe..00000000 --- a/safesite/migrations/0146_operation_zyimg2.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-08 13:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0145_operation_zydd'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='zyimg2', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0147_auto_20190408_1359.py b/safesite/migrations/0147_auto_20190408_1359.py deleted file mode 100644 index 9167ce46..00000000 --- a/safesite/migrations/0147_auto_20190408_1359.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-08 13:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0146_operation_zyimg2'), - ] - - operations = [ - migrations.AlterField( - model_name='operation', - name='zyimg', - field=models.CharField(default='', max_length=1000), - ), - migrations.AlterField( - model_name='operation', - name='zyimg2', - field=models.CharField(default='', max_length=1000), - ), - ] diff --git a/safesite/migrations/0148_auto_20190410_0904.py b/safesite/migrations/0148_auto_20190410_0904.py deleted file mode 100644 index 98c8f47f..00000000 --- a/safesite/migrations/0148_auto_20190410_0904.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-10 09:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0147_auto_20190408_1359'), - ] - - operations = [ - migrations.AlterField( - model_name='fxcs', - name='nousecomps', - field=models.CharField(default=',', max_length=200), - ), - ] diff --git a/safesite/migrations/0149_auto_20190410_0909.py b/safesite/migrations/0149_auto_20190410_0909.py deleted file mode 100644 index 8a5a2f3d..00000000 --- a/safesite/migrations/0149_auto_20190410_0909.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-10 09:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0148_auto_20190410_0904'), - ] - - operations = [ - migrations.AlterField( - model_name='fxcs', - name='nousecomps', - field=models.CharField(default='', max_length=200), - ), - ] diff --git a/safesite/migrations/0150_trainuser_checked.py b/safesite/migrations/0150_trainuser_checked.py deleted file mode 100644 index ed769109..00000000 --- a/safesite/migrations/0150_trainuser_checked.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-10 17:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0149_auto_20190410_0909'), - ] - - operations = [ - migrations.AddField( - model_name='trainuser', - name='checked', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0151_auto_20190410_1731.py b/safesite/migrations/0151_auto_20190410_1731.py deleted file mode 100644 index 82bca414..00000000 --- a/safesite/migrations/0151_auto_20190410_1731.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-10 17:31 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0150_trainuser_checked'), - ] - - operations = [ - migrations.RenameField( - model_name='trainuser', - old_name='trainid', - new_name='train', - ), - migrations.AlterField( - model_name='trainuser', - name='checked', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0152_auto_20190412_0855.py b/safesite/migrations/0152_auto_20190412_0855.py deleted file mode 100644 index c7a48127..00000000 --- a/safesite/migrations/0152_auto_20190412_0855.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-12 08:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0151_auto_20190410_1731'), - ] - - operations = [ - migrations.AddField( - model_name='trainuser', - name='isnew', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='trainuser', - name='qdsj', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0153_dickey_detail.py b/safesite/migrations/0153_dickey_detail.py deleted file mode 100644 index d2468345..00000000 --- a/safesite/migrations/0153_dickey_detail.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-17 11:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0152_auto_20190412_0855'), - ] - - operations = [ - migrations.AddField( - model_name='dickey', - name='detail', - field=models.CharField(default='', max_length=1000), - ), - ] diff --git a/safesite/migrations/0154_auto_20190418_1706.py b/safesite/migrations/0154_auto_20190418_1706.py deleted file mode 100644 index 097b865b..00000000 --- a/safesite/migrations/0154_auto_20190418_1706.py +++ /dev/null @@ -1,100 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-18 17:06 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0153_dickey_detail'), - ] - - operations = [ - migrations.CreateModel( - name='ExamPaper', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=30)), - ('deletemark', models.IntegerField(default=1)), - ('totalscore', models.IntegerField(default=100)), - ('passscore', models.IntegerField(default=60)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('starttime', models.DateTimeField(blank=True, null=True)), - ('endtime', models.DateTimeField(blank=True, null=True)), - ('usecomps', models.CharField(default=',1,', max_length=200)), - ('nousecomps', models.CharField(default='', max_length=200)), - ], - ), - migrations.CreateModel( - name='ExamTest', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('type', models.IntegerField(default=1)), - ('score', models.IntegerField(blank=True, null=True)), - ('ison', models.IntegerField(default=0)), - ('testtime', models.DateTimeField(blank=True, null=True)), - ('took', models.IntegerField(default=0)), - ('rights', models.IntegerField(default=1)), - ('wrongs', models.IntegerField(default=1)), - ('exampaper', models.ManyToManyField(to='safesite.ExamPaper')), - ('user', models.ManyToManyField(to='safesite.User')), - ], - ), - migrations.CreateModel( - name='Question', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=30)), - ('type', models.IntegerField(default=1)), - ('level', models.IntegerField(default=1)), - ('mark', models.CharField(blank=True, max_length=1000)), - ('answer', django.contrib.postgres.fields.jsonb.JSONField()), - ('right', django.contrib.postgres.fields.jsonb.JSONField()), - ('resolution', models.CharField(blank=True, max_length=1000)), - ('deletemark', models.IntegerField(default=1)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('usecomps', models.CharField(default=',1,', max_length=200)), - ('nousecomps', models.CharField(default='', max_length=200)), - ], - ), - migrations.CreateModel( - name='Questioncate', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=30)), - ('partlink', models.CharField(blank=True, max_length=200)), - ('deletemark', models.IntegerField(default='1')), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('usecomps', models.CharField(default=',1,', max_length=200)), - ('nousecomps', models.CharField(default='', max_length=200)), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncate')), - ], - ), - migrations.CreateModel( - name='QuestionTest', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('answer', django.contrib.postgres.fields.jsonb.JSONField()), - ('isright', models.IntegerField(default=0)), - ('score', models.FloatField()), - ('examtest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest')), - ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Question')), - ], - ), - migrations.AddField( - model_name='question', - name='cate', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncate'), - ), - migrations.AddField( - model_name='exampaper', - name='questions', - field=models.ManyToManyField(to='safesite.Question'), - ), - ] diff --git a/safesite/migrations/0155_auto_20190419_1027.py b/safesite/migrations/0155_auto_20190419_1027.py deleted file mode 100644 index 7c2092cc..00000000 --- a/safesite/migrations/0155_auto_20190419_1027.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-19 10:27 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0154_auto_20190418_1706'), - ] - - operations = [ - migrations.RemoveField( - model_name='questioncate', - name='parent', - ), - migrations.AddField( - model_name='dickey', - name='creattime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='dickey', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='question', - name='cate', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - migrations.DeleteModel( - name='Questioncate', - ), - ] diff --git a/safesite/migrations/0156_question_creatuser.py b/safesite/migrations/0156_question_creatuser.py deleted file mode 100644 index 1d1dc790..00000000 --- a/safesite/migrations/0156_question_creatuser.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-19 10:59 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0155_auto_20190419_1027'), - ] - - operations = [ - migrations.AddField( - model_name='question', - name='creatuser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0157_auto_20190419_1130.py b/safesite/migrations/0157_auto_20190419_1130.py deleted file mode 100644 index 1c6c0fe0..00000000 --- a/safesite/migrations/0157_auto_20190419_1130.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-19 11:30 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0156_question_creatuser'), - ] - - operations = [ - migrations.RenameField( - model_name='question', - old_name='creatuser', - new_name='createuser', - ), - ] diff --git a/safesite/migrations/0158_question_station.py b/safesite/migrations/0158_question_station.py deleted file mode 100644 index a4f2553f..00000000 --- a/safesite/migrations/0158_question_station.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-19 16:47 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0157_auto_20190419_1130'), - ] - - operations = [ - migrations.AddField( - model_name='question', - name='station', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), - ), - ] diff --git a/safesite/migrations/0159_auto_20190419_1651.py b/safesite/migrations/0159_auto_20190419_1651.py deleted file mode 100644 index cb6fdd48..00000000 --- a/safesite/migrations/0159_auto_20190419_1651.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-19 16:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0158_question_station'), - ] - - operations = [ - migrations.AlterField( - model_name='question', - name='resolution', - field=models.TextField(), - ), - migrations.AlterField( - model_name='question', - name='title', - field=models.TextField(), - ), - ] diff --git a/safesite/migrations/0160_auto_20190422_0945.py b/safesite/migrations/0160_auto_20190422_0945.py deleted file mode 100644 index dd71a328..00000000 --- a/safesite/migrations/0160_auto_20190422_0945.py +++ /dev/null @@ -1,51 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-22 09:45 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0159_auto_20190419_1651'), - ] - - operations = [ - migrations.RemoveField( - model_name='examtest', - name='exampaper', - ), - migrations.RemoveField( - model_name='examtest', - name='user', - ), - migrations.RemoveField( - model_name='questiontest', - name='examtest', - ), - migrations.RemoveField( - model_name='questiontest', - name='question', - ), - migrations.RemoveField( - model_name='exampaper', - name='endtime', - ), - migrations.RemoveField( - model_name='exampaper', - name='passscore', - ), - migrations.RemoveField( - model_name='exampaper', - name='starttime', - ), - migrations.RemoveField( - model_name='exampaper', - name='totalscore', - ), - migrations.DeleteModel( - name='ExamTest', - ), - migrations.DeleteModel( - name='QuestionTest', - ), - ] diff --git a/safesite/migrations/0161_examtest.py b/safesite/migrations/0161_examtest.py deleted file mode 100644 index 8539d1f1..00000000 --- a/safesite/migrations/0161_examtest.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-22 09:46 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0160_auto_20190422_0945'), - ] - - operations = [ - migrations.CreateModel( - name='ExamTest', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('type', models.IntegerField(default=1)), - ('testtime', models.DateTimeField(blank=True, null=True)), - ('took', models.IntegerField(default=0)), - ('rights', models.IntegerField(default=1)), - ('wrongs', models.IntegerField(default=1)), - ('ison', models.IntegerField(default=0)), - ('testdetail', django.contrib.postgres.fields.jsonb.JSONField()), - ('score', models.FloatField()), - ('starttime', models.DateTimeField(blank=True, null=True)), - ('endtime', models.DateTimeField(blank=True, null=True)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('totalscore', models.IntegerField(default=100)), - ('passscore', models.IntegerField(default=60)), - ('exampaper', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamPaper')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0162_exampaper_type.py b/safesite/migrations/0162_exampaper_type.py deleted file mode 100644 index f742b86b..00000000 --- a/safesite/migrations/0162_exampaper_type.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-22 10:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0161_examtest'), - ] - - operations = [ - migrations.AddField( - model_name='exampaper', - name='type', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0163_auto_20190422_1114.py b/safesite/migrations/0163_auto_20190422_1114.py deleted file mode 100644 index 882d6ba8..00000000 --- a/safesite/migrations/0163_auto_20190422_1114.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-22 11:14 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0162_exampaper_type'), - ] - - operations = [ - migrations.RenameField( - model_name='exampaper', - old_name='type', - new_name='state', - ), - migrations.AddField( - model_name='exampaper', - name='num', - field=models.CharField(default='', max_length=200), - ), - migrations.AddField( - model_name='exampaper', - name='total', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='exampaper', - name='name', - field=models.CharField(max_length=200), - ), - ] diff --git a/safesite/migrations/0164_auto_20190423_0840.py b/safesite/migrations/0164_auto_20190423_0840.py deleted file mode 100644 index f651686c..00000000 --- a/safesite/migrations/0164_auto_20190423_0840.py +++ /dev/null @@ -1,103 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 08:40 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0163_auto_20190422_1114'), - ] - - operations = [ - migrations.CreateModel( - name='ExamPaperDetail', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('score', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='ExamTestDetail', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('teastnum', models.IntegerField(default=0)), - ('starttime', models.DateTimeField(blank=True, null=True)), - ('endtime', models.DateTimeField(blank=True, null=True)), - ('took', models.IntegerField(default=0)), - ('rights', models.IntegerField(default=1)), - ('wrongs', models.IntegerField(default=1)), - ('ison', models.IntegerField(default=0)), - ('testdetail', django.contrib.postgres.fields.jsonb.JSONField()), - ('score', models.FloatField()), - ], - ), - migrations.RemoveField( - model_name='exampaper', - name='questions', - ), - migrations.RemoveField( - model_name='examtest', - name='ison', - ), - migrations.RemoveField( - model_name='examtest', - name='rights', - ), - migrations.RemoveField( - model_name='examtest', - name='score', - ), - migrations.RemoveField( - model_name='examtest', - name='testdetail', - ), - migrations.RemoveField( - model_name='examtest', - name='testtime', - ), - migrations.RemoveField( - model_name='examtest', - name='took', - ), - migrations.RemoveField( - model_name='examtest', - name='wrongs', - ), - migrations.RemoveField( - model_name='examtest', - name='user', - ), - migrations.AddField( - model_name='examtestdetail', - name='examtest', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest'), - ), - migrations.AddField( - model_name='examtestdetail', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='exampaperdetail', - name='exampaper', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamPaper'), - ), - migrations.AddField( - model_name='exampaperdetail', - name='question', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Question'), - ), - migrations.AddField( - model_name='exampaper', - name='question', - field=models.ManyToManyField(through='safesite.ExamPaperDetail', to='safesite.Question'), - ), - migrations.AddField( - model_name='examtest', - name='user', - field=models.ManyToManyField(through='safesite.ExamTestDetail', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0165_examtest_name.py b/safesite/migrations/0165_examtest_name.py deleted file mode 100644 index 2db1b0da..00000000 --- a/safesite/migrations/0165_examtest_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 14:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0164_auto_20190423_0840'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='name', - field=models.CharField(default='', max_length=200), - ), - ] diff --git a/safesite/migrations/0166_examtest_num.py b/safesite/migrations/0166_examtest_num.py deleted file mode 100644 index 99a4503d..00000000 --- a/safesite/migrations/0166_examtest_num.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 14:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0165_examtest_name'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='num', - field=models.CharField(default='', max_length=200), - ), - ] diff --git a/safesite/migrations/0167_auto_20190423_1745.py b/safesite/migrations/0167_auto_20190423_1745.py deleted file mode 100644 index 0022101c..00000000 --- a/safesite/migrations/0167_auto_20190423_1745.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 17:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0166_examtest_num'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='nousecomps', - field=models.CharField(default='', max_length=200), - ), - migrations.AddField( - model_name='examtest', - name='usecomps', - field=models.CharField(default=',1,', max_length=200), - ), - ] diff --git a/safesite/migrations/0168_auto_20190423_1752.py b/safesite/migrations/0168_auto_20190423_1752.py deleted file mode 100644 index 53f1cd58..00000000 --- a/safesite/migrations/0168_auto_20190423_1752.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 17:52 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0167_auto_20190423_1745'), - ] - - operations = [ - migrations.AlterField( - model_name='examtestdetail', - name='testdetail', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0169_auto_20190423_1753.py b/safesite/migrations/0169_auto_20190423_1753.py deleted file mode 100644 index 996d10b2..00000000 --- a/safesite/migrations/0169_auto_20190423_1753.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-23 17:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0168_auto_20190423_1752'), - ] - - operations = [ - migrations.AlterField( - model_name='examtestdetail', - name='score', - field=models.FloatField(default=0), - ), - ] diff --git a/safesite/migrations/0170_examtest_state.py b/safesite/migrations/0170_examtest_state.py deleted file mode 100644 index 2580a63f..00000000 --- a/safesite/migrations/0170_examtest_state.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-24 08:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0169_auto_20190423_1753'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='state', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0171_examtest_createuser.py b/safesite/migrations/0171_examtest_createuser.py deleted file mode 100644 index 48108502..00000000 --- a/safesite/migrations/0171_examtest_createuser.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-24 08:38 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0170_examtest_state'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='createuser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='kscjr', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0172_examtest_train.py b/safesite/migrations/0172_examtest_train.py deleted file mode 100644 index 0534ac4c..00000000 --- a/safesite/migrations/0172_examtest_train.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-24 09:29 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0171_examtest_createuser'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='train', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Train'), - ), - ] diff --git a/safesite/migrations/0173_examtest_duration.py b/safesite/migrations/0173_examtest_duration.py deleted file mode 100644 index 3df58097..00000000 --- a/safesite/migrations/0173_examtest_duration.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-24 11:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0172_examtest_train'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='duration', - field=models.IntegerField(default=60), - ), - ] diff --git a/safesite/migrations/0174_remove_examtestdetail_wrongs.py b/safesite/migrations/0174_remove_examtestdetail_wrongs.py deleted file mode 100644 index ad722eda..00000000 --- a/safesite/migrations/0174_remove_examtestdetail_wrongs.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-26 17:40 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0173_examtest_duration'), - ] - - operations = [ - migrations.RemoveField( - model_name='examtestdetail', - name='wrongs', - ), - ] diff --git a/safesite/migrations/0175_auto_20190426_1758.py b/safesite/migrations/0175_auto_20190426_1758.py deleted file mode 100644 index 6b5b4977..00000000 --- a/safesite/migrations/0175_auto_20190426_1758.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-26 17:58 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0174_remove_examtestdetail_wrongs'), - ] - - operations = [ - migrations.RenameField( - model_name='examtestdetail', - old_name='teastnum', - new_name='testnum', - ), - ] diff --git a/safesite/migrations/0176_examtestdetail_passcode.py b/safesite/migrations/0176_examtestdetail_passcode.py deleted file mode 100644 index 381db6ce..00000000 --- a/safesite/migrations/0176_examtestdetail_passcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-04-29 13:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0175_auto_20190426_1758'), - ] - - operations = [ - migrations.AddField( - model_name='examtestdetail', - name='passcode', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0177_auto_20190505_0852.py b/safesite/migrations/0177_auto_20190505_0852.py deleted file mode 100644 index 411de3fd..00000000 --- a/safesite/migrations/0177_auto_20190505_0852.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-05 08:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0176_examtestdetail_passcode'), - ] - - operations = [ - migrations.AddField( - model_name='examtestdetail', - name='tms', - field=models.CharField(default=',', max_length=600), - ), - migrations.AddField( - model_name='examtestdetail', - name='wrongs', - field=models.CharField(default=',', max_length=600), - ), - ] diff --git a/safesite/migrations/0178_auto_20190510_1752.py b/safesite/migrations/0178_auto_20190510_1752.py deleted file mode 100644 index 22a6da38..00000000 --- a/safesite/migrations/0178_auto_20190510_1752.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-10 17:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0177_auto_20190505_0852'), - ] - - operations = [ - migrations.RenameField( - model_name='examtest', - old_name='creattime', - new_name='createtime', - ), - ] diff --git a/safesite/migrations/0179_dickey_parent.py b/safesite/migrations/0179_dickey_parent.py deleted file mode 100644 index 90a6cf00..00000000 --- a/safesite/migrations/0179_dickey_parent.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 09:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0178_auto_20190510_1752'), - ] - - operations = [ - migrations.AddField( - model_name='dickey', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0180_auto_20190514_1151.py b/safesite/migrations/0180_auto_20190514_1151.py deleted file mode 100644 index b0768c40..00000000 --- a/safesite/migrations/0180_auto_20190514_1151.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 11:51 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0179_dickey_parent'), - ] - - operations = [ - migrations.CreateModel( - name='Questioncat', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=30)), - ('type', models.IntegerField(default=1)), - ('deletemark', models.IntegerField(default='1')), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('usecomps', models.CharField(default=',1,', max_length=200)), - ('nousecomps', models.CharField(default='', max_length=200)), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat')), - ], - ), - migrations.AddField( - model_name='question', - name='questioncat', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat'), - ), - ] diff --git a/safesite/migrations/0181_auto_20190514_1424.py b/safesite/migrations/0181_auto_20190514_1424.py deleted file mode 100644 index a971f8d7..00000000 --- a/safesite/migrations/0181_auto_20190514_1424.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 14:24 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0180_auto_20190514_1151'), - ] - - operations = [ - migrations.RemoveField( - model_name='questioncat', - name='nousecomps', - ), - migrations.RemoveField( - model_name='questioncat', - name='usecomps', - ), - migrations.AddField( - model_name='questioncat', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0182_remove_questioncat_type.py b/safesite/migrations/0182_remove_questioncat_type.py deleted file mode 100644 index 74c3531a..00000000 --- a/safesite/migrations/0182_remove_questioncat_type.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 14:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0181_auto_20190514_1424'), - ] - - operations = [ - migrations.RemoveField( - model_name='questioncat', - name='type', - ), - ] diff --git a/safesite/migrations/0183_questioncat_partlink.py b/safesite/migrations/0183_questioncat_partlink.py deleted file mode 100644 index af52823d..00000000 --- a/safesite/migrations/0183_questioncat_partlink.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 15:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0182_remove_questioncat_type'), - ] - - operations = [ - migrations.AddField( - model_name='questioncat', - name='partlink', - field=models.CharField(blank=True, max_length=200), - ), - ] diff --git a/safesite/migrations/0184_auto_20190514_1531.py b/safesite/migrations/0184_auto_20190514_1531.py deleted file mode 100644 index f4a00541..00000000 --- a/safesite/migrations/0184_auto_20190514_1531.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 15:31 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0183_questioncat_partlink'), - ] - - operations = [ - migrations.RenameField( - model_name='questioncat', - old_name='partlink', - new_name='link', - ), - ] diff --git a/safesite/migrations/0185_remove_question_cate.py b/safesite/migrations/0185_remove_question_cate.py deleted file mode 100644 index 1251b2ec..00000000 --- a/safesite/migrations/0185_remove_question_cate.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 15:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0184_auto_20190514_1531'), - ] - - operations = [ - migrations.RemoveField( - model_name='question', - name='cate', - ), - ] diff --git a/safesite/migrations/0186_auto_20190514_1651.py b/safesite/migrations/0186_auto_20190514_1651.py deleted file mode 100644 index 3183c5e6..00000000 --- a/safesite/migrations/0186_auto_20190514_1651.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-14 16:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0185_remove_question_cate'), - ] - - operations = [ - migrations.AlterField( - model_name='questioncat', - name='link', - field=models.CharField(blank=True, default=',', max_length=200), - ), - ] diff --git a/safesite/migrations/0187_auto_20190521_1119.py b/safesite/migrations/0187_auto_20190521_1119.py deleted file mode 100644 index 08ec0ecb..00000000 --- a/safesite/migrations/0187_auto_20190521_1119.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-21 11:19 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0186_auto_20190514_1651'), - ] - - operations = [ - migrations.RenameField( - model_name='exampaper', - old_name='creattime', - new_name='createtime', - ), - ] diff --git a/safesite/migrations/0188_safecert.py b/safesite/migrations/0188_safecert.py deleted file mode 100644 index 169e45a8..00000000 --- a/safesite/migrations/0188_safecert.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-22 00:52 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0187_auto_20190521_1119'), - ] - - operations = [ - migrations.CreateModel( - name='Safecert', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('realname', models.CharField(max_length=50)), - ('gender', models.CharField(max_length=50)), - ('cardnum', models.CharField(max_length=50)), - ('zglx', models.CharField(max_length=50)), - ('dwllx', models.CharField(max_length=50)), - ('fzjg', models.CharField(max_length=100)), - ('yfsrq', models.DateField(blank=True, null=True)), - ('yxqkssj', models.DateField(blank=True, null=True)), - ('yxqjssj', models.DateField(blank=True, null=True)), - ('zszt', models.IntegerField(blank=True, choices=[(1, '正常'), (2, '待复查'), (3, '超期')], null=True)), - ('url', models.CharField(blank=True, max_length=200, null=True)), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0189_auto_20190522_0056.py b/safesite/migrations/0189_auto_20190522_0056.py deleted file mode 100644 index b30abc98..00000000 --- a/safesite/migrations/0189_auto_20190522_0056.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-22 00:56 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0188_safecert'), - ] - - operations = [ - migrations.RenameField( - model_name='safecert', - old_name='dwllx', - new_name='dwlx', - ), - ] diff --git a/safesite/migrations/0190_auto_20190524_1115.py b/safesite/migrations/0190_auto_20190524_1115.py deleted file mode 100644 index ebf6c592..00000000 --- a/safesite/migrations/0190_auto_20190524_1115.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-24 11:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0189_auto_20190522_0056'), - ] - - operations = [ - migrations.RemoveField( - model_name='examtest', - name='train', - ), - migrations.RemoveField( - model_name='trainuser', - name='score', - ), - migrations.AddField( - model_name='train', - name='pxxg', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='trainuser', - name='examtestdetail', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTestDetail'), - ), - migrations.AddField( - model_name='trainuser', - name='opinion', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0191_auto_20190528_2250.py b/safesite/migrations/0191_auto_20190528_2250.py deleted file mode 100644 index ea9c421d..00000000 --- a/safesite/migrations/0191_auto_20190528_2250.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.1.5 on 2019-05-28 22:50 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0190_auto_20190524_1115'), - ] - - operations = [ - migrations.CreateModel( - name='Area', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=50)), - ('order', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='Map', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=50)), - ('pic', models.CharField(blank=True, max_length=1000)), - ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.AlterField( - model_name='notice', - name='modifytime', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='更新时间'), - ), - migrations.AddField( - model_name='area', - name='map', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Map'), - ), - ] diff --git a/safesite/migrations/0192_auto_20190604_1032.py b/safesite/migrations/0192_auto_20190604_1032.py deleted file mode 100644 index 3da71da0..00000000 --- a/safesite/migrations/0192_auto_20190604_1032.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-04 10:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0191_auto_20190528_2250'), - ] - - operations = [ - migrations.RenameField( - model_name='area', - old_name='map', - new_name='usemap', - ), - migrations.AddField( - model_name='area', - name='location', - field=models.CharField(default=None, max_length=200), - preserve_default=False, - ), - migrations.AddField( - model_name='map', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Map'), - ), - ] diff --git a/safesite/migrations/0193_map_link.py b/safesite/migrations/0193_map_link.py deleted file mode 100644 index db27b5a4..00000000 --- a/safesite/migrations/0193_map_link.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-04 11:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0192_auto_20190604_1032'), - ] - - operations = [ - migrations.AddField( - model_name='map', - name='link', - field=models.CharField(blank=True, max_length=200), - ), - ] diff --git a/safesite/migrations/0194_auto_20190604_1148.py b/safesite/migrations/0194_auto_20190604_1148.py deleted file mode 100644 index 94c8aef7..00000000 --- a/safesite/migrations/0194_auto_20190604_1148.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-04 11:48 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0193_map_link'), - ] - - operations = [ - migrations.RemoveField( - model_name='area', - name='usemap', - ), - migrations.AddField( - model_name='area', - name='belongmap', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='belongmap', to='safesite.Map'), - ), - migrations.AddField( - model_name='area', - name='containmap', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='containmap', to='safesite.Map'), - ), - ] diff --git a/safesite/migrations/0195_auto_20190604_1437.py b/safesite/migrations/0195_auto_20190604_1437.py deleted file mode 100644 index ed6456ed..00000000 --- a/safesite/migrations/0195_auto_20190604_1437.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-04 14:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0194_auto_20190604_1148'), - ] - - operations = [ - migrations.AddField( - model_name='area', - name='deletemark', - field=models.IntegerField(default='1'), - ), - migrations.AddField( - model_name='map', - name='deletemark', - field=models.IntegerField(default='1'), - ), - ] diff --git a/safesite/migrations/0196_auto_20190604_1736.py b/safesite/migrations/0196_auto_20190604_1736.py deleted file mode 100644 index f058c14a..00000000 --- a/safesite/migrations/0196_auto_20190604_1736.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-04 17:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0195_auto_20190604_1437'), - ] - - operations = [ - migrations.AlterField( - model_name='area', - name='location', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0197_map_default.py b/safesite/migrations/0197_map_default.py deleted file mode 100644 index b323f7ce..00000000 --- a/safesite/migrations/0197_map_default.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-05 10:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0196_auto_20190604_1736'), - ] - - operations = [ - migrations.AddField( - model_name='map', - name='default', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0198_auto_20190605_1110.py b/safesite/migrations/0198_auto_20190605_1110.py deleted file mode 100644 index dcbf4bad..00000000 --- a/safesite/migrations/0198_auto_20190605_1110.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-05 11:10 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0197_map_default'), - ] - - operations = [ - migrations.AddField( - model_name='area', - name='point', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - migrations.AlterField( - model_name='area', - name='location', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0199_auto_20190605_1636.py b/safesite/migrations/0199_auto_20190605_1636.py deleted file mode 100644 index ba77da40..00000000 --- a/safesite/migrations/0199_auto_20190605_1636.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-05 16:36 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0198_auto_20190605_1110'), - ] - - operations = [ - migrations.RenameField( - model_name='area', - old_name='location', - new_name='polygon', - ), - ] diff --git a/safesite/migrations/0200_remove_area_point.py b/safesite/migrations/0200_remove_area_point.py deleted file mode 100644 index 48a7fee0..00000000 --- a/safesite/migrations/0200_remove_area_point.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-05 17:49 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0199_auto_20190605_1636'), - ] - - operations = [ - migrations.RemoveField( - model_name='area', - name='point', - ), - ] diff --git a/safesite/migrations/0201_trouble_yhqy.py b/safesite/migrations/0201_trouble_yhqy.py deleted file mode 100644 index 56300f2b..00000000 --- a/safesite/migrations/0201_trouble_yhqy.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-06 10:51 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0200_remove_area_point'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='yhqy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), - ), - ] diff --git a/safesite/migrations/0202_miss_missqy.py b/safesite/migrations/0202_miss_missqy.py deleted file mode 100644 index c08dea09..00000000 --- a/safesite/migrations/0202_miss_missqy.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-14 14:44 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0201_trouble_yhqy'), - ] - - operations = [ - migrations.AddField( - model_name='miss', - name='missqy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), - ), - ] diff --git a/safesite/migrations/0203_auto_20190614_1732.py b/safesite/migrations/0203_auto_20190614_1732.py deleted file mode 100644 index e3a2d93a..00000000 --- a/safesite/migrations/0203_auto_20190614_1732.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-14 17:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0202_miss_missqy'), - ] - - operations = [ - migrations.AddField( - model_name='observe', - name='record1', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='observe', - name='record2', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0204_auto_20190616_1702.py b/safesite/migrations/0204_auto_20190616_1702.py deleted file mode 100644 index aa37687e..00000000 --- a/safesite/migrations/0204_auto_20190616_1702.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-16 17:02 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0203_auto_20190614_1732'), - ] - - operations = [ - migrations.CreateModel( - name='Observeto', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('read', models.IntegerField(default=0)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('observe', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Observe')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.AddField( - model_name='observe', - name='reads', - field=models.ManyToManyField(blank=True, null=True, related_name='observetouser', through='safesite.Observeto', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0205_auto_20190616_1703.py b/safesite/migrations/0205_auto_20190616_1703.py deleted file mode 100644 index d1317bec..00000000 --- a/safesite/migrations/0205_auto_20190616_1703.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-16 17:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0204_auto_20190616_1702'), - ] - - operations = [ - migrations.AlterField( - model_name='observe', - name='reads', - field=models.ManyToManyField(related_name='observetouser', through='safesite.Observeto', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0206_auto_20190617_0856.py b/safesite/migrations/0206_auto_20190617_0856.py deleted file mode 100644 index fce83b06..00000000 --- a/safesite/migrations/0206_auto_20190617_0856.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 08:56 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0205_auto_20190616_1703'), - ] - - operations = [ - migrations.CreateModel( - name='Missto', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('read', models.IntegerField(default=0)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('miss', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Miss')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.AddField( - model_name='miss', - name='reads', - field=models.ManyToManyField(related_name='misstouser', through='safesite.Missto', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0207_auto_20190617_1048.py b/safesite/migrations/0207_auto_20190617_1048.py deleted file mode 100644 index 8e502542..00000000 --- a/safesite/migrations/0207_auto_20190617_1048.py +++ /dev/null @@ -1,75 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 10:48 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0206_auto_20190617_0856'), - ] - - operations = [ - migrations.CreateModel( - name='Suggestflow', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('action', models.CharField(blank=True, max_length=100, null=True)), - ('opinion', models.CharField(max_length=500)), - ('result', models.IntegerField(default=1)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ], - ), - migrations.AddField( - model_name='suggest', - name='clms', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='suggest', - name='clr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='clrs', to='safesite.User'), - ), - migrations.AddField( - model_name='suggest', - name='jyfk', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='suggest', - name='jyimg2', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='suggest', - name='jyzt', - field=models.IntegerField(blank=True, choices=[(1, '待评估'), (2, '待处理'), (3, '已归档')], null=True), - ), - migrations.AddField( - model_name='suggest', - name='pgr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pgrs', to='safesite.User'), - ), - migrations.AddField( - model_name='suggest', - name='todouser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='todousers', to='safesite.User'), - ), - migrations.AddField( - model_name='suggestflow', - name='suggest', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Suggest'), - ), - migrations.AddField( - model_name='suggestflow', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='suggest', - name='flow', - field=models.ManyToManyField(related_name='jyflow', through='safesite.Suggestflow', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0208_auto_20190617_1048.py b/safesite/migrations/0208_auto_20190617_1048.py deleted file mode 100644 index cf348155..00000000 --- a/safesite/migrations/0208_auto_20190617_1048.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 10:48 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0207_auto_20190617_1048'), - ] - - operations = [ - migrations.AlterField( - model_name='suggest', - name='clr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sclr', to='safesite.User'), - ), - migrations.AlterField( - model_name='suggest', - name='pgr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='spgr', to='safesite.User'), - ), - migrations.AlterField( - model_name='suggest', - name='todouser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stodouser', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0209_auto_20190617_1157.py b/safesite/migrations/0209_auto_20190617_1157.py deleted file mode 100644 index 3fbefe13..00000000 --- a/safesite/migrations/0209_auto_20190617_1157.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 11:57 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0208_auto_20190617_1048'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='jydd', - field=models.CharField(default='', max_length=200), - preserve_default=False, - ), - migrations.AddField( - model_name='suggest', - name='jyqy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), - ), - ] diff --git a/safesite/migrations/0210_auto_20190617_1159.py b/safesite/migrations/0210_auto_20190617_1159.py deleted file mode 100644 index d38bb78b..00000000 --- a/safesite/migrations/0210_auto_20190617_1159.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 11:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0209_auto_20190617_1157'), - ] - - operations = [ - migrations.AlterField( - model_name='suggest', - name='jydd', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0211_suggest_clcs.py b/safesite/migrations/0211_suggest_clcs.py deleted file mode 100644 index b81fd803..00000000 --- a/safesite/migrations/0211_suggest_clcs.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-17 17:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0210_auto_20190617_1159'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='clcs', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0212_auto_20190618_1039.py b/safesite/migrations/0212_auto_20190618_1039.py deleted file mode 100644 index 632a2a08..00000000 --- a/safesite/migrations/0212_auto_20190618_1039.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 10:39 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0211_suggest_clcs'), - ] - - operations = [ - migrations.AlterField( - model_name='suggest', - name='jyimg2', - field=django.contrib.postgres.fields.jsonb.JSONField(default=[]), - ), - migrations.AlterField( - model_name='suggest', - name='jyzt', - field=models.IntegerField(blank=True, choices=[(1, '待评估'), (2, '待处理'), (3, '待确认'), (4, '已归档')], null=True), - ), - ] diff --git a/safesite/migrations/0213_remove_suggest_jyimg2.py b/safesite/migrations/0213_remove_suggest_jyimg2.py deleted file mode 100644 index 29233730..00000000 --- a/safesite/migrations/0213_remove_suggest_jyimg2.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 10:40 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0212_auto_20190618_1039'), - ] - - operations = [ - migrations.RemoveField( - model_name='suggest', - name='jyimg2', - ), - ] diff --git a/safesite/migrations/0214_suggest_jyimg2.py b/safesite/migrations/0214_suggest_jyimg2.py deleted file mode 100644 index 4c6b4f22..00000000 --- a/safesite/migrations/0214_suggest_jyimg2.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 10:41 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0213_remove_suggest_jyimg2'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='jyimg2', - field=django.contrib.postgres.fields.jsonb.JSONField(default=[]), - ), - ] diff --git a/safesite/migrations/0215_auto_20190618_1044.py b/safesite/migrations/0215_auto_20190618_1044.py deleted file mode 100644 index 33a27769..00000000 --- a/safesite/migrations/0215_auto_20190618_1044.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 10:44 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0214_suggest_jyimg2'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='jyimg2', - field=django.contrib.postgres.fields.jsonb.JSONField(), - ), - ] diff --git a/safesite/migrations/0216_auto_20190618_1445.py b/safesite/migrations/0216_auto_20190618_1445.py deleted file mode 100644 index 8f312492..00000000 --- a/safesite/migrations/0216_auto_20190618_1445.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 14:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0215_auto_20190618_1044'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='sjwcsj', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AddField( - model_name='suggest', - name='yjwcsj', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0217_suggest_shyj.py b/safesite/migrations/0217_suggest_shyj.py deleted file mode 100644 index 547f8949..00000000 --- a/safesite/migrations/0217_suggest_shyj.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-18 15:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0216_auto_20190618_1445'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='shyj', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0218_auto_20190619_1652.py b/safesite/migrations/0218_auto_20190619_1652.py deleted file mode 100644 index cf2c84d8..00000000 --- a/safesite/migrations/0218_auto_20190619_1652.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-19 16:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0217_suggest_shyj'), - ] - - operations = [ - migrations.AddField( - model_name='observe', - name='looktime2', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='fxcs', - name='cslx', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0219_auto_20190628_0807.py b/safesite/migrations/0219_auto_20190628_0807.py deleted file mode 100644 index cb24207a..00000000 --- a/safesite/migrations/0219_auto_20190628_0807.py +++ /dev/null @@ -1,70 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-28 08:07 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0218_auto_20190619_1652'), - ] - - operations = [ - migrations.CreateModel( - name='Equipment', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('num', models.CharField(blank=True, max_length=30, null=True)), - ('name', models.CharField(max_length=30)), - ('type', models.CharField(blank=True, max_length=30, null=True)), - ('parameter', models.TextField()), - ('oem', models.CharField(blank=True, max_length=50, null=True)), - ('fnum', models.CharField(blank=True, max_length=30, null=True)), - ('fdate', models.DateField(blank=True, null=True)), - ('udate', models.DateField(blank=True, null=True)), - ('place', models.CharField(max_length=50)), - ('note', models.TextField()), - ('deletemark', models.IntegerField(default=1)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area')), - ], - ), - migrations.CreateModel( - name='Equipmentbook', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=30)), - ('deletemark', models.IntegerField(default=1)), - ('link', models.CharField(blank=True, default=',', max_length=200)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Equipmentbook')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.CreateModel( - name='Risk', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ], - ), - migrations.CreateModel( - name='RiskControl', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ], - ), - migrations.AddField( - model_name='equipment', - name='book', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Equipmentbook'), - ), - migrations.AddField( - model_name='equipment', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0220_auto_20190628_1620.py b/safesite/migrations/0220_auto_20190628_1620.py deleted file mode 100644 index 645a9af7..00000000 --- a/safesite/migrations/0220_auto_20190628_1620.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-28 16:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0219_auto_20190628_0807'), - ] - - operations = [ - migrations.AddField( - model_name='equipment', - name='cate', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - migrations.AddField( - model_name='equipment', - name='catename', - field=models.CharField(blank=True, max_length=30, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='place', - field=models.CharField(blank=True, max_length=50, null=True), - ), - ] diff --git a/safesite/migrations/0221_auto_20190628_1659.py b/safesite/migrations/0221_auto_20190628_1659.py deleted file mode 100644 index a9d95638..00000000 --- a/safesite/migrations/0221_auto_20190628_1659.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-06-28 16:59 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0220_auto_20190628_1620'), - ] - - operations = [ - migrations.AddField( - model_name='equipment', - name='iskey', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='equipment', - name='istz', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0222_auto_20190701_1756.py b/safesite/migrations/0222_auto_20190701_1756.py deleted file mode 100644 index fd30a2b8..00000000 --- a/safesite/migrations/0222_auto_20190701_1756.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-01 17:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0221_auto_20190628_1659'), - ] - - operations = [ - migrations.AddField( - model_name='equipment', - name='zrbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sbzrbm', to='safesite.Partment'), - ), - migrations.AddField( - model_name='equipment', - name='zrr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AlterField( - model_name='equipment', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sbssgs', to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0223_auto_20190702_1058.py b/safesite/migrations/0223_auto_20190702_1058.py deleted file mode 100644 index dd837323..00000000 --- a/safesite/migrations/0223_auto_20190702_1058.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 10:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0222_auto_20190701_1756'), - ] - - operations = [ - migrations.AlterField( - model_name='equipment', - name='note', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0224_equipment_state.py b/safesite/migrations/0224_equipment_state.py deleted file mode 100644 index 2d91578c..00000000 --- a/safesite/migrations/0224_equipment_state.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 11:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0223_auto_20190702_1058'), - ] - - operations = [ - migrations.AddField( - model_name='equipment', - name='state', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0225_auto_20190702_1709.py b/safesite/migrations/0225_auto_20190702_1709.py deleted file mode 100644 index 7e8c7037..00000000 --- a/safesite/migrations/0225_auto_20190702_1709.py +++ /dev/null @@ -1,40 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 17:09 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0224_equipment_state'), - ] - - operations = [ - migrations.CreateModel( - name='Inspect', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('state', models.IntegerField(default=1)), - ('content', models.TextField(blank=True, null=True)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ], - ), - migrations.AddField( - model_name='equipment', - name='img', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AddField( - model_name='inspect', - name='equipment', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Equipment'), - ), - migrations.AddField( - model_name='inspect', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0226_auto_20190702_1827.py b/safesite/migrations/0226_auto_20190702_1827.py deleted file mode 100644 index c0a63ecc..00000000 --- a/safesite/migrations/0226_auto_20190702_1827.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 18:27 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0225_auto_20190702_1709'), - ] - - operations = [ - migrations.RemoveField( - model_name='equipmentbook', - name='parent', - ), - migrations.RemoveField( - model_name='equipmentbook', - name='usecomp', - ), - migrations.RemoveField( - model_name='equipment', - name='book', - ), - migrations.DeleteModel( - name='Equipmentbook', - ), - ] diff --git a/safesite/migrations/0227_auto_20190702_2144.py b/safesite/migrations/0227_auto_20190702_2144.py deleted file mode 100644 index dfdce9e1..00000000 --- a/safesite/migrations/0227_auto_20190702_2144.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 21:44 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0226_auto_20190702_1827'), - ] - - operations = [ - migrations.RemoveField( - model_name='map', - name='link', - ), - migrations.RemoveField( - model_name='map', - name='parent', - ), - migrations.AddField( - model_name='area', - name='link', - field=models.CharField(blank=True, max_length=200), - ), - migrations.AddField( - model_name='area', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), - ), - ] diff --git a/safesite/migrations/0228_auto_20190702_2156.py b/safesite/migrations/0228_auto_20190702_2156.py deleted file mode 100644 index 5158905d..00000000 --- a/safesite/migrations/0228_auto_20190702_2156.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 21:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0227_auto_20190702_2144'), - ] - - operations = [ - migrations.AddField( - model_name='map', - name='link', - field=models.CharField(blank=True, max_length=200), - ), - migrations.AddField( - model_name='map', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Map'), - ), - ] diff --git a/safesite/migrations/0229_area_usecomp.py b/safesite/migrations/0229_area_usecomp.py deleted file mode 100644 index 655dddc8..00000000 --- a/safesite/migrations/0229_area_usecomp.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 22:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0228_auto_20190702_2156'), - ] - - operations = [ - migrations.AddField( - model_name='area', - name='usecomp', - field=models.ForeignKey(default=1144, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0230_auto_20190702_2218.py b/safesite/migrations/0230_auto_20190702_2218.py deleted file mode 100644 index ac564528..00000000 --- a/safesite/migrations/0230_auto_20190702_2218.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-02 22:18 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0229_area_usecomp'), - ] - - operations = [ - migrations.AlterField( - model_name='area', - name='usecomp', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0231_inspect_user.py b/safesite/migrations/0231_inspect_user.py deleted file mode 100644 index 0503daa3..00000000 --- a/safesite/migrations/0231_inspect_user.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-03 20:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0230_auto_20190702_2218'), - ] - - operations = [ - migrations.AddField( - model_name='inspect', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0232_inspect_trouble.py b/safesite/migrations/0232_inspect_trouble.py deleted file mode 100644 index cadde5af..00000000 --- a/safesite/migrations/0232_inspect_trouble.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-05 14:41 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0231_inspect_user'), - ] - - operations = [ - migrations.AddField( - model_name='inspect', - name='trouble', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble'), - ), - ] diff --git a/safesite/migrations/0233_auto_20190709_1720.py b/safesite/migrations/0233_auto_20190709_1720.py deleted file mode 100644 index 46a0b018..00000000 --- a/safesite/migrations/0233_auto_20190709_1720.py +++ /dev/null @@ -1,99 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-09 17:20 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0232_inspect_trouble'), - ] - - operations = [ - migrations.CreateModel( - name='RiskAct', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('place', models.CharField(blank=True, max_length=50, null=True)), - ('name', models.CharField(blank=True, max_length=200, null=True)), - ('createtime', models.DateTimeField(default=django.utils.timezone.now)), - ('area', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area')), - ('cate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ], - ), - migrations.DeleteModel( - name='RiskControl', - ), - migrations.AddField( - model_name='risk', - name='createtime', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='risk', - name='createuser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskcjr', to='safesite.User'), - ), - migrations.AddField( - model_name='risk', - name='hazard', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='measure1', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='measure2', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='measure3', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='measure4', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='measure5', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='order', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='risk', - name='result', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='step', - field=models.TextField(blank=True, null=True), - ), - migrations.AddField( - model_name='risk', - name='zrbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - migrations.AddField( - model_name='risk', - name='zrr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrr', to='safesite.User'), - ), - migrations.AddField( - model_name='risk', - name='riskact', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), - ), - ] diff --git a/safesite/migrations/0234_auto_20190709_1821.py b/safesite/migrations/0234_auto_20190709_1821.py deleted file mode 100644 index 3c0afd41..00000000 --- a/safesite/migrations/0234_auto_20190709_1821.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-09 18:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0233_auto_20190709_1720'), - ] - - operations = [ - migrations.AddField( - model_name='risk', - name='level', - field=models.CharField(blank=True, max_length=50, null=True), - ), - migrations.AddField( - model_name='risk', - name='rislc', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='risk', - name='risld', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='risk', - name='risle', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='risk', - name='risll', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='riskact', - name='level', - field=models.CharField(blank=True, max_length=50, null=True), - ), - ] diff --git a/safesite/migrations/0235_auto_20190709_2243.py b/safesite/migrations/0235_auto_20190709_2243.py deleted file mode 100644 index da75a0ee..00000000 --- a/safesite/migrations/0235_auto_20190709_2243.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-09 22:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0234_auto_20190709_1821'), - ] - - operations = [ - migrations.RenameField( - model_name='riskact', - old_name='cate', - new_name='type', - ), - ] diff --git a/safesite/migrations/0236_risk_gkcj.py b/safesite/migrations/0236_risk_gkcj.py deleted file mode 100644 index cdc54cd2..00000000 --- a/safesite/migrations/0236_risk_gkcj.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-10 09:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0235_auto_20190709_2243'), - ] - - operations = [ - migrations.AddField( - model_name='risk', - name='gkcj', - field=models.CharField(blank=True, max_length=50, null=True), - ), - ] diff --git a/safesite/migrations/0237_auto_20190710_1439.py b/safesite/migrations/0237_auto_20190710_1439.py deleted file mode 100644 index de506c86..00000000 --- a/safesite/migrations/0237_auto_20190710_1439.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-10 14:39 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0236_risk_gkcj'), - ] - - operations = [ - migrations.RenameField( - model_name='risk', - old_name='rislc', - new_name='riskc', - ), - migrations.RenameField( - model_name='risk', - old_name='risld', - new_name='riskd', - ), - migrations.RenameField( - model_name='risk', - old_name='risle', - new_name='riske', - ), - migrations.RenameField( - model_name='risk', - old_name='risll', - new_name='riskl', - ), - migrations.AddField( - model_name='riskact', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0238_auto_20190710_1522.py b/safesite/migrations/0238_auto_20190710_1522.py deleted file mode 100644 index 9c6ba30b..00000000 --- a/safesite/migrations/0238_auto_20190710_1522.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-10 15:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0237_auto_20190710_1439'), - ] - - operations = [ - migrations.AddField( - model_name='risk', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskusecomp', to='safesite.Partment'), - ), - migrations.AlterField( - model_name='risk', - name='zrbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrbm', to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0239_area_risklevel.py b/safesite/migrations/0239_area_risklevel.py deleted file mode 100644 index e6273364..00000000 --- a/safesite/migrations/0239_area_risklevel.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-10 18:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0238_auto_20190710_1522'), - ] - - operations = [ - migrations.AddField( - model_name='area', - name='risklevel', - field=models.CharField(blank=True, max_length=50, null=True), - ), - ] diff --git a/safesite/migrations/0240_riskact_group.py b/safesite/migrations/0240_riskact_group.py deleted file mode 100644 index 1a780358..00000000 --- a/safesite/migrations/0240_riskact_group.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-11 14:41 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0239_area_risklevel'), - ] - - operations = [ - migrations.AddField( - model_name='riskact', - name='group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), - ), - ] diff --git a/safesite/migrations/0241_auto_20190711_1634.py b/safesite/migrations/0241_auto_20190711_1634.py deleted file mode 100644 index 5858be0e..00000000 --- a/safesite/migrations/0241_auto_20190711_1634.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-11 16:34 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0240_riskact_group'), - ] - - operations = [ - migrations.RemoveField( - model_name='riskact', - name='group', - ), - migrations.AddField( - model_name='risk', - name='group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), - ), - ] diff --git a/safesite/migrations/0242_equipment_qrcode.py b/safesite/migrations/0242_equipment_qrcode.py deleted file mode 100644 index e94f5a69..00000000 --- a/safesite/migrations/0242_equipment_qrcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-16 15:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0241_auto_20190711_1634'), - ] - - operations = [ - migrations.AddField( - model_name='equipment', - name='qrcode', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0243_auto_20190717_1103.py b/safesite/migrations/0243_auto_20190717_1103.py deleted file mode 100644 index f4b6c245..00000000 --- a/safesite/migrations/0243_auto_20190717_1103.py +++ /dev/null @@ -1,47 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-17 11:03 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0242_equipment_qrcode'), - ] - - operations = [ - migrations.CreateModel( - name='Edulesson', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('num', models.CharField(max_length=50)), - ('title', models.CharField(max_length=50)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('desciption', models.TextField(blank=True, null=True)), - ('type', models.IntegerField(default=1)), - ('deletemark', models.IntegerField(default=1)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('url', models.CharField(blank=True, max_length=200, null=True)), - ('watchnum', models.IntegerField(default=0)), - ('cate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='scr', to='safesite.User')), - ], - ), - migrations.CreateModel( - name='EdulessonWatch', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('submittime', models.DateTimeField(default=django.utils.timezone.now)), - ('edulesson', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Edulesson')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.AddField( - model_name='edulesson', - name='watchrecord', - field=models.ManyToManyField(related_name='gkr', through='safesite.EdulessonWatch', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0244_operation_zyqy.py b/safesite/migrations/0244_operation_zyqy.py deleted file mode 100644 index 97dd290f..00000000 --- a/safesite/migrations/0244_operation_zyqy.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-21 21:46 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0243_auto_20190717_1103'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='zyqy', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Area'), - ), - ] diff --git a/safesite/migrations/0245_risk_modifytime.py b/safesite/migrations/0245_risk_modifytime.py deleted file mode 100644 index 3ec0cc29..00000000 --- a/safesite/migrations/0245_risk_modifytime.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-07-30 12:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0244_operation_zyqy'), - ] - - operations = [ - migrations.AddField( - model_name='risk', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - ] diff --git a/safesite/migrations/0246_auto_20190805_2105.py b/safesite/migrations/0246_auto_20190805_2105.py deleted file mode 100644 index fdc3a1d9..00000000 --- a/safesite/migrations/0246_auto_20190805_2105.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-05 21:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0245_risk_modifytime'), - ] - - operations = [ - migrations.AlterField( - model_name='equipment', - name='parameter', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0247_train_checkqr.py b/safesite/migrations/0247_train_checkqr.py deleted file mode 100644 index 4c5dba67..00000000 --- a/safesite/migrations/0247_train_checkqr.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-06 09:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0246_auto_20190805_2105'), - ] - - operations = [ - migrations.AddField( - model_name='train', - name='checkqr', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0248_risk_frequency.py b/safesite/migrations/0248_risk_frequency.py deleted file mode 100644 index ccad7cee..00000000 --- a/safesite/migrations/0248_risk_frequency.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-08 14:24 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0247_train_checkqr'), - ] - - operations = [ - migrations.AddField( - model_name='risk', - name='frequency', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0249_auto_20190808_1452.py b/safesite/migrations/0249_auto_20190808_1452.py deleted file mode 100644 index 2c10ee9a..00000000 --- a/safesite/migrations/0249_auto_20190808_1452.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-08 14:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0248_risk_frequency'), - ] - - operations = [ - migrations.RenameField( - model_name='risk', - old_name='frequency', - new_name='tasktype', - ), - ] diff --git a/safesite/migrations/0250_auto_20190808_1649.py b/safesite/migrations/0250_auto_20190808_1649.py deleted file mode 100644 index 57dfe26d..00000000 --- a/safesite/migrations/0250_auto_20190808_1649.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-08 16:49 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0249_auto_20190808_1452'), - ] - - operations = [ - migrations.CreateModel( - name='Risktask', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('taskadd', models.DateTimeField(default=django.utils.timezone.now)), - ('taskdo', models.DateTimeField(auto_now=True)), - ('note', models.TextField(blank=True, null=True)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), - ], - ), - migrations.AddField( - model_name='risk', - name='tasktime', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AddField( - model_name='risktask', - name='risk', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk'), - ), - migrations.AddField( - model_name='risktask', - name='trouble', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble'), - ), - migrations.AddField( - model_name='risktask', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0251_auto_20190808_1807.py b/safesite/migrations/0251_auto_20190808_1807.py deleted file mode 100644 index f78605fe..00000000 --- a/safesite/migrations/0251_auto_20190808_1807.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-08 18:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0250_auto_20190808_1649'), - ] - - operations = [ - migrations.AddField( - model_name='risktask', - name='usable', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='risktask', - name='taskdo', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0252_auto_20190809_1009.py b/safesite/migrations/0252_auto_20190809_1009.py deleted file mode 100644 index d1690a82..00000000 --- a/safesite/migrations/0252_auto_20190809_1009.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-09 10:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0251_auto_20190808_1807'), - ] - - operations = [ - migrations.AddField( - model_name='risktask', - name='taskexpire', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='risktask', - name='taskadd', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0253_auto_20190811_0007.py b/safesite/migrations/0253_auto_20190811_0007.py deleted file mode 100644 index 807ab5fd..00000000 --- a/safesite/migrations/0253_auto_20190811_0007.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-11 00:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0252_auto_20190809_1009'), - ] - - operations = [ - migrations.AlterField( - model_name='risk', - name='riskc', - field=models.DecimalField(decimal_places=1, max_digits=6), - ), - migrations.AlterField( - model_name='risk', - name='riskd', - field=models.DecimalField(decimal_places=1, max_digits=6), - ), - migrations.AlterField( - model_name='risk', - name='riske', - field=models.DecimalField(decimal_places=1, max_digits=6), - ), - migrations.AlterField( - model_name='risk', - name='riskl', - field=models.DecimalField(decimal_places=1, max_digits=6), - ), - ] diff --git a/safesite/migrations/0254_risktask_type.py b/safesite/migrations/0254_risktask_type.py deleted file mode 100644 index e0cf15fc..00000000 --- a/safesite/migrations/0254_risktask_type.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-11 23:18 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0253_auto_20190811_0007'), - ] - - operations = [ - migrations.AddField( - model_name='risktask', - name='type', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0255_riskcheck.py b/safesite/migrations/0255_riskcheck.py deleted file mode 100644 index d74e68ac..00000000 --- a/safesite/migrations/0255_riskcheck.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-12 18:23 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0254_risktask_type'), - ] - - operations = [ - migrations.CreateModel( - name='Riskcheck', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('dotime', models.DateTimeField(blank=True, null=True)), - ('note', models.TextField(blank=True, null=True)), - ('risk', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk')), - ('risktask', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risktask')), - ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0256_riskact_qrcode.py b/safesite/migrations/0256_riskact_qrcode.py deleted file mode 100644 index 5fb0ba81..00000000 --- a/safesite/migrations/0256_riskact_qrcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-13 10:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0255_riskcheck'), - ] - - operations = [ - migrations.AddField( - model_name='riskact', - name='qrcode', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0257_report.py b/safesite/migrations/0257_report.py deleted file mode 100644 index 9b7818dd..00000000 --- a/safesite/migrations/0257_report.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-18 21:05 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0256_riskact_qrcode'), - ] - - operations = [ - migrations.CreateModel( - name='Report', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('year', models.IntegerField(blank=True, null=True)), - ('month', models.IntegerField(blank=True, null=True)), - ('cause', models.TextField(blank=True, null=True)), - ('suggest', models.TextField(blank=True, null=True)), - ('part', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0258_yjyc_missvalue.py b/safesite/migrations/0258_yjyc_missvalue.py deleted file mode 100644 index a9f4961a..00000000 --- a/safesite/migrations/0258_yjyc_missvalue.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-08-27 01:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0257_report'), - ] - - operations = [ - migrations.AddField( - model_name='yjyc', - name='missvalue', - field=models.FloatField(default=0), - ), - ] diff --git a/safesite/migrations/0259_auto_20190902_2129.py b/safesite/migrations/0259_auto_20190902_2129.py deleted file mode 100644 index 575e9846..00000000 --- a/safesite/migrations/0259_auto_20190902_2129.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-02 21:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0258_yjyc_missvalue'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='missvalue', - field=models.FloatField(default='0'), - ), - ] diff --git a/safesite/migrations/0260_auto_20190902_2144.py b/safesite/migrations/0260_auto_20190902_2144.py deleted file mode 100644 index 05afed87..00000000 --- a/safesite/migrations/0260_auto_20190902_2144.py +++ /dev/null @@ -1,68 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-02 21:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0259_auto_20190902_2129'), - ] - - operations = [ - migrations.AlterField( - model_name='yjyc', - name='b', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='drillvalue', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='missvalue', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='month', - field=models.IntegerField(blank=True, default=1, null=True), - ), - migrations.AlterField( - model_name='yjyc', - name='observevalue', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='trainvalue', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='troublevalue', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='week', - field=models.IntegerField(blank=True, default=0, null=True), - ), - migrations.AlterField( - model_name='yjyc', - name='ycz', - field=models.FloatField(default=0), - ), - migrations.AlterField( - model_name='yjyc', - name='year', - field=models.IntegerField(blank=True, default=1, null=True), - ), - migrations.AlterField( - model_name='yjyc', - name='yjz', - field=models.FloatField(default=0), - ), - ] diff --git a/safesite/migrations/0261_auto_20190904_1844.py b/safesite/migrations/0261_auto_20190904_1844.py deleted file mode 100644 index 5dda92bf..00000000 --- a/safesite/migrations/0261_auto_20190904_1844.py +++ /dev/null @@ -1,106 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-04 18:44 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0260_auto_20190902_2144'), - ] - - operations = [ - migrations.CreateModel( - name='RiskActcheck', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('dotime', models.DateTimeField(blank=True, null=True)), - ('note', models.TextField(blank=True, null=True)), - ('state', models.IntegerField(default=1)), - ], - ), - migrations.CreateModel( - name='RiskActTask', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('taskadd', models.DateTimeField(blank=True, null=True)), - ('taskdo', models.DateTimeField(blank=True, null=True)), - ('taskexpire', models.DateTimeField(blank=True, null=True)), - ('usable', models.IntegerField(default=1)), - ('type', models.IntegerField(default=1)), - ('note', models.TextField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Riskcheck2', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('dotime', models.DateTimeField(blank=True, null=True)), - ('note', models.TextField(blank=True, null=True)), - ('risk', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Risk')), - ('riskactcheck', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskActcheck')), - ('trouble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), - ], - ), - migrations.AddField( - model_name='riskact', - name='gkcj', - field=models.CharField(blank=True, max_length=50, null=True), - ), - migrations.AddField( - model_name='riskact', - name='group', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group'), - ), - migrations.AddField( - model_name='riskact', - name='modifytime', - field=models.DateTimeField(auto_now=True), - ), - migrations.AddField( - model_name='riskact', - name='tasktime', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AddField( - model_name='riskact', - name='tasktype', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='riskact', - name='zrbm', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrbm2', to='safesite.Partment'), - ), - migrations.AddField( - model_name='riskact', - name='zrr', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskzrr2', to='safesite.User'), - ), - migrations.AddField( - model_name='riskacttask', - name='riskact', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), - ), - migrations.AddField( - model_name='riskacttask', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - migrations.AddField( - model_name='riskactcheck', - name='riskact', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), - ), - migrations.AddField( - model_name='riskactcheck', - name='riskacttask', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskActTask'), - ), - migrations.AddField( - model_name='riskactcheck', - name='user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0262_auto_20190904_2246.py b/safesite/migrations/0262_auto_20190904_2246.py deleted file mode 100644 index 16694a65..00000000 --- a/safesite/migrations/0262_auto_20190904_2246.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-04 22:46 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0261_auto_20190904_1844'), - ] - - operations = [ - migrations.RemoveField( - model_name='riskactcheck', - name='riskact', - ), - migrations.RemoveField( - model_name='riskactcheck', - name='riskacttask', - ), - migrations.RemoveField( - model_name='riskactcheck', - name='user', - ), - migrations.RemoveField( - model_name='riskcheck2', - name='riskactcheck', - ), - migrations.AddField( - model_name='riskacttask', - name='istask', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='riskacttask', - name='state', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='riskcheck2', - name='riskacttask', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskActTask'), - ), - migrations.DeleteModel( - name='RiskActcheck', - ), - ] diff --git a/safesite/migrations/0263_examtest_qrcode.py b/safesite/migrations/0263_examtest_qrcode.py deleted file mode 100644 index 11003ac4..00000000 --- a/safesite/migrations/0263_examtest_qrcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-05 15:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0262_auto_20190904_2246'), - ] - - operations = [ - migrations.AddField( - model_name='examtest', - name='qrcode', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0264_auto_20190909_0916.py b/safesite/migrations/0264_auto_20190909_0916.py deleted file mode 100644 index 68cdbb00..00000000 --- a/safesite/migrations/0264_auto_20190909_0916.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-09 09:16 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0263_examtest_qrcode'), - ] - - operations = [ - migrations.AlterField( - model_name='edulesson', - name='cate', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Questioncat'), - ), - ] diff --git a/safesite/migrations/0265_auto_20190912_1117.py b/safesite/migrations/0265_auto_20190912_1117.py deleted file mode 100644 index df64522b..00000000 --- a/safesite/migrations/0265_auto_20190912_1117.py +++ /dev/null @@ -1,83 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-12 11:17 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0264_auto_20190909_0916'), - ] - - operations = [ - migrations.CreateModel( - name='CompanyInfo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64, verbose_name='公司名称')), - ('nature', models.SmallIntegerField(choices=[(0, '国企'), (1, '私企')], default=0, verbose_name='企业性质')), - ('address', models.CharField(max_length=128, verbose_name='公司地址')), - ('fixed_assets', models.IntegerField(blank=True, null=True, verbose_name='固定资产')), - ('website', models.CharField(blank=True, max_length=64, null=True, verbose_name='公司网址')), - ('peoplenum', models.IntegerField(blank=True, null=True, verbose_name='公司人数')), - ('legalperson', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人代表')), - ('legalperson_phone', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人电话')), - ('liaison', models.CharField(max_length=24, verbose_name='联系人')), - ('liaison_phone', models.CharField(max_length=24, verbose_name='联系人电话')), - ('liaison_fax', models.CharField(blank=True, max_length=10, null=True, verbose_name='联系人传真')), - ('introduce', models.TextField(blank=True, null=True, verbose_name='公司概况')), - ('createtime', models.DateTimeField(auto_now_add=True)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('partment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='公司ID')), - ], - ), - migrations.CreateModel( - name='FileManage', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('maragename', models.CharField(max_length=50)), - ('maragepath', models.CharField(blank=True, max_length=200, null=True)), - ('readernum', models.IntegerField(default=0)), - ('publisdate', models.DateTimeField(default=django.utils.timezone.now)), - ('versionnum', models.CharField(max_length=50)), - ('maragestate', models.IntegerField(default=1)), - ('accessorytype', models.CharField(max_length=50)), - ('actualizedata', models.DateTimeField(default=django.utils.timezone.now)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.CreateModel( - name='FileReader', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('kindnum', models.CharField(max_length=50)), - ('readertime', models.DateTimeField(default=django.utils.timezone.now)), - ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - migrations.CreateModel( - name='Regulations', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('typename', models.CharField(max_length=50)), - ('deletemark', models.IntegerField(default=1)), - ('creattime', models.DateTimeField(default=django.utils.timezone.now)), - ('createuser', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rgs', to='safesite.User')), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Regulations')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - migrations.AddField( - model_name='filemanage', - name='maragetype', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Regulations'), - ), - migrations.AddField( - model_name='filemanage', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0265_auto_20190917_1716.py b/safesite/migrations/0265_auto_20190917_1716.py deleted file mode 100644 index 77d2e743..00000000 --- a/safesite/migrations/0265_auto_20190917_1716.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-17 17:16 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0264_auto_20190909_0916'), - ] - - operations = [ - migrations.AddField( - model_name='train', - name='examtest', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.ExamTest'), - ), - ] diff --git a/safesite/migrations/0265_companyinfo.py b/safesite/migrations/0265_companyinfo.py deleted file mode 100644 index 7a9d1543..00000000 --- a/safesite/migrations/0265_companyinfo.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.1.4 on 2019-09-12 15:10 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0264_auto_20190909_0916'), - ] - - operations = [ - migrations.CreateModel( - name='CompanyInfo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=64, verbose_name='公司名称')), - ('nature', models.SmallIntegerField(choices=[(0, '国企'), (1, '私企')], default=0, verbose_name='企业性质')), - ('address', models.CharField(max_length=128, verbose_name='公司地址')), - ('fixed_assets', models.IntegerField(blank=True, null=True, verbose_name='固定资产')), - ('website', models.CharField(blank=True, max_length=64, null=True, verbose_name='公司网址')), - ('peoplenum', models.IntegerField(blank=True, null=True, verbose_name='公司人数')), - ('legalperson', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人代表')), - ('legalperson_phone', models.CharField(blank=True, max_length=24, null=True, verbose_name='法人电话')), - ('liaison', models.CharField(max_length=24, verbose_name='联系人')), - ('liaison_phone', models.CharField(max_length=24, verbose_name='联系人电话')), - ('liaison_fax', models.CharField(blank=True, max_length=10, null=True, verbose_name='联系人传真')), - ('introduce', models.TextField(blank=True, null=True, verbose_name='公司概况')), - ('createtime', models.DateTimeField(auto_now_add=True)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('partment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='公司ID')), - ], - ), - ] diff --git a/safesite/migrations/0266_auto_20190912_1151.py b/safesite/migrations/0266_auto_20190912_1151.py deleted file mode 100644 index 8254f38f..00000000 --- a/safesite/migrations/0266_auto_20190912_1151.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-12 11:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0265_auto_20190912_1117'), - ] - - operations = [ - migrations.AddField( - model_name='filemanage', - name='downnum', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='regulations', - name='sortorder', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0266_auto_20190917_2314.py b/safesite/migrations/0266_auto_20190917_2314.py deleted file mode 100644 index 06bf3363..00000000 --- a/safesite/migrations/0266_auto_20190917_2314.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-17 23:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0265_auto_20190917_1716'), - ] - - operations = [ - migrations.AddField( - model_name='area', - name='qrcode', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0267_auto_20190917_1543.py b/safesite/migrations/0267_auto_20190917_1543.py deleted file mode 100644 index bb47541a..00000000 --- a/safesite/migrations/0267_auto_20190917_1543.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-17 15:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0266_auto_20190912_1151'), - ] - - operations = [ - migrations.AddField( - model_name='filemanage', - name='deletemark', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='filereader', - name='deletemark', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0268_merge_20190919_1423.py b/safesite/migrations/0268_merge_20190919_1423.py deleted file mode 100644 index e03d23ed..00000000 --- a/safesite/migrations/0268_merge_20190919_1423.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-19 14:23 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0267_auto_20190917_1543'), - ('safesite', '0265_auto_20190917_1716'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0268_merge_20191009_0952.py b/safesite/migrations/0268_merge_20191009_0952.py deleted file mode 100644 index 45a06ae3..00000000 --- a/safesite/migrations/0268_merge_20191009_0952.py +++ /dev/null @@ -1,15 +0,0 @@ -# Generated by Django 2.1.4 on 2019-10-09 09:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0265_auto_20190917_1716'), - ('safesite', '0267_auto_20190917_1543'), - ('safesite', '0265_companyinfo'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0269_auto_20190919_1423.py b/safesite/migrations/0269_auto_20190919_1423.py deleted file mode 100644 index 897971a2..00000000 --- a/safesite/migrations/0269_auto_20190919_1423.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-19 14:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0268_merge_20190919_1423'), - ] - - operations = [ - migrations.AddField( - model_name='observe', - name='lookers', - field=models.ManyToManyField(related_name='gcrs', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0270_auto_20190920_1200.py b/safesite/migrations/0270_auto_20190920_1200.py deleted file mode 100644 index 14f34fdb..00000000 --- a/safesite/migrations/0270_auto_20190920_1200.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-20 12:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0269_auto_20190919_1423'), - ] - - operations = [ - migrations.RemoveField( - model_name='companyinfo', - name='liaison_fax', - ), - ] diff --git a/safesite/migrations/0270_auto_20190923_1017.py b/safesite/migrations/0270_auto_20190923_1017.py deleted file mode 100644 index 9663ee76..00000000 --- a/safesite/migrations/0270_auto_20190923_1017.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-23 10:17 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0269_auto_20190919_1423'), - ] - - operations = [ - migrations.CreateModel( - name='Mgtsystem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mgtname', models.CharField(max_length=50)), - ('mgtpath', models.CharField(blank=True, max_length=200, null=True)), - ('publisdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - - ] diff --git a/safesite/migrations/0271_auto_20190923_1018.py b/safesite/migrations/0271_auto_20190923_1018.py deleted file mode 100644 index 8095f19f..00000000 --- a/safesite/migrations/0271_auto_20190923_1018.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-23 10:18 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0270_auto_20190923_1017'), - ] - - operations = [ - migrations.AlterField( - model_name='mgtsystem', - name='mgtname', - field=models.CharField(max_length=64), - ), - ] diff --git a/safesite/migrations/0271_auto_20190925_1113.py b/safesite/migrations/0271_auto_20190925_1113.py deleted file mode 100644 index 22b22b28..00000000 --- a/safesite/migrations/0271_auto_20190925_1113.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-25 11:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0270_auto_20190920_1200'), - ] - - operations = [ - migrations.AlterField( - model_name='trouble', - name='shresult', - field=models.IntegerField(blank=True, choices=[(1, '通过'), (2, '审核未通过'), (3, '复查未通过'), (4, '已修改'), (5, '评估未通过'), (6, '未采纳')], null=True), - ), - ] diff --git a/safesite/migrations/0272_auto_20190923_1026.py b/safesite/migrations/0272_auto_20190923_1026.py deleted file mode 100644 index 10d4006e..00000000 --- a/safesite/migrations/0272_auto_20190923_1026.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-23 10:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0271_auto_20190923_1018'), - ] - - operations = [ - migrations.AlterField( - model_name='mgtsystem', - name='id', - field=models.AutoField(primary_key=True, serialize=False), - ), - migrations.AlterField( - model_name='mgtsystem', - name='mgtname', - field=models.CharField(max_length=50), - ), - ] diff --git a/safesite/migrations/0272_auto_20190925_1657.py b/safesite/migrations/0272_auto_20190925_1657.py deleted file mode 100644 index 070d32ac..00000000 --- a/safesite/migrations/0272_auto_20190925_1657.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.1.5 on 2019-09-25 16:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0271_auto_20190925_1113'), - ] - - operations = [ - migrations.AddField( - model_name='suggest', - name='accept', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0273_auto_20191008_1604.py b/safesite/migrations/0273_auto_20191008_1604.py deleted file mode 100644 index 459197f0..00000000 --- a/safesite/migrations/0273_auto_20191008_1604.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-08 16:04 - -import django.contrib.postgres.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0272_auto_20190925_1657'), - ] - - operations = [ - # migrations.AddField( - # model_name='area', - # name='qrcode', - # field=models.CharField(blank=True, max_length=200, null=True), - # ), - migrations.AddField( - model_name='operation', - name='todousers', - field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None), - ), - migrations.AddField( - model_name='operationspjd', - name='sprs', - field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None), - ), - ] diff --git a/safesite/migrations/0274_merge_20191011_1415.py b/safesite/migrations/0274_merge_20191011_1415.py deleted file mode 100644 index 09c8d344..00000000 --- a/safesite/migrations/0274_merge_20191011_1415.py +++ /dev/null @@ -1,15 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-11 14:15 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0272_auto_20190923_1026'), - ('safesite', '0266_auto_20190917_2314'), - ('safesite', '0273_auto_20191008_1604'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0275_auto_20191011_1415.py b/safesite/migrations/0275_auto_20191011_1415.py deleted file mode 100644 index 6786032c..00000000 --- a/safesite/migrations/0275_auto_20191011_1415.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-11 14:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0274_merge_20191011_1415'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='headimgurl', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='user', - name='mpopenid', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='user', - name='nickname', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='user', - name='openid', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0276_merge_20191017_0928.py b/safesite/migrations/0276_merge_20191017_0928.py deleted file mode 100644 index 38fa278f..00000000 --- a/safesite/migrations/0276_merge_20191017_0928.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-17 09:28 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0275_auto_20191011_1415'), - ('safesite', '0268_merge_20191009_0952'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0277_remove_companyinfo_liaison_fax.py b/safesite/migrations/0277_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 2c253a41..00000000 --- a/safesite/migrations/0277_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-17 09:29 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0276_merge_20191017_0928'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0278_auto_20191018_1723.py b/safesite/migrations/0278_auto_20191018_1723.py deleted file mode 100644 index d704cc7b..00000000 --- a/safesite/migrations/0278_auto_20191018_1723.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-18 17:23 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0277_remove_companyinfo_liaison_fax'), - ] - - operations = [ - migrations.AlterField( - model_name='riskact', - name='area', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='riskactarea', to='safesite.Area'), - ), - migrations.AlterField( - model_name='safecert', - name='url', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0279_auto_20191022_1635.py b/safesite/migrations/0279_auto_20191022_1635.py deleted file mode 100644 index cfd3bc4a..00000000 --- a/safesite/migrations/0279_auto_20191022_1635.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-22 16:35 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0278_auto_20191018_1723'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='partment', - name='position', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='坐标'), - ), - ] diff --git a/safesite/migrations/0280_auto_20191023_1711.py b/safesite/migrations/0280_auto_20191023_1711.py deleted file mode 100644 index 5af9ff40..00000000 --- a/safesite/migrations/0280_auto_20191023_1711.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-23 17:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0279_auto_20191022_1635'), - ] - - operations = [ - migrations.CreateModel( - name='Groupuser2', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), - ('part', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='group', - name='users2', - field=models.ManyToManyField(related_name='userg2', through='safesite.Groupuser2', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0281_remove_companyinfo_liaison_fax.py b/safesite/migrations/0281_remove_companyinfo_liaison_fax.py deleted file mode 100644 index a32fe6fe..00000000 --- a/safesite/migrations/0281_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 10:56 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0280_auto_20191023_1711'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0282_remove_companyinfo_liaison_fax.py b/safesite/migrations/0282_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 8829e0ca..00000000 --- a/safesite/migrations/0282_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:09 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0281_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0283_remove_companyinfo_liaison_fax.py b/safesite/migrations/0283_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 95023475..00000000 --- a/safesite/migrations/0283_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0282_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0284_remove_companyinfo_liaison_fax.py b/safesite/migrations/0284_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 317341e6..00000000 --- a/safesite/migrations/0284_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:13 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0283_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0285_remove_companyinfo_liaison_fax.py b/safesite/migrations/0285_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 9d7b4a7e..00000000 --- a/safesite/migrations/0285_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-24 11:20 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0284_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0286_auto_20191030_1632.py b/safesite/migrations/0286_auto_20191030_1632.py deleted file mode 100644 index a75b4dab..00000000 --- a/safesite/migrations/0286_auto_20191030_1632.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-10-30 16:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0285_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='equipment', - name='riskact', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.RiskAct'), - ), - ] diff --git a/safesite/migrations/0287_auto_20191118_2252.py b/safesite/migrations/0287_auto_20191118_2252.py deleted file mode 100644 index 0688d724..00000000 --- a/safesite/migrations/0287_auto_20191118_2252.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-18 22:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0286_auto_20191030_1632'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='user', - name='epassword', - field=models.CharField(default=None, max_length=60), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0288_auto_20191118_2253.py b/safesite/migrations/0288_auto_20191118_2253.py deleted file mode 100644 index cc908209..00000000 --- a/safesite/migrations/0288_auto_20191118_2253.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-18 22:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0287_auto_20191118_2252'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='user', - name='epassword', - field=models.CharField(default='', max_length=60), - ), - ] diff --git a/safesite/migrations/0289_auto_20191118_2256.py b/safesite/migrations/0289_auto_20191118_2256.py deleted file mode 100644 index e7c14986..00000000 --- a/safesite/migrations/0289_auto_20191118_2256.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-18 22:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0288_auto_20191118_2253'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='user', - name='epassword', - field=models.CharField(blank=True, max_length=60, null=True), - ), - ] diff --git a/safesite/migrations/0290_auto_20191118_2256.py b/safesite/migrations/0290_auto_20191118_2256.py deleted file mode 100644 index 6578cbb1..00000000 --- a/safesite/migrations/0290_auto_20191118_2256.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-18 22:56 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0289_auto_20191118_2256'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='user', - name='epassword', - ), - ] diff --git a/safesite/migrations/0291_auto_20191118_2309.py b/safesite/migrations/0291_auto_20191118_2309.py deleted file mode 100644 index 6c2f73c8..00000000 --- a/safesite/migrations/0291_auto_20191118_2309.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-18 23:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0290_auto_20191118_2256'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='user', - name='epassword', - field=models.CharField(blank=True, max_length=60, null=True), - ), - ] diff --git a/safesite/migrations/0292_auto_20191119_1805.py b/safesite/migrations/0292_auto_20191119_1805.py deleted file mode 100644 index d1195178..00000000 --- a/safesite/migrations/0292_auto_20191119_1805.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-19 18:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0291_auto_20191118_2309'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='user', - name='password', - field=models.CharField(max_length=100), - ), - ] diff --git a/safesite/migrations/0293_auto_20191119_1811.py b/safesite/migrations/0293_auto_20191119_1811.py deleted file mode 100644 index c1957d93..00000000 --- a/safesite/migrations/0293_auto_20191119_1811.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.1.5 on 2019-11-19 18:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0292_auto_20191119_1805'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='user', - name='epassword', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='user', - name='password', - field=models.CharField(max_length=30), - ), - ] diff --git a/safesite/migrations/0294_auto_20191125_1414.py b/safesite/migrations/0294_auto_20191125_1414.py deleted file mode 100644 index 3bd9f5fd..00000000 --- a/safesite/migrations/0294_auto_20191125_1414.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.7 on 2019-11-25 14:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0293_auto_20191119_1811'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='socertificate', - name='url', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - ] diff --git a/safesite/migrations/0295_auto_20191205_1702.py b/safesite/migrations/0295_auto_20191205_1702.py deleted file mode 100644 index cc0ac1da..00000000 --- a/safesite/migrations/0295_auto_20191205_1702.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-05 17:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0294_auto_20191125_1414'), - ] - - operations = [ - migrations.AddField( - model_name='operation', - name='issimple', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0296_auto_20191206_1559.py b/safesite/migrations/0296_auto_20191206_1559.py deleted file mode 100644 index 0de6373e..00000000 --- a/safesite/migrations/0296_auto_20191206_1559.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-06 15:59 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0295_auto_20191205_1702'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='operation', - name='issimple', - ), - ] diff --git a/safesite/migrations/0296_auto_20191209_1029.py b/safesite/migrations/0296_auto_20191209_1029.py deleted file mode 100644 index 885556ee..00000000 --- a/safesite/migrations/0296_auto_20191209_1029.py +++ /dev/null @@ -1,69 +0,0 @@ -# Generated by Django 2.2.7 on 2019-12-09 10:29 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0295_auto_20191205_1702'), - ] - - operations = [ - migrations.CreateModel( - name='Operproce', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=50)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('reads', models.IntegerField(default='0')), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optbm', to='safesite.Partment')), - ('homeworktype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ('jobs', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='optgs', to='safesite.Partment')), - ], - ), - #migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - #), - migrations.CreateModel( - name='Resbility', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=50)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('reads', models.IntegerField(default='0')), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbbm', to='safesite.Partment')), - ('homeworktype', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey')), - ('jobs', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Group')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='resbgs', to='safesite.Partment')), - ], - ), - migrations.CreateModel( - name='ReaderOperproce', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('num', models.CharField(max_length=50)), - ('readertime', models.DateTimeField(default=django.utils.timezone.now)), - ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Operproce')), - ], - ), - migrations.CreateModel( - name='Readerblility', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('num', models.CharField(max_length=50)), - ('readertime', models.DateTimeField(default=django.utils.timezone.now)), - ('readeruser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('readid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Resbility')), - ], - ), - ] diff --git a/safesite/migrations/0297_merge_20191216_1700.py b/safesite/migrations/0297_merge_20191216_1700.py deleted file mode 100644 index 1b213678..00000000 --- a/safesite/migrations/0297_merge_20191216_1700.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-16 17:00 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0296_auto_20191206_1559'), - ('safesite', '0296_auto_20191209_1029'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0297_merge_20191217_1200.py b/safesite/migrations/0297_merge_20191217_1200.py deleted file mode 100644 index 7fbb12d3..00000000 --- a/safesite/migrations/0297_merge_20191217_1200.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 12:00 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0296_auto_20191209_1029'), - ('safesite', '0296_auto_20191206_1559'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0298_auto_20191216_1700.py b/safesite/migrations/0298_auto_20191216_1700.py deleted file mode 100644 index 97aa4965..00000000 --- a/safesite/migrations/0298_auto_20191216_1700.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-16 17:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0297_merge_20191216_1700'), - ] - - operations = [ - migrations.AddField( - model_name='operproce', - name='filepath', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AddField( - model_name='operproce', - name='operprocepath', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AddField( - model_name='resbility', - name='filepath', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AddField( - model_name='resbility', - name='resbilitypath', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0298_auto_20191217_1200.py b/safesite/migrations/0298_auto_20191217_1200.py deleted file mode 100644 index a8fcfcd7..00000000 --- a/safesite/migrations/0298_auto_20191217_1200.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 12:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0297_merge_20191217_1200'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='type', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0299_remove_menu_type.py b/safesite/migrations/0299_remove_menu_type.py deleted file mode 100644 index 7d93103e..00000000 --- a/safesite/migrations/0299_remove_menu_type.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 12:01 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0298_auto_20191217_1200'), - ] - - operations = [ - migrations.RemoveField( - model_name='menu', - name='type', - ), - ] diff --git a/safesite/migrations/0300_menu_type.py b/safesite/migrations/0300_menu_type.py deleted file mode 100644 index af5cd058..00000000 --- a/safesite/migrations/0300_menu_type.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 12:01 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0299_remove_menu_type'), - ] - - operations = [ - migrations.AddField( - model_name='menu', - name='type', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0301_auto_20191217_1414.py b/safesite/migrations/0301_auto_20191217_1414.py deleted file mode 100644 index caa02b7c..00000000 --- a/safesite/migrations/0301_auto_20191217_1414.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 14:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0300_menu_type'), - ] - - operations = [ - migrations.AlterField( - model_name='menu', - name='deletemark', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='menu', - name='icon', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='menu', - name='sortnum', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0302_group_menulist.py b/safesite/migrations/0302_group_menulist.py deleted file mode 100644 index efbf0f83..00000000 --- a/safesite/migrations/0302_group_menulist.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-17 15:06 - -import django.contrib.postgres.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0301_auto_20191217_1414'), - ] - - operations = [ - migrations.AddField( - model_name='group', - name='menulist', - field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None), - ), - ] diff --git a/safesite/migrations/0303_trouble_yhlxo.py b/safesite/migrations/0303_trouble_yhlxo.py deleted file mode 100644 index f6952905..00000000 --- a/safesite/migrations/0303_trouble_yhlxo.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-18 09:18 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0302_group_menulist'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='yhlxo', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yhlxo', to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0304_trouble_submituser.py b/safesite/migrations/0304_trouble_submituser.py deleted file mode 100644 index 627e4e4d..00000000 --- a/safesite/migrations/0304_trouble_submituser.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2019-12-19 16:00 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0303_trouble_yhlxo'), - ] - - operations = [ - migrations.AddField( - model_name='trouble', - name='submituser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submituser', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0305_merge_20200102_1722.py b/safesite/migrations/0305_merge_20200102_1722.py deleted file mode 100644 index 75e898f0..00000000 --- a/safesite/migrations/0305_merge_20200102_1722.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-02 17:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0298_auto_20191216_1700'), - ('safesite', '0304_trouble_submituser'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0305_merge_20200108_1211.py b/safesite/migrations/0305_merge_20200108_1211.py deleted file mode 100644 index 33c8127d..00000000 --- a/safesite/migrations/0305_merge_20200108_1211.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-08 12:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0298_auto_20191216_1700'), - ('safesite', '0304_trouble_submituser'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0306_auto_20200102_1722.py b/safesite/migrations/0306_auto_20200102_1722.py deleted file mode 100644 index ddc3dff7..00000000 --- a/safesite/migrations/0306_auto_20200102_1722.py +++ /dev/null @@ -1,68 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-02 17:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0305_merge_20200102_1722'), - ] - - operations = [ - migrations.AlterModelOptions( - name='menu', - options={'verbose_name': '菜单&按钮', 'verbose_name_plural': '菜单&按钮'}, - ), - migrations.AlterField( - model_name='menu', - name='deletemark', - field=models.IntegerField(default=1, verbose_name='删除标记'), - ), - migrations.AlterField( - model_name='menu', - name='detail', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='描述'), - ), - migrations.AlterField( - model_name='menu', - name='icon', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='图标'), - ), - migrations.AlterField( - model_name='menu', - name='menucode', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='菜单标识'), - ), - migrations.AlterField( - model_name='menu', - name='menuid', - field=models.AutoField(primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='menu', - name='menuname', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='名称'), - ), - migrations.AlterField( - model_name='menu', - name='parentid', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Menu', verbose_name='上级'), - ), - migrations.AlterField( - model_name='menu', - name='sortnum', - field=models.IntegerField(default=1, verbose_name='排序号'), - ), - migrations.AlterField( - model_name='menu', - name='type', - field=models.IntegerField(choices=[(1, '菜单'), (2, '按钮')], default=1, verbose_name='类型'), - ), - migrations.AlterField( - model_name='menu', - name='url', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='操作地址'), - ), - ] diff --git a/safesite/migrations/0306_auto_20200108_1401.py b/safesite/migrations/0306_auto_20200108_1401.py deleted file mode 100644 index 36258803..00000000 --- a/safesite/migrations/0306_auto_20200108_1401.py +++ /dev/null @@ -1,106 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-08 14:01 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0305_merge_20200108_1211'), - ] - - operations = [ - migrations.CreateModel( - name='Checkproject', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('checktitle', models.CharField(max_length=1000)), - ('checkcontent', models.CharField(max_length=1000)), - ('requirements', models.CharField(max_length=500)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('checkstate', models.IntegerField(default=1)), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checkcomp', to='safesite.Partment')), - ], - ), - migrations.AlterModelOptions( - name='menu', - options={'verbose_name': '菜单&按钮', 'verbose_name_plural': '菜单&按钮'}, - ), - migrations.AlterField( - model_name='menu', - name='deletemark', - field=models.IntegerField(default=1, verbose_name='删除标记'), - ), - migrations.AlterField( - model_name='menu', - name='detail', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='描述'), - ), - migrations.AlterField( - model_name='menu', - name='icon', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='图标'), - ), - migrations.AlterField( - model_name='menu', - name='menucode', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='菜单标识'), - ), - migrations.AlterField( - model_name='menu', - name='menuid', - field=models.AutoField(primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='menu', - name='menuname', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='名称'), - ), - migrations.AlterField( - model_name='menu', - name='parentid', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Menu', verbose_name='上级'), - ), - migrations.AlterField( - model_name='menu', - name='sortnum', - field=models.IntegerField(default=1, verbose_name='排序号'), - ), - migrations.AlterField( - model_name='menu', - name='type', - field=models.IntegerField(choices=[(1, '菜单'), (2, '按钮')], default=1, verbose_name='类型'), - ), - migrations.AlterField( - model_name='menu', - name='url', - field=models.CharField(blank=True, max_length=30, null=True, verbose_name='操作地址'), - ), - migrations.CreateModel( - name='Checktask', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('checktaskname', models.CharField(max_length=300)), - ('checktime', models.DateTimeField(default=django.utils.timezone.now)), - ('checkplace', models.CharField(max_length=200)), - ('checkquestion', models.CharField(max_length=200)), - ('zgtime', models.DateTimeField(default=django.utils.timezone.now)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('taskstate', models.IntegerField(default=1)), - ('zgyq', models.CharField(max_length=200)), - ('zgjg', models.CharField(max_length=200)), - ('yanshou', models.DateTimeField(default=django.utils.timezone.now)), - ('checkname', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='jiancha', to='safesite.User')), - ('checktype', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Checkproject')), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chuangjian', to='safesite.User')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taskcomps', to='safesite.Partment')), - ('yanshouren', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yanshouren', to='safesite.User')), - ('zguser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0307_auto_20200106_1125.py b/safesite/migrations/0307_auto_20200106_1125.py deleted file mode 100644 index 48ed647a..00000000 --- a/safesite/migrations/0307_auto_20200106_1125.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-06 11:25 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0306_auto_20200102_1722'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.CreateModel( - name='Role', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=32, unique=True, verbose_name='角色')), - ('desc', models.CharField(blank=True, max_length=50, null=True, verbose_name='描述')), - ('permissions', models.ManyToManyField(blank=True, to='safesite.Menu', verbose_name='URL授权')), - ], - ), - migrations.AddField( - model_name='partment', - name='role', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='safesite.Role'), - ), - ] diff --git a/safesite/migrations/0307_auto_20200110_1624.py b/safesite/migrations/0307_auto_20200110_1624.py deleted file mode 100644 index bca36f82..00000000 --- a/safesite/migrations/0307_auto_20200110_1624.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-10 16:24 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0306_auto_20200108_1401'), - ] - - operations = [ - migrations.CreateModel( - name='Checktable', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('checktitle', models.CharField(max_length=1000)), - ('checkprjtype', models.CharField(max_length=1000)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checktabcomp', to='safesite.Partment')), - ], - ), - migrations.RemoveField( - model_name='checkproject', - name='checkstate', - ), - migrations.AlterField( - model_name='checktask', - name='checktype', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Checktable'), - ), - ] diff --git a/safesite/migrations/0308_auto_20200113_1150.py b/safesite/migrations/0308_auto_20200113_1150.py deleted file mode 100644 index ea6c79bc..00000000 --- a/safesite/migrations/0308_auto_20200113_1150.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-13 11:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0307_auto_20200110_1624'), - ] - - operations = [ - migrations.RemoveField( - model_name='checktable', - name='checkprjtype', - ), - migrations.AddField( - model_name='checktable', - name='checkprjtype', - field=models.ManyToManyField(to='safesite.Checkproject'), - ), - migrations.RemoveField( - model_name='checktask', - name='checkname', - ), - migrations.AddField( - model_name='checktask', - name='checkname', - field=models.ManyToManyField(related_name='jiancha', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0308_remove_companyinfo_liaison_fax.py b/safesite/migrations/0308_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 0fd8406f..00000000 --- a/safesite/migrations/0308_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-06 21:16 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0307_auto_20200106_1125'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0309_auto_20200107_1704.py b/safesite/migrations/0309_auto_20200107_1704.py deleted file mode 100644 index a30399bd..00000000 --- a/safesite/migrations/0309_auto_20200107_1704.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-07 17:04 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0308_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='partment', - name='role', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Role'), - ), - ] diff --git a/safesite/migrations/0309_checktable_checkcontent.py b/safesite/migrations/0309_checktable_checkcontent.py deleted file mode 100644 index 3e48ea20..00000000 --- a/safesite/migrations/0309_checktable_checkcontent.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-14 15:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0308_auto_20200113_1150'), - ] - - operations = [ - migrations.AddField( - model_name='checktable', - name='checkcontent', - field=models.CharField(default=2, max_length=1000), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0310_auto_20200110_1452.py b/safesite/migrations/0310_auto_20200110_1452.py deleted file mode 100644 index c7fb2856..00000000 --- a/safesite/migrations/0310_auto_20200110_1452.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-10 14:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0309_auto_20200107_1704'), - ] - - operations = [ - migrations.CreateModel( - name='EquipmentCheckForm', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200, verbose_name='名称')), - ('desc', models.CharField(max_length=400, verbose_name='描述')), - ], - ), - migrations.CreateModel( - name='EquipmentCheckFormItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('item', models.CharField(max_length=200, verbose_name='检查项目')), - ('content', models.CharField(max_length=400, verbose_name='检查内容')), - ], - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0310_auto_20200114_1731.py b/safesite/migrations/0310_auto_20200114_1731.py deleted file mode 100644 index d483c2fc..00000000 --- a/safesite/migrations/0310_auto_20200114_1731.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-14 17:31 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0309_checktable_checkcontent'), - ] - - operations = [ - migrations.AlterField( - model_name='checktask', - name='zguser', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0311_auto_20200110_1604.py b/safesite/migrations/0311_auto_20200110_1604.py deleted file mode 100644 index 29ffb9f5..00000000 --- a/safesite/migrations/0311_auto_20200110_1604.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-10 16:04 - -import django.contrib.postgres.fields -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0310_auto_20200110_1452'), - ] - - operations = [ - migrations.CreateModel( - name='EFormItems', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('submittime', models.DateField(default=django.utils.timezone.now)), - ], - ), - migrations.CreateModel( - name='EquipmentCheckItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('item', models.CharField(max_length=200, verbose_name='检查项目')), - ('content', models.CharField(max_length=400, verbose_name='检查内容')), - ('usecomps', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None)), - ('nousecomps', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), blank=True, null=True, size=None)), - ], - ), - migrations.DeleteModel( - name='EquipmentCheckFormItem', - ), - migrations.AddField( - model_name='equipmentcheckform', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment'), - ), - migrations.AddField( - model_name='eformitems', - name='equipment_check_form', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckForm'), - ), - migrations.AddField( - model_name='eformitems', - name='equipment_check_item', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckItem'), - ), - migrations.AddField( - model_name='equipmentcheckform', - name='items', - field=models.ManyToManyField(related_name='checkitems', through='safesite.EFormItems', to='safesite.EquipmentCheckItem'), - ), - ] diff --git a/safesite/migrations/0311_auto_20200115_1101.py b/safesite/migrations/0311_auto_20200115_1101.py deleted file mode 100644 index e35bb064..00000000 --- a/safesite/migrations/0311_auto_20200115_1101.py +++ /dev/null @@ -1,82 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 11:01 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0310_auto_20200114_1731'), - ] - - operations = [ - migrations.RemoveField( - model_name='checktask', - name='checkquestion', - ), - migrations.RemoveField( - model_name='checktask', - name='createdate', - ), - migrations.RemoveField( - model_name='checktask', - name='createuser', - ), - migrations.RemoveField( - model_name='checktask', - name='deletemark', - ), - migrations.RemoveField( - model_name='checktask', - name='taskstate', - ), - migrations.RemoveField( - model_name='checktask', - name='usecomp', - ), - migrations.RemoveField( - model_name='checktask', - name='yanshou', - ), - migrations.RemoveField( - model_name='checktask', - name='yanshouren', - ), - migrations.RemoveField( - model_name='checktask', - name='zgjg', - ), - migrations.RemoveField( - model_name='checktask', - name='zgtime', - ), - migrations.RemoveField( - model_name='checktask', - name='zguser', - ), - migrations.RemoveField( - model_name='checktask', - name='zgyq', - ), - migrations.CreateModel( - name='checkjob', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('checkquestion', models.CharField(max_length=200)), - ('zgtime', models.DateTimeField(default=django.utils.timezone.now)), - ('createdate', models.DateTimeField(default=django.utils.timezone.now)), - ('deletemark', models.IntegerField(default=1)), - ('taskstate', models.IntegerField(default=1)), - ('zgyq', models.CharField(max_length=200)), - ('zgjg', models.CharField(max_length=200)), - ('yanshou', models.DateTimeField(default=django.utils.timezone.now)), - ('checktask', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Checktask')), - ('createuser', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='chuangjian', to='safesite.User')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taskcomps', to='safesite.Partment')), - ('yanshouren', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='yanshouren', to='safesite.User')), - ('zguser', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User')), - ], - ), - ] diff --git a/safesite/migrations/0312_auto_20200113_1209.py b/safesite/migrations/0312_auto_20200113_1209.py deleted file mode 100644 index ef656b25..00000000 --- a/safesite/migrations/0312_auto_20200113_1209.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-13 12:09 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0311_auto_20200110_1604'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='equipmentcheckform', - name='deletemark', - field=models.IntegerField(default=1, verbose_name='删除标记'), - ), - migrations.AlterField( - model_name='equipmentcheckform', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司'), - ), - ] diff --git a/safesite/migrations/0312_auto_20200115_1112.py b/safesite/migrations/0312_auto_20200115_1112.py deleted file mode 100644 index 4ab971f1..00000000 --- a/safesite/migrations/0312_auto_20200115_1112.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 11:12 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0311_auto_20200115_1101'), - ] - - operations = [ - migrations.AddField( - model_name='checktask', - name='createdate', - field=models.DateTimeField(default=django.utils.timezone.now), - ), - migrations.AddField( - model_name='checktask', - name='createuser', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='chuangjians', to='safesite.User'), - preserve_default=False, - ), - migrations.AddField( - model_name='checktask', - name='deletemark', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='checktask', - name='usecomp', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='taskscomp', to='safesite.Partment'), - ), - ] diff --git a/safesite/migrations/0313_auto_20200114_1201.py b/safesite/migrations/0313_auto_20200114_1201.py deleted file mode 100644 index c379943a..00000000 --- a/safesite/migrations/0313_auto_20200114_1201.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-14 12:01 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0312_auto_20200113_1209'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='equipmentcheckform', - name='createby', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='创建人'), - ), - migrations.AlterField( - model_name='equipmentcheckform', - name='usecomp', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司'), - ), - ] diff --git a/safesite/migrations/0313_checkjob_checkname.py b/safesite/migrations/0313_checkjob_checkname.py deleted file mode 100644 index 4c09387c..00000000 --- a/safesite/migrations/0313_checkjob_checkname.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 14:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0312_auto_20200115_1112'), - ] - - operations = [ - migrations.AddField( - model_name='checkjob', - name='checkname', - field=models.ManyToManyField(related_name='jianchas', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0314_auto_20200114_1815.py b/safesite/migrations/0314_auto_20200114_1815.py deleted file mode 100644 index 54d85294..00000000 --- a/safesite/migrations/0314_auto_20200114_1815.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-14 18:15 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0313_auto_20200114_1201'), - ] - - operations = [ - migrations.RenameField( - model_name='equipmentcheckitem', - old_name='item', - new_name='name', - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0314_auto_20200115_1414.py b/safesite/migrations/0314_auto_20200115_1414.py deleted file mode 100644 index a1787a6c..00000000 --- a/safesite/migrations/0314_auto_20200115_1414.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 14:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0313_checkjob_checkname'), - ] - - operations = [ - migrations.AlterField( - model_name='checkjob', - name='checkquestion', - field=models.CharField(max_length=200, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='createuser', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='chuangjian', to='safesite.User'), - ), - migrations.AlterField( - model_name='checkjob', - name='yanshouren', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='yanshouren', to='safesite.User'), - ), - migrations.AlterField( - model_name='checkjob', - name='zgjg', - field=models.CharField(max_length=200, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zgyq', - field=models.CharField(max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0315_auto_20200115_0941.py b/safesite/migrations/0315_auto_20200115_0941.py deleted file mode 100644 index 43eebe25..00000000 --- a/safesite/migrations/0315_auto_20200115_0941.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 09:41 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0314_auto_20200114_1815'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='equipment', - name='checkform', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckForm'), - ), - ] diff --git a/safesite/migrations/0315_auto_20200115_1421.py b/safesite/migrations/0315_auto_20200115_1421.py deleted file mode 100644 index 8470cdc2..00000000 --- a/safesite/migrations/0315_auto_20200115_1421.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 14:21 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0314_auto_20200115_1414'), - ] - - operations = [ - migrations.RemoveField( - model_name='checkjob', - name='checkname', - ), - migrations.AddField( - model_name='checkjob', - name='checkname', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='jianchas', to='safesite.User'), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0316_auto_20200115_1653.py b/safesite/migrations/0316_auto_20200115_1653.py deleted file mode 100644 index f3ac35f8..00000000 --- a/safesite/migrations/0316_auto_20200115_1653.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-01-15 16:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0315_auto_20200115_0941'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='train', - name='jsqd', - field=models.IntegerField(default=0, verbose_name='结束签到'), - ), - migrations.AddField( - model_name='trainuser', - name='jsqd', - field=models.DateTimeField(blank=True, null=True, verbose_name='结束签到时间'), - ), - ] diff --git a/safesite/migrations/0316_auto_20200306_1444.py b/safesite/migrations/0316_auto_20200306_1444.py deleted file mode 100644 index 071d0e2a..00000000 --- a/safesite/migrations/0316_auto_20200306_1444.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-06 14:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0315_auto_20200115_1421'), - ] - - operations = [ - migrations.AlterField( - model_name='checkjob', - name='yanshou', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='checktask', - name='checktime', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0317_auto_20200212_2135.py b/safesite/migrations/0317_auto_20200212_2135.py deleted file mode 100644 index d61898fa..00000000 --- a/safesite/migrations/0317_auto_20200212_2135.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 2.2.8 on 2020-02-12 21:35 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0316_auto_20200115_1653'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='notice', - name='like', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='notice', - name='poster', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='封面图'), - ), - migrations.AddField( - model_name='notice', - name='supply_part', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tgbm', to='safesite.Partment', verbose_name='资料提供部门'), - ), - migrations.AddField( - model_name='noticeto', - name='islike', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='notice', - name='reads', - field=models.IntegerField(default=0), - ), - migrations.AlterField( - model_name='noticeto', - name='read', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0318_auto_20200214_1427.py b/safesite/migrations/0318_auto_20200214_1427.py deleted file mode 100644 index bbbaee4c..00000000 --- a/safesite/migrations/0318_auto_20200214_1427.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-02-14 14:27 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0317_auto_20200212_2135'), - ] - - operations = [ - migrations.RenameField( - model_name='edulesson', - old_name='watchnum', - new_name='downnum', - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0319_auto_20200301_1835.py b/safesite/migrations/0319_auto_20200301_1835.py deleted file mode 100644 index 54748431..00000000 --- a/safesite/migrations/0319_auto_20200301_1835.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-01 18:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0318_auto_20200214_1427'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='examtestdetail', - name='tms', - field=models.CharField(default=',', max_length=10000), - ), - migrations.AlterField( - model_name='examtestdetail', - name='wrongs', - field=models.CharField(default=',', max_length=10000), - ), - ] diff --git a/safesite/migrations/0320_auto_20200302_1402.py b/safesite/migrations/0320_auto_20200302_1402.py deleted file mode 100644 index 1f7edb14..00000000 --- a/safesite/migrations/0320_auto_20200302_1402.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-02 14:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0319_auto_20200301_1835'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='examtest', - name='ispublic', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0321_remove_companyinfo_liaison_fax.py b/safesite/migrations/0321_remove_companyinfo_liaison_fax.py deleted file mode 100644 index e8c720f5..00000000 --- a/safesite/migrations/0321_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-02 14:03 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0320_auto_20200302_1402'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0322_auto_20200305_1411.py b/safesite/migrations/0322_auto_20200305_1411.py deleted file mode 100644 index d9b1e2dc..00000000 --- a/safesite/migrations/0322_auto_20200305_1411.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-05 14:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0321_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='examtestdetail', - name='tms', - field=models.TextField(default=','), - ), - migrations.AlterField( - model_name='examtestdetail', - name='wrongs', - field=models.TextField(default=','), - ), - ] diff --git a/safesite/migrations/0323_merge_20200312_0938.py b/safesite/migrations/0323_merge_20200312_0938.py deleted file mode 100644 index ff16f858..00000000 --- a/safesite/migrations/0323_merge_20200312_0938.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-12 09:38 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0316_auto_20200306_1444'), - ('safesite', '0322_auto_20200305_1411'), - ] - - operations = [ - ] diff --git a/safesite/migrations/0324_auto_20200312_0939.py b/safesite/migrations/0324_auto_20200312_0939.py deleted file mode 100644 index 2bfa6e79..00000000 --- a/safesite/migrations/0324_auto_20200312_0939.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-12 09:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0323_merge_20200312_0938'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checktask', - name='tasktype', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0325_auto_20200312_1501.py b/safesite/migrations/0325_auto_20200312_1501.py deleted file mode 100644 index 59955e22..00000000 --- a/safesite/migrations/0325_auto_20200312_1501.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-12 15:01 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0324_auto_20200312_0939'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checkjob', - name='endtime', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AddField( - model_name='checkjob', - name='jobstate', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='checkjob', - name='starttime', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0326_auto_20200313_1348.py b/safesite/migrations/0326_auto_20200313_1348.py deleted file mode 100644 index 08f5ee24..00000000 --- a/safesite/migrations/0326_auto_20200313_1348.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-13 13:48 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0325_auto_20200312_1501'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checktask', - name='userlist', - field=models.CharField(max_length=200, null=True), - ), - ] diff --git a/safesite/migrations/0327_auto_20200318_1516.py b/safesite/migrations/0327_auto_20200318_1516.py deleted file mode 100644 index d4c867ea..00000000 --- a/safesite/migrations/0327_auto_20200318_1516.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-18 15:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0326_auto_20200313_1348'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checktable', - name='zxstate', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0328_auto_20200318_1652.py b/safesite/migrations/0328_auto_20200318_1652.py deleted file mode 100644 index 22142182..00000000 --- a/safesite/migrations/0328_auto_20200318_1652.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-18 16:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0327_auto_20200318_1516'), - ] - - operations = [ - migrations.RemoveField( - model_name='checktable', - name='zxstate', - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checktask', - name='zxstate', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0329_auto_20200323_0957.py b/safesite/migrations/0329_auto_20200323_0957.py deleted file mode 100644 index 7f242b75..00000000 --- a/safesite/migrations/0329_auto_20200323_0957.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-03-23 09:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0328_auto_20200318_1652'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='checkjob', - name='content', - field=models.CharField(max_length=400, null=True), - ), - migrations.AddField( - model_name='checkjob', - name='pmpeople', - field=models.ManyToManyField(null=True, related_name='bcfr', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0330_auto_20200409_1530.py b/safesite/migrations/0330_auto_20200409_1530.py deleted file mode 100644 index e6a4139f..00000000 --- a/safesite/migrations/0330_auto_20200409_1530.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.8 on 2020-04-09 15:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0329_auto_20200323_0957'), - ] - - operations = [ - - migrations.AddField( - model_name='checkjob', - name='yhtp', - field=models.CharField(blank=True, max_length=1000), - ), - migrations.AddField( - model_name='checkjob', - name='zghtp', - field=models.CharField(blank=True, max_length=1000), - ), - ] diff --git a/safesite/migrations/0331_auto_20200414_1009.py b/safesite/migrations/0331_auto_20200414_1009.py deleted file mode 100644 index ebb24ea0..00000000 --- a/safesite/migrations/0331_auto_20200414_1009.py +++ /dev/null @@ -1,49 +0,0 @@ -# Generated by Django 2.2.8 on 2020-04-14 10:09 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0330_auto_20200409_1530'), - ] - - operations = [ - - migrations.AlterField( - model_name='checkjob', - name='checkquestion', - field=models.CharField(max_length=1000, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='content', - field=models.CharField(max_length=500, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='yhtp', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zghtp', - field=models.CharField(blank=True, max_length=1000, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zgjg', - field=models.CharField(max_length=500, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zgyq', - field=models.CharField(max_length=500, null=True), - ), - migrations.AlterField( - model_name='checktable', - name='checkcontent', - field=models.CharField(max_length=10000), - ), - ] diff --git a/safesite/migrations/0332_auto_20200421_1354.py b/safesite/migrations/0332_auto_20200421_1354.py deleted file mode 100644 index b39df3cf..00000000 --- a/safesite/migrations/0332_auto_20200421_1354.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.8 on 2020-04-21 13:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0331_auto_20200414_1009'), - ] - - operations = [ - - migrations.AddField( - model_name='checkjob', - name='jctime', - field=models.DateTimeField(blank=True, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zgtime', - field=models.DateTimeField(blank=True, null=True), - ), - ] diff --git a/safesite/migrations/0333_auto_20200424_1000.py b/safesite/migrations/0333_auto_20200424_1000.py deleted file mode 100644 index b1bb8893..00000000 --- a/safesite/migrations/0333_auto_20200424_1000.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2020-04-24 10:00 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0332_auto_20200421_1354'), - ] - - operations = [ - - migrations.AddField( - model_name='checktask', - name='taskstate', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0334_auto_20200512_2244.py b/safesite/migrations/0334_auto_20200512_2244.py deleted file mode 100644 index 8ea1a039..00000000 --- a/safesite/migrations/0334_auto_20200512_2244.py +++ /dev/null @@ -1,57 +0,0 @@ -# Generated by Django 2.2.8 on 2020-05-12 22:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0333_auto_20200424_1000'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='checkjob', - name='checkquestion', - field=models.TextField(null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='content', - field=models.TextField(null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='pmpeople', - field=models.ManyToManyField(related_name='bcfr', to='safesite.User'), - ), - migrations.AlterField( - model_name='checkjob', - name='zgjg', - field=models.TextField(null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zgyq', - field=models.TextField(null=True), - ), - migrations.AlterField( - model_name='checkproject', - name='checkcontent', - field=models.TextField(), - ), - migrations.AlterField( - model_name='checkproject', - name='requirements', - field=models.TextField(), - ), - migrations.AlterField( - model_name='checktable', - name='checkcontent', - field=models.TextField(), - ), - ] diff --git a/safesite/migrations/0335_auto_20200526_2157.py b/safesite/migrations/0335_auto_20200526_2157.py deleted file mode 100644 index c2ed30c6..00000000 --- a/safesite/migrations/0335_auto_20200526_2157.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-05-26 21:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0334_auto_20200512_2244'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='equipment', - name='checknum', - field=models.IntegerField(default=2, verbose_name='每班检查次数'), - ), - ] diff --git a/safesite/migrations/0336_auto_20200611_2150.py b/safesite/migrations/0336_auto_20200611_2150.py deleted file mode 100644 index b4a19e74..00000000 --- a/safesite/migrations/0336_auto_20200611_2150.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 2.2.8 on 2020-06-11 21:50 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0335_auto_20200526_2157'), - ] - - operations = [ - migrations.RemoveField( - model_name='equipment', - name='checknum', - ), - migrations.RemoveField( - model_name='equipmentcheckitem', - name='nousecomps', - ), - migrations.RemoveField( - model_name='equipmentcheckitem', - name='usecomps', - ), - migrations.AddField( - model_name='inspect', - name='type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Dickey', verbose_name='巡检类型'), - ), - migrations.CreateModel( - name='InspectItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('checked', models.BooleanField(default=True, verbose_name='是否已检查')), - ('state', models.CharField(choices=[('正常', '正常'), ('异常待处理', '异常待处理'), ('异常已处理', '异常已处理')], default='正常', max_length=200, verbose_name='状态')), - ('content', models.TextField(blank=True, null=True, verbose_name='描述')), - ('img', models.TextField(verbose_name='现场图片')), - ('img2', models.TextField(verbose_name='处理后图片')), - ('content2', models.TextField(blank=True, null=True, verbose_name='处理后描述')), - ('checkitem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.EquipmentCheckItem')), - ('usecomp', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0337_auto_20200614_1729.py b/safesite/migrations/0337_auto_20200614_1729.py deleted file mode 100644 index 5d81061f..00000000 --- a/safesite/migrations/0337_auto_20200614_1729.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-06-14 17:29 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0336_auto_20200611_2150'), - ] - - operations = [ - migrations.RenameField( - model_name='inspectitem', - old_name='content', - new_name='desc', - ), - migrations.RenameField( - model_name='inspectitem', - old_name='content2', - new_name='desc2', - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0338_auto_20200614_2155.py b/safesite/migrations/0338_auto_20200614_2155.py deleted file mode 100644 index ee352cc2..00000000 --- a/safesite/migrations/0338_auto_20200614_2155.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-06-14 21:55 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0337_auto_20200614_1729'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='inspectitem', - name='usecomp', - ), - migrations.AddField( - model_name='inspectitem', - name='inspect', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Inspect'), - ), - ] diff --git a/safesite/migrations/0339_auto_20200619_2115.py b/safesite/migrations/0339_auto_20200619_2115.py deleted file mode 100644 index 55be3b66..00000000 --- a/safesite/migrations/0339_auto_20200619_2115.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.8 on 2020-06-19 21:15 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0338_auto_20200614_2155'), - ] - - operations = [ - migrations.AddField( - model_name='inspectitem', - name='handletime', - field=models.DateTimeField(blank=True, null=True, verbose_name='处理时间'), - ), - migrations.AddField( - model_name='inspectitem', - name='todouser', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0340_auto_20200723_2206.py b/safesite/migrations/0340_auto_20200723_2206.py deleted file mode 100644 index 62ec06d2..00000000 --- a/safesite/migrations/0340_auto_20200723_2206.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-07-23 22:06 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0339_auto_20200619_2115'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='inspectitem', - name='img', - field=models.TextField(blank=True, null=True, verbose_name='现场图片'), - ), - migrations.AlterField( - model_name='inspectitem', - name='img2', - field=models.TextField(blank=True, null=True, verbose_name='处理后图片'), - ), - ] diff --git a/safesite/migrations/0341_auto_20200811_2113.py b/safesite/migrations/0341_auto_20200811_2113.py deleted file mode 100644 index 7d801ad3..00000000 --- a/safesite/migrations/0341_auto_20200811_2113.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-08-11 21:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0340_auto_20200723_2206'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='map', - name='type', - field=models.IntegerField(choices=[(1, '工厂'), (2, '矿山')], default=1, verbose_name='地图类型'), - ), - ] diff --git a/safesite/migrations/0342_auto_20200812_2046.py b/safesite/migrations/0342_auto_20200812_2046.py deleted file mode 100644 index e95addac..00000000 --- a/safesite/migrations/0342_auto_20200812_2046.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.8 on 2020-08-12 20:46 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0341_auto_20200811_2113'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='map', - name='type', - ), - ] diff --git a/safesite/migrations/0343_auto_20200812_2104.py b/safesite/migrations/0343_auto_20200812_2104.py deleted file mode 100644 index 94e46c82..00000000 --- a/safesite/migrations/0343_auto_20200812_2104.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-08-12 21:04 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0342_auto_20200812_2046'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='riskact', - name='kind', - field=models.IntegerField(choices=[(1, '工厂'), (2, '矿山')], default=1, verbose_name='类型'), - ), - ] diff --git a/safesite/migrations/0344_auto_20200830_2053.py b/safesite/migrations/0344_auto_20200830_2053.py deleted file mode 100644 index fdb43210..00000000 --- a/safesite/migrations/0344_auto_20200830_2053.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-08-30 20:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0343_auto_20200812_2104'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='eformitems', - name='type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0345_auto_20200830_2243.py b/safesite/migrations/0345_auto_20200830_2243.py deleted file mode 100644 index 2cf9781c..00000000 --- a/safesite/migrations/0345_auto_20200830_2243.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-08-30 22:43 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0344_auto_20200830_2053'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='eformitems', - name='type', - ), - migrations.AddField( - model_name='equipmentcheckitem', - name='type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey'), - ), - ] diff --git a/safesite/migrations/0346_auto_20200905_1756.py b/safesite/migrations/0346_auto_20200905_1756.py deleted file mode 100644 index 0df19653..00000000 --- a/safesite/migrations/0346_auto_20200905_1756.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-05 17:56 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0345_auto_20200830_2243'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='riskacttask', - name='tasknote', - field=models.TextField(blank=True, null=True, verbose_name='任务备注'), - ), - migrations.CreateModel( - name='GridTaskSet', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('task_schedule', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='定时配置')), - ('note', models.TextField(null=True, verbose_name='检查备注')), - ('start_run', models.DateTimeField(blank=True, null=True, verbose_name='开始执行时间')), - ('last_run', models.DateTimeField(blank=True, null=True, verbose_name='最后执行时间')), - ('is_paused', models.BooleanField(default=True, verbose_name='是否暂停派发')), - ('count', models.IntegerField(default=0, verbose_name='任务派发次数')), - ('gridlevel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey', verbose_name='网格化层级')), - ('riskact', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_riskact', to='safesite.RiskAct')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='执行人')), - ], - ), - migrations.AddField( - model_name='riskacttask', - name='taskset', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.GridTaskSet', verbose_name='由哪个设置派发'), - ), - ] diff --git a/safesite/migrations/0347_auto_20200905_1836.py b/safesite/migrations/0347_auto_20200905_1836.py deleted file mode 100644 index d8cb05a2..00000000 --- a/safesite/migrations/0347_auto_20200905_1836.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-05 18:36 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0346_auto_20200905_1756'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='gridtaskset', - name='last_run', - ), - migrations.RemoveField( - model_name='gridtaskset', - name='start_run', - ), - migrations.AddField( - model_name='gridtaskset', - name='last_send', - field=models.DateTimeField(blank=True, null=True, verbose_name='最后派发时间'), - ), - migrations.AddField( - model_name='gridtaskset', - name='start_send', - field=models.DateTimeField(blank=True, null=True, verbose_name='开始派发时间'), - ), - ] diff --git a/safesite/migrations/0348_auto_20200906_1527.py b/safesite/migrations/0348_auto_20200906_1527.py deleted file mode 100644 index 8510d9f0..00000000 --- a/safesite/migrations/0348_auto_20200906_1527.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-06 15:27 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0347_auto_20200905_1836'), - ] - - operations = [ - migrations.RenameField( - model_name='gridtaskset', - old_name='task_schedule', - new_name='schedule', - ), - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0349_auto_20200906_2341.py b/safesite/migrations/0349_auto_20200906_2341.py deleted file mode 100644 index 8fcfe532..00000000 --- a/safesite/migrations/0349_auto_20200906_2341.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-06 23:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0348_auto_20200906_1527'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='gridtaskset', - name='last_send', - field=models.DateTimeField(blank=True, null=True, verbose_name='最近派发时间'), - ), - migrations.AlterField( - model_name='riskacttask', - name='tasknote', - field=models.TextField(blank=True, null=True, verbose_name='任务检查说明'), - ), - ] diff --git a/safesite/migrations/0350_auto_20200906_2344.py b/safesite/migrations/0350_auto_20200906_2344.py deleted file mode 100644 index 54ea1cfb..00000000 --- a/safesite/migrations/0350_auto_20200906_2344.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-06 23:44 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0349_auto_20200906_2341'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='gridtaskset', - name='last_send', - ), - migrations.RemoveField( - model_name='gridtaskset', - name='start_send', - ), - migrations.AddField( - model_name='gridtaskset', - name='create_time', - field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), - preserve_default=False, - ), - migrations.AddField( - model_name='gridtaskset', - name='start_task', - field=models.DateTimeField(blank=True, null=True, verbose_name='最近/初始派发时间'), - ), - ] diff --git a/safesite/migrations/0351_auto_20200908_1119.py b/safesite/migrations/0351_auto_20200908_1119.py deleted file mode 100644 index 7004ccec..00000000 --- a/safesite/migrations/0351_auto_20200908_1119.py +++ /dev/null @@ -1,50 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 11:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('django_celery_beat', '0012_periodictask_expire_seconds'), - ('safesite', '0350_auto_20200906_2344'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='gridtaskset', - name='count', - ), - migrations.RemoveField( - model_name='gridtaskset', - name='create_time', - ), - migrations.RemoveField( - model_name='gridtaskset', - name='is_paused', - ), - migrations.RemoveField( - model_name='gridtaskset', - name='start_task', - ), - migrations.AddField( - model_name='gridtaskset', - name='periodictask', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='django_celery_beat.PeriodicTask'), - preserve_default=False, - ), - migrations.CreateModel( - name='MySchedule', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('crontab', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_celery_beat.CrontabSchedule')), - ('interval', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='django_celery_beat.IntervalSchedule')), - ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0352_auto_20200908_1151.py b/safesite/migrations/0352_auto_20200908_1151.py deleted file mode 100644 index 4117e4de..00000000 --- a/safesite/migrations/0352_auto_20200908_1151.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 11:51 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0351_auto_20200908_1119'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='gridtaskset', - name='schedule', - ), - migrations.AlterField( - model_name='gridtaskset', - name='periodictask', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_periodictask', to='django_celery_beat.PeriodicTask'), - ), - ] diff --git a/safesite/migrations/0353_auto_20200908_1311.py b/safesite/migrations/0353_auto_20200908_1311.py deleted file mode 100644 index 4f38d640..00000000 --- a/safesite/migrations/0353_auto_20200908_1311.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 13:11 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0352_auto_20200908_1151'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='gridtaskset', - name='expire', - field=models.IntegerField(blank=True, null=True, verbose_name='有效期'), - ), - migrations.AddField( - model_name='gridtaskset', - name='myschedule', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='safesite.MySchedule'), - preserve_default=False, - ), - migrations.AddField( - model_name='myschedule', - name='name', - field=models.CharField(default='每10秒', max_length=1000, verbose_name='名称'), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0354_auto_20200908_1407.py b/safesite/migrations/0354_auto_20200908_1407.py deleted file mode 100644 index 70cd77db..00000000 --- a/safesite/migrations/0354_auto_20200908_1407.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 14:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0353_auto_20200908_1311'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='gridtaskset', - name='start_time', - field=models.DateTimeField(blank=True, null=True, verbose_name='开始派发时间'), - ), - migrations.AlterField( - model_name='gridtaskset', - name='expire', - field=models.IntegerField(blank=True, null=True, verbose_name='派发有效期'), - ), - ] diff --git a/safesite/migrations/0355_remove_companyinfo_liaison_fax.py b/safesite/migrations/0355_remove_companyinfo_liaison_fax.py deleted file mode 100644 index f34d9a0f..00000000 --- a/safesite/migrations/0355_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 14:07 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0354_auto_20200908_1407'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - ] diff --git a/safesite/migrations/0356_auto_20200908_1646.py b/safesite/migrations/0356_auto_20200908_1646.py deleted file mode 100644 index e7caf1b2..00000000 --- a/safesite/migrations/0356_auto_20200908_1646.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-08 16:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0355_remove_companyinfo_liaison_fax'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='myschedule', - name='deletemark', - field=models.IntegerField(default=1), - ), - migrations.AddField( - model_name='myschedule', - name='typeset', - field=models.CharField(default=1, max_length=10, verbose_name='类型'), - ), - ] diff --git a/safesite/migrations/0357_auto_20200909_1048.py b/safesite/migrations/0357_auto_20200909_1048.py deleted file mode 100644 index f230ed88..00000000 --- a/safesite/migrations/0357_auto_20200909_1048.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-09 10:48 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0356_auto_20200908_1646'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='myschedule', - name='deletemark', - ), - migrations.AddField( - model_name='gridtaskset', - name='count', - field=models.IntegerField(default=0, verbose_name='派发次数'), - ), - migrations.AddField( - model_name='gridtaskset', - name='last_run_at', - field=models.DateTimeField(blank=True, null=True, verbose_name='最近派发时间'), - ), - migrations.AlterField( - model_name='gridtaskset', - name='expire', - field=models.IntegerField(blank=True, null=True, verbose_name='执行有效期'), - ), - migrations.AlterField( - model_name='gridtaskset', - name='myschedule', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.MySchedule'), - ), - ] diff --git a/safesite/migrations/0358_auto_20200909_1315.py b/safesite/migrations/0358_auto_20200909_1315.py deleted file mode 100644 index cd99bf0a..00000000 --- a/safesite/migrations/0358_auto_20200909_1315.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-09 13:15 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0357_auto_20200909_1048'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='gridtaskset', - name='start_time', - ), - ] diff --git a/safesite/migrations/0359_auto_20200926_0933.py b/safesite/migrations/0359_auto_20200926_0933.py deleted file mode 100644 index b443a541..00000000 --- a/safesite/migrations/0359_auto_20200926_0933.py +++ /dev/null @@ -1,257 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-26 09:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0358_auto_20200909_1315'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='area', - name='link', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='dickey', - name='nousecomps', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='dickey', - name='usecomps', - field=models.TextField(default=',1,'), - ), - migrations.AlterField( - model_name='drill', - name='detailcontent', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='drill', - name='plan', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='fnum', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='oem', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='place', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='equipmentcheckform', - name='desc', - field=models.TextField(verbose_name='描述'), - ), - migrations.AlterField( - model_name='equipmentcheckitem', - name='content', - field=models.TextField(verbose_name='检查内容'), - ), - migrations.AlterField( - model_name='exampaper', - name='nousecomps', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='exampaper', - name='usecomps', - field=models.TextField(default=',1,'), - ), - migrations.AlterField( - model_name='examtest', - name='nousecomps', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='examtest', - name='usecomps', - field=models.TextField(default=',1,'), - ), - migrations.AlterField( - model_name='fxcs', - name='cslx', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='fxcs', - name='nousecomps', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='fxcs', - name='usecomps', - field=models.TextField(default=',1,'), - ), - migrations.AlterField( - model_name='group', - name='menulink', - field=models.TextField(default='11'), - ), - migrations.AlterField( - model_name='map', - name='link', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='miss', - name='description', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='miss', - name='lesson', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='miss', - name='prevent', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='notice', - name='usecomps', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='observe', - name='makeresult', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='observe', - name='otherunsafe', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='observe', - name='safecontent', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='operation', - name='fxcs', - field=models.TextField(), - ), - migrations.AlterField( - model_name='partment', - name='aqy', - field=models.TextField(default=','), - ), - migrations.AlterField( - model_name='partment', - name='bmzg', - field=models.TextField(default=','), - ), - migrations.AlterField( - model_name='partment', - name='bsq', - field=models.TextField(default=','), - ), - migrations.AlterField( - model_name='partment', - name='partlink', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='partment', - name='partname', - field=models.CharField(default='生产部', max_length=200), - ), - migrations.AlterField( - model_name='question', - name='nousecomps', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='question', - name='usecomps', - field=models.TextField(default=',1,'), - ), - migrations.AlterField( - model_name='questioncat', - name='link', - field=models.TextField(blank=True, default=',', null=True), - ), - migrations.AlterField( - model_name='risk', - name='gkcj', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='role', - name='desc', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='描述'), - ), - migrations.AlterField( - model_name='role', - name='name', - field=models.CharField(max_length=200, unique=True, verbose_name='角色'), - ), - migrations.AlterField( - model_name='suggest', - name='clcs', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='clms', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='dqxz', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='jyfk', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='jynr', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='qwxg', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='train', - name='detailcontent', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='train', - name='otherparticipant', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='train', - name='pxxg', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhdd', - field=models.CharField(default='test', max_length=400), - ), - ] diff --git a/safesite/migrations/0360_auto_20200927_2235.py b/safesite/migrations/0360_auto_20200927_2235.py deleted file mode 100644 index 8313ea4d..00000000 --- a/safesite/migrations/0360_auto_20200927_2235.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-27 22:35 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0359_auto_20200926_0933'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='equipment', - name='catename', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='name', - field=models.CharField(max_length=100), - ), - migrations.AlterField( - model_name='equipment', - name='num', - field=models.CharField(blank=True, max_length=100, null=True), - ), - migrations.AlterField( - model_name='equipment', - name='type', - field=models.CharField(blank=True, max_length=100, null=True), - ), - ] diff --git a/safesite/migrations/0361_auto_20200929_1423.py b/safesite/migrations/0361_auto_20200929_1423.py deleted file mode 100644 index cebc1f87..00000000 --- a/safesite/migrations/0361_auto_20200929_1423.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.2.8 on 2020-09-29 14:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0360_auto_20200927_2235'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='filemanage', - name='accessorytype', - field=models.CharField(max_length=100), - ), - migrations.AlterField( - model_name='filemanage', - name='maragename', - field=models.CharField(max_length=100), - ), - migrations.AlterField( - model_name='filemanage', - name='versionnum', - field=models.CharField(max_length=100), - ), - ] diff --git a/safesite/migrations/0362_auto_20201012_0843.py b/safesite/migrations/0362_auto_20201012_0843.py deleted file mode 100644 index 8856ab39..00000000 --- a/safesite/migrations/0362_auto_20201012_0843.py +++ /dev/null @@ -1,142 +0,0 @@ -# Generated by Django 2.2.8 on 2020-10-12 08:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0361_auto_20200929_1423'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='checkjob', - name='yhtp', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='checkjob', - name='zghtp', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='checkproject', - name='checktitle', - field=models.TextField(), - ), - migrations.AlterField( - model_name='checktable', - name='checktitle', - field=models.TextField(), - ), - migrations.AlterField( - model_name='dickey', - name='detail', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='drill', - name='material', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='drill', - name='otherparticipant', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='map', - name='pic', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='miss', - name='missimg', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='myschedule', - name='name', - field=models.CharField(max_length=200, verbose_name='名称'), - ), - migrations.AlterField( - model_name='notice', - name='material', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='observe', - name='lookimg', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='operation', - name='zyimg', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='operation', - name='zyimg2', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='question', - name='mark', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='relation', - name='remark', - field=models.CharField(blank=True, max_length=200, null=True), - ), - migrations.AlterField( - model_name='safecert', - name='url', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='socertificate', - name='url', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='jyimg', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='suggest', - name='shyj', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='train', - name='material', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trainuser', - name='opinion', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='material', - field=models.TextField(blank=True, null=True), - ), - migrations.AlterField( - model_name='trouble', - name='yhtp', - field=models.TextField(blank=True), - ), - migrations.AlterField( - model_name='trouble', - name='zghtp', - field=models.TextField(blank=True), - ), - ] diff --git a/safesite/migrations/0363_auto_20201015_2158.py b/safesite/migrations/0363_auto_20201015_2158.py deleted file mode 100644 index 108fcda7..00000000 --- a/safesite/migrations/0363_auto_20201015_2158.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 2.2.8 on 2020-10-15 21:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0362_auto_20201012_0843'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='exampaper', - name='is_open', - field=models.BooleanField(default=False, verbose_name='公开可考'), - ), - migrations.AlterField( - model_name='train', - name='trainname', - field=models.TextField(), - ), - migrations.AlterField( - model_name='train', - name='trainplace', - field=models.TextField(), - ), - ] diff --git a/safesite/migrations/0364_auto_20201027_1656.py b/safesite/migrations/0364_auto_20201027_1656.py deleted file mode 100644 index e54c7c13..00000000 --- a/safesite/migrations/0364_auto_20201027_1656.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2020-10-27 16:56 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0363_auto_20201015_2158'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='question', - name='parent', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Question'), - ), - ] diff --git a/safesite/migrations/0365_auto_20201115_2158.py b/safesite/migrations/0365_auto_20201115_2158.py deleted file mode 100644 index 73dbf445..00000000 --- a/safesite/migrations/0365_auto_20201115_2158.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 2.2.8 on 2020-11-15 21:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0364_auto_20201027_1656'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='user', - name='password', - field=models.CharField(max_length=200), - ), - migrations.AlterField( - model_name='userprofile', - name='cardnum', - field=models.CharField(default='', max_length=50), - ), - migrations.AlterField( - model_name='userprofile', - name='gender', - field=models.CharField(default='男', max_length=50), - ), - migrations.AlterField( - model_name='userprofile', - name='realname', - field=models.CharField(default='', max_length=50), - ), - migrations.AlterField( - model_name='userprofile', - name='user', - field=models.OneToOneField(default=1, on_delete=django.db.models.deletion.CASCADE, to='safesite.User'), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0366_auto_20201117_1314.py b/safesite/migrations/0366_auto_20201117_1314.py deleted file mode 100644 index 319a3f31..00000000 --- a/safesite/migrations/0366_auto_20201117_1314.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.8 on 2020-11-17 13:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0365_auto_20201115_2158'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AlterField( - model_name='checktask', - name='checkplace', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='checktask', - name='userlist', - field=models.TextField(default=''), - ), - ] diff --git a/safesite/migrations/0367_auto_20201117_1405.py b/safesite/migrations/0367_auto_20201117_1405.py deleted file mode 100644 index f17b788f..00000000 --- a/safesite/migrations/0367_auto_20201117_1405.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.8 on 2020-11-17 14:05 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0366_auto_20201117_1314'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.AddField( - model_name='questioncat', - name='isopen', - field=models.IntegerField(default=0), - ), - ] diff --git a/safesite/migrations/0368_auto_20201209_2145.py b/safesite/migrations/0368_auto_20201209_2145.py deleted file mode 100644 index f73b504b..00000000 --- a/safesite/migrations/0368_auto_20201209_2145.py +++ /dev/null @@ -1,37 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-09 21:45 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0367_auto_20201117_1405'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.RemoveField( - model_name='examtestdetail', - name='ison', - ), - migrations.AddField( - model_name='examtest', - name='testnum', - field=models.IntegerField(default=10, verbose_name='考试机会'), - ), - migrations.AddField( - model_name='examtestdetail', - name='remainnum', - field=models.IntegerField(default=1, verbose_name='剩余次数'), - ), - migrations.AlterField( - model_name='userprofile', - name='user', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='userprofile', to='safesite.User'), - ), - ] diff --git a/safesite/migrations/0369_auto_20201223_2215.py b/safesite/migrations/0369_auto_20201223_2215.py deleted file mode 100644 index 2d8d82d8..00000000 --- a/safesite/migrations/0369_auto_20201223_2215.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-23 22:15 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0368_auto_20201209_2145'), - ] - - operations = [ - # migrations.RemoveField( - # model_name='companyinfo', - # name='liaison_fax', - # ), - migrations.CreateModel( - name='TrainPlan', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('purpose', models.TextField(verbose_name='培训目的')), - ('year', models.IntegerField(default=2021, verbose_name='年份')), - ('month', models.IntegerField(default=1, verbose_name='月份')), - ('period', models.IntegerField(default=0, verbose_name='预计学时')), - ('createtime', models.DateTimeField(default=django.utils.timezone.now)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('deletemark', models.IntegerField(default=1)), - ('group', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='trainplan_group', to='safesite.Group', verbose_name='组')), - ('manager', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='trainplan_manager', to='safesite.User', verbose_name='负责人')), - ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment')), - ], - ), - ] diff --git a/safesite/migrations/0370_remove_companyinfo_liaison_fax.py b/safesite/migrations/0370_remove_companyinfo_liaison_fax.py deleted file mode 100644 index 95acccad..00000000 --- a/safesite/migrations/0370_remove_companyinfo_liaison_fax.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-23 22:16 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0369_auto_20201223_2215'), - ] - - operations = [ - migrations.RemoveField( - model_name='companyinfo', - name='liaison_fax', - ), - ] diff --git a/safesite/migrations/0371_auto_20201227_1824.py b/safesite/migrations/0371_auto_20201227_1824.py deleted file mode 100644 index 725835e0..00000000 --- a/safesite/migrations/0371_auto_20201227_1824.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-27 18:24 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0370_remove_companyinfo_liaison_fax'), - ] - - operations = [ - migrations.AddField( - model_name='trainplan', - name='createby', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_createby', to='safesite.User'), - preserve_default=False, - ), - migrations.AddField( - model_name='trainplan', - name='updateby', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_updateby', to='safesite.User'), - ), - migrations.AlterField( - model_name='trainplan', - name='manager', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='trainplan_manager', to='safesite.User', verbose_name='负责人'), - preserve_default=False, - ), - ] diff --git a/safesite/migrations/0372_train_trainplan.py b/safesite/migrations/0372_train_trainplan.py deleted file mode 100644 index 5c9a067e..00000000 --- a/safesite/migrations/0372_train_trainplan.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-27 21:48 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0371_auto_20201227_1824'), - ] - - operations = [ - migrations.AddField( - model_name='train', - name='trainplan', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.TrainPlan'), - ), - ] diff --git a/safesite/migrations/0373_trainplan_completion.py b/safesite/migrations/0373_trainplan_completion.py deleted file mode 100644 index 189144f6..00000000 --- a/safesite/migrations/0373_trainplan_completion.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2020-12-30 21:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0372_train_trainplan'), - ] - - operations = [ - migrations.AddField( - model_name='trainplan', - name='completion', - field=models.FloatField(default=0, verbose_name='完成度'), - ), - ] diff --git a/safesite/migrations/0374_auto_20210104_2147.py b/safesite/migrations/0374_auto_20210104_2147.py deleted file mode 100644 index e8805059..00000000 --- a/safesite/migrations/0374_auto_20210104_2147.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.8 on 2021-01-04 21:47 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0373_trainplan_completion'), - ] - - operations = [ - migrations.AddField( - model_name='trainuser', - name='score', - field=models.IntegerField(blank=True, null=True, verbose_name='评价总体打分'), - ), - migrations.AlterField( - model_name='trainuser', - name='opinion', - field=models.TextField(blank=True, null=True, verbose_name='建议想法'), - ), - ] diff --git a/safesite/migrations/0375_auto_20210125_2120.py b/safesite/migrations/0375_auto_20210125_2120.py deleted file mode 100644 index a0a1638d..00000000 --- a/safesite/migrations/0375_auto_20210125_2120.py +++ /dev/null @@ -1,43 +0,0 @@ -# Generated by Django 2.2.8 on 2021-01-25 21:20 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0374_auto_20210104_2147'), - ] - - operations = [ - migrations.AddField( - model_name='gridtaskset', - name='trouble', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_trouble', to='safesite.Trouble'), - ), - migrations.AlterField( - model_name='gridtaskset', - name='note', - field=models.TextField(null=True, verbose_name='备注'), - ), - migrations.AlterField( - model_name='gridtaskset', - name='riskact', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='gridtaskset_riskact', to='safesite.RiskAct'), - ), - migrations.CreateModel( - name='TroubleFollowTask', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('taskadd', models.DateTimeField(blank=True, null=True, verbose_name='任务创建时间')), - ('taskdo', models.DateTimeField(blank=True, null=True, verbose_name='任务执行时间')), - ('taskexpire', models.DateTimeField(blank=True, null=True, verbose_name='任务过期时间')), - ('desc', models.TextField(blank=True, null=True, verbose_name='跟踪描述')), - ('tasknote', models.TextField(blank=True, null=True, verbose_name='任务执行说明')), - ('taskset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.GridTaskSet', verbose_name='由哪个设置派发')), - ('trouble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Trouble')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='跟踪人')), - ], - ), - ] diff --git a/safesite/migrations/0376_troublefollowtask_usable.py b/safesite/migrations/0376_troublefollowtask_usable.py deleted file mode 100644 index 47362184..00000000 --- a/safesite/migrations/0376_troublefollowtask_usable.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2021-01-27 21:23 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0375_auto_20210125_2120'), - ] - - operations = [ - migrations.AddField( - model_name='troublefollowtask', - name='usable', - field=models.IntegerField(default=1), - ), - ] diff --git a/safesite/migrations/0377_troublefollowtask_gridlevel.py b/safesite/migrations/0377_troublefollowtask_gridlevel.py deleted file mode 100644 index 33a5e063..00000000 --- a/safesite/migrations/0377_troublefollowtask_gridlevel.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.8 on 2021-01-28 21:45 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0376_troublefollowtask_usable'), - ] - - operations = [ - migrations.AddField( - model_name='troublefollowtask', - name='gridlevel', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='safesite.Dickey', verbose_name='网格化层级'), - ), - ] diff --git a/safesite/migrations/0378_offence.py b/safesite/migrations/0378_offence.py deleted file mode 100644 index 2bb77be7..00000000 --- a/safesite/migrations/0378_offence.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-09 15:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0377_troublefollowtask_gridlevel'), - ] - - operations = [ - migrations.CreateModel( - name='Offence', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('type', models.CharField(default='公司员工', max_length=200, verbose_name='人员类型')), - ('dept', models.CharField(default='', max_length=200, verbose_name='车间')), - ('post', models.CharField(default='', max_length=200, verbose_name='岗位')), - ('area', models.CharField(default='', max_length=200, verbose_name='具体区域')), - ('parter', models.CharField(default='', max_length=200, verbose_name='当事人')), - ('description', models.TextField(blank=True, null=True, verbose_name='描述')), - ('imgs', models.TextField(blank=True, null=True, verbose_name='图片地址')), - ('createtime', models.DateTimeField(auto_now_add=True)), - ('modifytime', models.DateTimeField(auto_now=True)), - ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='举报人')), - ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司')), - ], - ), - ] diff --git a/safesite/migrations/0379_auto_20210509_1916.py b/safesite/migrations/0379_auto_20210509_1916.py deleted file mode 100644 index 55196670..00000000 --- a/safesite/migrations/0379_auto_20210509_1916.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-09 19:16 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0378_offence'), - ] - - operations = [ - migrations.AddField( - model_name='offence', - name='happentime', - field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='发生时间'), - preserve_default=False, - ), - migrations.AddField( - model_name='offence', - name='place', - field=models.CharField(default='', max_length=200, verbose_name='具体地点'), - ), - migrations.AlterField( - model_name='offence', - name='area', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.Area', verbose_name='区域'), - ), - ] diff --git a/safesite/migrations/0380_safefeedback_safeitem_safelist.py b/safesite/migrations/0380_safefeedback_safeitem_safelist.py deleted file mode 100644 index 3f6b4545..00000000 --- a/safesite/migrations/0380_safefeedback_safeitem_safelist.py +++ /dev/null @@ -1,49 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-23 08:41 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0379_auto_20210509_1916'), - ] - - operations = [ - migrations.CreateModel( - name='SafeList', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200, verbose_name='清单名称')), - ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('updatetime', models.DateTimeField(auto_now=True)), - ('usecomp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.Partment', verbose_name='所属公司')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='责任人')), - ], - ), - migrations.CreateModel( - name='SafeItem', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField(verbose_name='清单项目名称')), - ('type', models.IntegerField(default=1)), - ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('updatetime', models.DateTimeField(auto_now=True)), - ('worklist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.SafeList', verbose_name='所属清单')), - ], - ), - migrations.CreateModel( - name='SafeFeedBack', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('isdone', models.IntegerField(default=1)), - ('content', models.TextField(verbose_name='反馈内容')), - ('createtime', models.DateTimeField(default=django.utils.timezone.now, verbose_name='创建时间')), - ('updatetime', models.DateTimeField(auto_now=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='safesite.User', verbose_name='反馈人')), - ('workitem', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='safesite.SafeItem')), - ], - ), - ] diff --git a/safesite/migrations/0381_auto_20210523_1033.py b/safesite/migrations/0381_auto_20210523_1033.py deleted file mode 100644 index 7bbc41ca..00000000 --- a/safesite/migrations/0381_auto_20210523_1033.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-23 10:33 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0380_safefeedback_safeitem_safelist'), - ] - - operations = [ - migrations.RenameField( - model_name='safeitem', - old_name='worklist', - new_name='safelist', - ), - ] diff --git a/safesite/migrations/0382_auto_20210523_1110.py b/safesite/migrations/0382_auto_20210523_1110.py deleted file mode 100644 index 944ab512..00000000 --- a/safesite/migrations/0382_auto_20210523_1110.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-23 11:10 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0381_auto_20210523_1033'), - ] - - operations = [ - migrations.RenameField( - model_name='safefeedback', - old_name='workitem', - new_name='safeitem', - ), - ] diff --git a/safesite/migrations/0383_safelist_qrcode.py b/safesite/migrations/0383_safelist_qrcode.py deleted file mode 100644 index a5c1aaae..00000000 --- a/safesite/migrations/0383_safelist_qrcode.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.8 on 2021-05-23 13:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('safesite', '0382_auto_20210523_1110'), - ] - - operations = [ - migrations.AddField( - model_name='safelist', - name='qrcode', - field=models.CharField(blank=True, max_length=200, null=True), - ), - ]