diff --git a/package.json b/package.json index e04d775..332bb0e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.19.1", - "echarts": "4.9.0", + "cs-ruler": "^2.1.5", + "echarts": "^4.9.0", "element-ui": "2.15.8", "file-saver": "2.0.5", "fuse.js": "6.4.3", diff --git a/src/api/system/comprehensive.js b/src/api/system/comprehensive.js new file mode 100644 index 0000000..94af669 --- /dev/null +++ b/src/api/system/comprehensive.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 体制分析 +export function synthesize(query) { + return request({ + url: '/physique/analysis/synthesize', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/system/quality.js b/src/api/system/quality.js new file mode 100644 index 0000000..b8250e6 --- /dev/null +++ b/src/api/system/quality.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +//查询用户权限 +export function getRoleInfo() { + return request({ + url: 'common/getRoleInfo', + method: 'get' + }) +} +// 查询身体素质 +export function testBodyScoreInfo(query) { + return request({ + url: 'system/testBodyScoreInfo/listBody', + method: 'get', + params: query + }) +} + + +//批次编号 +export function testScoreBatch(query) { + return request({ + url: '/system/testScoreBatch/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/system/shape.js b/src/api/system/shape.js new file mode 100644 index 0000000..f0634c2 --- /dev/null +++ b/src/api/system/shape.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +//查询用户身体形态 +export function analysis(query) { + return request({ + url: '/body/shape/analysis', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/icons/笑脸.png b/src/icons/笑脸.png new file mode 100644 index 0000000..078d8c9 Binary files /dev/null and b/src/icons/笑脸.png differ diff --git a/src/icons/金牌.png b/src/icons/金牌.png new file mode 100644 index 0000000..88f409b Binary files /dev/null and b/src/icons/金牌.png differ diff --git a/src/icons/金牌2.png b/src/icons/金牌2.png new file mode 100644 index 0000000..0311c45 Binary files /dev/null and b/src/icons/金牌2.png differ diff --git a/src/main.js b/src/main.js index d65056b..0c5d8c1 100644 --- a/src/main.js +++ b/src/main.js @@ -73,14 +73,14 @@ DictData.install() */ Vue.use(Element, { - size: Cookies.get('size') || 'medium' // set element-ui default size + size: Cookies.get('size') || 'medium' // set element-ui default size }) Vue.config.productionTip = false new Vue({ - el: '#app', - router, - store, - render: h => h(App) -}) + el: '#app', + router, + store, + render: h => h(App) +}) \ No newline at end of file diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue new file mode 100644 index 0000000..dbf3dff --- /dev/null +++ b/src/views/system/comprehensive/index.vue @@ -0,0 +1,897 @@ + + + diff --git a/src/views/system/itemCategory/index.vue b/src/views/system/itemCategory/index.vue index ff25a21..acbedcb 100644 --- a/src/views/system/itemCategory/index.vue +++ b/src/views/system/itemCategory/index.vue @@ -298,34 +298,30 @@ export default { components: { Treeselect }, data() { let testItemLevelList = (rule, value, callback) => { - console.log(value); + let min = value.map((e) => { + return e.levelMinScore; + }).toString(); + let max = value.map((e) => { + return e.levelMaxScore; + }).toString(); + console.log(min, max); + + if (Number(max) < Number(min)) { + console.log(min,max); + callback(new Error("最高分必须大于最低分,请重新填写！")); + + } + if ( value.map((e) => { return e.levelName; }) == "" ) { callback(); - } else if ( - value.map((e) => { - return e.levelMinScore; - }) == "" - ) { + } else if (min == "") { callback(); - } else if ( - value.map((e) => { - return e.levelMaxScore; - }) == "" - ) { + } else if (max == "") { callback(); - } else if ( - value.map((e) => { - return e.levelMaxScore; - }) <= - value.map((e) => { - return e.levelMinScore; - }) - ) { - callback(new Error("级别最高分必须大于最低分,请重新填写！")); } else { callback(); } diff --git a/src/views/system/quality/index.vue b/src/views/system/quality/index.vue new file mode 100644 index 0000000..4e24053 --- /dev/null +++ b/src/views/system/quality/index.vue @@ -0,0 +1,924 @@ + + + diff --git a/src/views/system/shape/index.vue b/src/views/system/shape/index.vue new file mode 100644 index 0000000..e31ce36 --- /dev/null +++ b/src/views/system/shape/index.vue @@ -0,0 +1,1269 @@ + + + diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue index 5fe397a..bcb2192 100644 --- a/src/views/system/testItemScore/index.vue +++ b/src/views/system/testItemScore/index.vue @@ -123,7 +123,6 @@ label="所属批次编号" align="center" prop="batchCode" - />