diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index d9f99f65..2f9e4b60 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -10,6 +10,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin') const ExtractTextPlugin = require('extract-text-webpack-plugin') const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') const UglifyJsPlugin = require('uglifyjs-webpack-plugin') +const CompressionPlugin = require('compression-webpack-plugin');//引入gzip压缩插件 const env = require('../config/prod.env') @@ -41,6 +42,15 @@ const webpackConfig = merge(baseWebpackConfig, { sourceMap: config.build.productionSourceMap, parallel: true }), + new CompressionPlugin({ + filename: '[path].gz[query]', // 使得多个.gz文件合并成一个文件，这种方式压缩后的文件少，建议使用 + algorithm: 'gzip', // 官方默认压缩算法也是gzip + test: /\.js$|\.css$|\.html$|\.ttf$|\.eot$|\.woff$/, // 使用正则给匹配到的文件做压缩，这里是给html、css、js以及字体（.ttf和.woff和.eot）做压缩 + threshold: 10240, //以字节为单位压缩超过此大小的文件，使用默认值10240吧 + minRatio: 0.8, // 最小压缩比率，官方默认0.8 + //是否删除原有静态资源文件，即只保留压缩后的.gz文件，建议这个置为false，还保留源文件。以防： + deleteOriginalAssets: false + }), // extract css into its own file new ExtractTextPlugin({ filename: utils.assetsPath('css/[name].[contenthash].css'), diff --git a/config/index.js b/config/index.js index 689c3c16..3f63c225 100644 --- a/config/index.js +++ b/config/index.js @@ -57,7 +57,7 @@ module.exports = { * Source Maps */ - productionSourceMap: true, + productionSourceMap: false, // https://webpack.js.org/configuration/devtool/#production devtool: '#source-map', diff --git a/package-lock.json b/package-lock.json index 43653380..5c77c0e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,11 @@ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.0.tgz", "integrity": "sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew==" }, + "@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" + }, "@types/q": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", @@ -121,8 +126,7 @@ "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "align-text": { "version": "0.1.4", @@ -724,8 +728,7 @@ "babel-plugin-syntax-dynamic-import": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", - "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", - "dev": true + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=" }, "babel-plugin-syntax-exponentiation-operator": { "version": "6.13.0", @@ -2078,6 +2081,19 @@ } } }, + "compression-webpack-plugin": { + "version": "1.1.11", + "resolved": "https://registry.npmmirror.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.11.tgz", + "integrity": "sha512-ZVWKrTQhtOP7rDx3M/koXTnRm/iwcYbuCdV+i4lZfAIe32Mov7vUVM0+8Vpz4q0xH+TBUZxq+rM8nhtkDH50YQ==", + "dev": true, + "requires": { + "cacache": "^10.0.1", + "find-cache-dir": "^1.0.0", + "neo-async": "^2.5.0", + "serialize-javascript": "^1.4.0", + "webpack-sources": "^1.0.1" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -7455,6 +7471,11 @@ "sha.js": "^2.4.8" } }, + "pdfjs-dist": { + "version": "2.6.347", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.6.347.tgz", + "integrity": "sha512-QC+h7hG2su9v/nU1wEI3SnpPIrqJODL7GTDFvR74ANKGq1AFJW16PH8VWnhpiTi9YcLSFV9xLeWSgq+ckHLdVQ==" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -10178,6 +10199,63 @@ "unpipe": "1.0.0" } }, + "raw-loader": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz", + "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==", + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" + }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -12300,6 +12378,19 @@ } } }, + "vue-pdf": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz", + "integrity": "sha512-zd3lJj6CbtrawgaaDDciTDjkJMUKiLWtbEmBg5CvFn9Noe9oAO/GNy/fc5c59qGuFCJ14ibIV1baw4S07e5bSQ==", + "requires": { + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "loader-utils": "^1.4.0", + "pdfjs-dist": "2.6.347", + "raw-loader": "^4.0.2", + "vue-resize-sensor": "^2.0.0", + "worker-loader": "^2.0.0" + } + }, "vue-qrcode-reader": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/vue-qrcode-reader/-/vue-qrcode-reader-3.1.0.tgz", @@ -12319,6 +12410,11 @@ } } }, + "vue-resize-sensor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/vue-resize-sensor/-/vue-resize-sensor-2.0.0.tgz", + "integrity": "sha512-W+y2EAI/BxS4Vlcca9scQv8ifeBFck56DRtSwWJ2H4Cw1GLNUYxiZxUHHkuzuI5JPW/cYtL1bPO5xPyEXx4LmQ==" + }, "vue-router": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz", @@ -13504,6 +13600,47 @@ "errno": "~0.1.7" } }, + "worker-loader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz", + "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==", + "requires": { + "loader-utils": "^1.0.0", + "schema-utils": "^0.4.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "schema-utils": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", + "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "requires": { + "ajv": "^6.1.0", + "ajv-keywords": "^3.1.0" + } + } + } + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", diff --git a/package.json b/package.json index 631ea299..5588e372 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "vue-baidu-map": "^0.21.22", "vue-cookies": "^1.7.4", "vue-esign": "^1.0.5", + "vue-pdf": "^4.3.0", "vue-qrcode-reader": "^3.1.0", "vue-router": "^3.0.1", "vue-search-tree": "^1.9.9", @@ -49,6 +50,7 @@ "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", "chalk": "^2.0.1", + "compression-webpack-plugin": "^1.1.11", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.28.0", "extract-text-webpack-plugin": "^3.0.0", diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js index c829d969..be819763 100644 --- a/src/api/lawEnforcement/index.js +++ b/src/api/lawEnforcement/index.js @@ -717,3 +717,130 @@ export function getMonitor(query) { params: query }) } + +// 查询案件下拉列表 +export function getCaseList(query) { + return request({ + url: '/enforce/case/getCaseList', + method: 'get', + params: query + }) +} + +// 查询案件文书列表 +export function getCaseDocumentList(query) { + return request({ + url: '/enforce/case/getCaseDocumentList', + method: 'get', + params: query + }) +} + +// 生成下载协助调查函 +export function createAssistPDF(query) { + return request({ + url: '/enforce/assist/createPDF', + method: 'post', + params: query + }) +} + +// 生成现场检查(勘察)笔录PDF +export function createSurveyPDF(query) { + return request({ + url: '/enforce/survey/createPDF', + method: 'post', + params: query + }) +} + +// 生成立案相关PDF +export function createPutrecordPDF(query) { + return request({ + url: '/enforce/putrecord/createPDF', + method: 'post', + params: query + }) +} + +// 生成现场检查(勘察)笔录PDF +export function createOnrecordPDF(query) { + return request({ + url: '/enforce/onrecord/createPDF', + method: 'post', + params: query + }) +} + +// 生成抽样产品相关PDF +export function createSamplingPDF(query) { + return request({ + url: '/enforce/sampling/createPDF', + method: 'post', + params: query + }) +} + +// 生成PDF +export function createTreatPDF(query) { + return request({ + url: '/enforce/treat/createPDF', + method: 'post', + params: query + }) +} + +// 生成PDF +export function createDecisionPDF(query) { + return request({ + url: '/enforce/decision/createPDF', + method: 'post', + params: query + }) +} + +// 生成现场检查(勘察)笔录PDF +export function createEvidencePDF(query) { + return request({ + url: '/enforce/evidence/createPDF', + method: 'post', + params: query + }) +} + +// 生成PDF +export function createExecutePDF(query) { + return request({ + url: '/enforce/execute/createPDF', + method: 'post', + params: query + }) +} + +// 生成PDF +export function createEndingPDF(query) { + return request({ + url: '/enforce/ending/createPDF', + method: 'post', + params: query + }) +} + +// 案件中止调查PDF +export function createBreakPDF(query) { + return request({ + url: '/enforce/break/createPDF', + method: 'post', + params: query + }) +} + +// 案件恢复调查PDF +export function createResumePDF(query) { + return request({ + url: '/enforce/resume/createPDF', + method: 'post', + params: query + }) +} + diff --git a/src/permission.js b/src/permission.js index 4dfd163b..13752ad4 100644 --- a/src/permission.js +++ b/src/permission.js @@ -139,11 +139,15 @@ const whiteList = [ '/newBusinessEntity/map', //地图 //农业大托管 - '/agriculturalTrusteeship/index', //首页 + '/agriculturalTrusteeship/index',//首页 + '/agriculturalTrusteeship/login',//登录 '/agriculturalTrusteeship/insuranceList',//保险列表 '/agriculturalTrusteeship/insuranceProjectList',//保险产品列表 '/agriculturalTrusteeship/insuranceProjectDetail',//保险产品详情 - + '/agriculturalTrusteeship/societyList',//社会化列表 + '/agriculturalTrusteeship/societyProjectList',//社会化产品列表 + '/agriculturalTrusteeship/societyProjectDetail',//社会化产品详情 + '/agriculturalTrusteeship/shopList',//保险列表首页 ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index 8baa3a43..ab224fce 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3562,11 +3562,20 @@ export const constantRoutes = [ path: '/lawEnforcement/record', name: 'lawEnforcementRecord', meta: { - title: '现场检查（勘察）笔录', + title: '现场检查笔录', hidden: true, }, component: (resolve) => require(['@/views/lawEnforcement/record/record'], resolve) }, + { ////农业执法（新）-- 现场检查（勘察）笔录 + path: '/lawEnforcement/recordDetail', + name: 'lawEnforcementRecordDetail', + meta: { + title: '现场检查笔录', + hidden: true, + }, + component: (resolve) => require(['@/views/lawEnforcement/record/recordDetail'], resolve) + }, { ////农业执法（新）-- 案件列表 path: '/lawEnforcement/caseList', name: 'lawEnforcementCaseList', @@ -4499,6 +4508,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/agriculturalTrusteeship/index'], resolve) }, + { + path: '/agriculturalTrusteeship/login', + name: 'agriculturalTrusteeshipLogin', + meta: { + title: '农业大托管登录', + hidden: true, + }, + component: (resolve) => require(['@/views/agriculturalTrusteeship/login'], resolve) + }, { path: '/agriculturalTrusteeship/insuranceList', name: 'agriculturalTrusteeshipInsuranceList', @@ -4535,6 +4553,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/agriculturalTrusteeship/society/societyList'], resolve) }, + { + path: '/agriculturalTrusteeship/societyProjectList', + name: 'agriculturalTrusteeshipSocietyProjectList', + meta: { + title: '社会化服务', + hidden: true, + }, + component: (resolve) => require(['@/views/agriculturalTrusteeship/society/societyProjectList'], resolve) + }, + { + path: '/agriculturalTrusteeship/societyProjectDetail', + name: 'agriculturalTrusteeshipSocietyProjectDetail', + meta: { + title: '社会化服务', + hidden: true, + }, + component: (resolve) => require(['@/views/agriculturalTrusteeship/society/societyProjectDetail'], resolve) + }, + { + path: '/agriculturalTrusteeship/shopList', + name: 'agriculturalTrusteeshipShopList', + meta: { + title: '保险首页', + hidden: true, + }, + component: (resolve) => require(['@/views/agriculturalTrusteeship/shop/shopList'], resolve) + }, ]; diff --git a/src/views/agriculturalTrusteeship/index.vue b/src/views/agriculturalTrusteeship/index.vue index b48ad148..7f87e2c0 100644 --- a/src/views/agriculturalTrusteeship/index.vue +++ b/src/views/agriculturalTrusteeship/index.vue @@ -3,7 +3,7 @@
-
+

点击登录

登录才能下单或发布产品哦

@@ -322,12 +322,10 @@ } } &:nth-child(2){ - flex: 1; span{ - width: 50%; display: inline-block; text-align: center; - padding: 2PX 2PX; + padding: 2PX 5PX; &:nth-child(1){ color: #497CE8; background: #E2E9FD; diff --git a/src/views/agriculturalTrusteeship/login.vue b/src/views/agriculturalTrusteeship/login.vue new file mode 100644 index 00000000..26d613e5 --- /dev/null +++ b/src/views/agriculturalTrusteeship/login.vue @@ -0,0 +1,292 @@ + + + diff --git a/src/views/agriculturalTrusteeship/shop/shopList.vue b/src/views/agriculturalTrusteeship/shop/shopList.vue new file mode 100644 index 00000000..2b540910 --- /dev/null +++ b/src/views/agriculturalTrusteeship/shop/shopList.vue @@ -0,0 +1,316 @@ + + + diff --git a/src/views/agriculturalTrusteeship/society/societyList.vue b/src/views/agriculturalTrusteeship/society/societyList.vue index 817437a9..ad457fc6 100644 --- a/src/views/agriculturalTrusteeship/society/societyList.vue +++ b/src/views/agriculturalTrusteeship/society/societyList.vue @@ -13,7 +13,7 @@
- +
@@ -25,8 +25,23 @@ :finished="finished" finished-text="没有更多了" > -
-

张三李四合伙开公司有限公司

+
+ +
+

张三李四合伙开公司有限公司

+
+
+

产品 60

+

订单 2851

+
+
+

渔业

+

牧业

+

农业

+
+
+
+

60个产品

@@ -43,31 +58,68 @@ - +
- - -
- -
-

如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊

- - - - -

张三社会服务旗舰店

+
+
+ + + + + + + + + + + + + + + +
+
+
+

灌溉

+ + + +
+
+

服务

+

服务

+

服务

+

服务

+

服务

+
+ + + +
+ +
+

如果只有一行就空着啊啊啊啊啊啊啊啊啊啊啊啊

+
+

￥66.00/亩

+

销 600分 4.7

+
+

张三社会服务旗舰店

+
+
+ +
- +
@@ -167,6 +219,42 @@ padding: 1.5vh 4%; .content_tt{ font-size: .35rem; + margin-bottom: 1vh; + } + .tt_box{ + border-bottom: 1PX solid #D1D8EB; + padding-bottom: 1.5vh; + .tab_box{ + display: flex; + justify-content: space-between; + align-items: center; + .tab_left{ + display: flex; + p{ + &:nth-child(1){ + border-right: 1px solid; + padding-right: 8PX; + margin-right: 8PX; + } + span{ + color: #2B7EEC; + } + line-height: 1; + } + + } + .tab_right{ + display: flex; + p{ + background: #F3F6FE; + padding: 5PX 10PX; + color: #497CE8; + line-height: 1; + border-radius: 5PX; + margin-left: 10PX; + } + } + } } .content_con{ display: flex; @@ -207,6 +295,106 @@ } } } + .main_content{ + display: flex; + width: 96%; + margin-top: 2vh; + height: 79.7vh; + overflow: hidden; + .van-sidebar-item{ + text-align: center; + } + /deep/ .van-sidebar-item--select::before{ + display: none; + } + .main_content_left{ + border-top-right-radius: 15PX; + height: 100%; + overflow-y: scroll; + } + .main_content_right{ + flex: 1; + padding-left: 4%; + height: 100%; + overflow-y: scroll; + .main_content_right_header{ + display: flex; + justify-content: space-between; + align-items: center; + .main_content_right_header_tit{ + font-size: .4rem; + color: #1A1D4A; + } + } + .main_content_right_nav{ + display: flex; + justify-content: space-between; + margin-top: 2vh; + p{ + padding: 5PX 10PX; + background: #F5F5F5; + color: #8F8F8F; + border-radius: 4PX; + } + } + .main_content_right_list{ + display: flex; + margin-top: 2vh; + width: 100%; + img{ + border-radius: 15PX; + margin-right: 4%; + width: auto; + } + .main_content_right_list_content{ + display: flex; + flex-direction:column; + justify-content: space-between; + .tt{ + color: #333333; + font-size: .35rem; + } + .tab{ + display: flex; + justify-content: space-between; + p{ + &:nth-child(1){ + flex: 1; + color: #FF5E00; + span{ + font-size: .4rem; + } + } + &:nth-child(2){ + flex: 1; + span{ + width: 50%; + display: inline-block; + text-align: center; + padding: 2PX 2PX; + &:nth-child(1){ + color: #497CE8; + background: #E2E9FD; + border-top-left-radius: 10PX; + } + &:nth-child(2){ + color: #ffffff; + background-image: linear-gradient(to right , #5D87FA , #5FD5F5); + border-bottom-right-radius: 10PX; + } + } + } + } + } + .name{ + color: #8F8F8F; + background: url("../../../../static/images/agriculturalTrusteeship/index/name_icon.png") no-repeat left center; + padding-left: 14PX; + } + } + } + } + } .main_content_right_list{ display: flex; margin: 0 auto; diff --git a/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue new file mode 100644 index 00000000..5846457a --- /dev/null +++ b/src/views/agriculturalTrusteeship/society/societyProjectDetail.vue @@ -0,0 +1,207 @@ + + + diff --git a/src/views/agriculturalTrusteeship/society/societyProjectList.vue b/src/views/agriculturalTrusteeship/society/societyProjectList.vue new file mode 100644 index 00000000..b662b2ad --- /dev/null +++ b/src/views/agriculturalTrusteeship/society/societyProjectList.vue @@ -0,0 +1,274 @@ + + + diff --git a/src/views/lawEnforcement/index_new.vue b/src/views/lawEnforcement/index_new.vue index d5f83ef6..252be71b 100644 --- a/src/views/lawEnforcement/index_new.vue +++ b/src/views/lawEnforcement/index_new.vue @@ -57,8 +57,8 @@ - - + + diff --git a/src/views/lawEnforcement/record/record.vue b/src/views/lawEnforcement/record/record.vue index 7ea18832..e5089afd 100644 --- a/src/views/lawEnforcement/record/record.vue +++ b/src/views/lawEnforcement/record/record.vue @@ -6,107 +6,59 @@
- - - - - - - +
-
- - - - -
- -
- - - -
- - - +
+
+ + + +

{{item.fileHalfName}}

 - -

现场检查（勘验）笔录.docx

+ +

预览

+ 下载
- -
-

保存

-

处理

-
+ + +
+ + diff --git a/src/views/lawEnforcement/record/recordDocument.vue b/src/views/lawEnforcement/record/recordDocument.vue index 25b67d03..20204489 100644 --- a/src/views/lawEnforcement/record/recordDocument.vue +++ b/src/views/lawEnforcement/record/recordDocument.vue @@ -1,77 +1,76 @@ diff --git a/src/views/lawEnforcement/retrospect/retrospectDetail.vue b/src/views/lawEnforcement/retrospect/retrospectDetail.vue index 59ae0a4a..6ce663f1 100644 --- a/src/views/lawEnforcement/retrospect/retrospectDetail.vue +++ b/src/views/lawEnforcement/retrospect/retrospectDetail.vue @@ -133,7 +133,8 @@ width: 100%; - height: calc(100vh - 269PX); + height: 68vh; + /*calc(100vh - 269PX);*/ background: #eee; diff --git a/src/views/lawEnforcement/retrospect/scan.vue b/src/views/lawEnforcement/retrospect/scan.vue index fef97497..77984428 100644 --- a/src/views/lawEnforcement/retrospect/scan.vue +++ b/src/views/lawEnforcement/retrospect/scan.vue @@ -18,7 +18,7 @@