Skip to content

9
912project
提交 f6134c0f authored 作者: thy's avatar thy
浏览文件
操作

输入输出页面修改

上级 7f86168d
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 451 行增加 和 47 行删除
package-lock.json
浏览文件 @ f6134c0f
......@@ -5261,8 +5261,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
......@@ -5283,14 +5282,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -5305,20 +5302,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -5435,8 +5429,7 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
......@@ -5448,7 +5441,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -5463,7 +5455,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -5471,14 +5462,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -5497,7 +5486,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -5587,8 +5575,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
......@@ -5600,7 +5587,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -5686,8 +5672,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -5723,7 +5708,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -5743,7 +5727,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -5787,14 +5770,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
......@@ -7776,6 +7757,11 @@
}
}
},
"moment": {
"version": "2.24.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
},
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
......
package.json
浏览文件 @ f6134c0f
......@@ -13,6 +13,7 @@
"echarts": "^4.6.0",
"element-ui": "^2.13.0",
"jquery": "^3.4.1",
"moment": "^2.24.0",
"node-sass": "^4.13.1",
"vue": "^2.6.11",
"vue-router": "^3.0.7",
......
src/Home.vue
浏览文件 @ f6134c0f
......@@ -2,7 +2,7 @@
<div>
<app-header></app-header>
<div style="display: flex;">
<sidebar></sidebar>
<sidebar v-show="$route.name == 'assessmentReport'?false:$route.name == 'reportAssess'?false:true"></sidebar>
<router-view ></router-view>
</div>
......
src/components/UnDependenceDispose/UnDependence.vue
浏览文件 @ f6134c0f
......@@ -74,7 +74,7 @@ export default {
pageSize: 8, // 每页个数
openModel: false,
components: '',
technologyId:'未知依赖(未知)',
technologyId:'内部依赖(未知)',
input2: '',
}
},
......@@ -126,7 +126,7 @@ export default {
suffix: ['java'],
target: row.target,
technologyId: '967a8bd0-eb27-4fb6-ba1d-1bca21cea5b4',
technologyName: '国产化依赖(支持)',
technologyName: '内部依赖(支持)',
id: row.id,
oldRule:{
target:row.target,
......@@ -149,7 +149,7 @@ export default {
suffix: ['java'],
target: row.target,
technologyId: '1cc9c4be-8245-49b6-bb4b-3f10c4e8b47f',
technologyName: '非国产化依赖(不支持)',
technologyName: '内部依赖(不支持)',
id: row.id,
oldRule:{
target:row.target,
......
src/components/assessment/components/upload.vue 0 → 100644
浏览文件 @ f6134c0f
<template>
<div class="add-role">
<p class="dialog-header">
<span>代码上传</span>
</p>
<div class="company-content" style="text-align: center; margin-top: 14px;">
<p class="new">
<el-form :model="form">
<el-form-item label="上传类型" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="请选择">
<el-option label="压缩包" value="zip"></el-option>
<el-option label="git地址" value="git"></el-option>
</el-select>
</el-form-item>
<div class="upload-text" v-show="form.region == 'zip'"><img src="../img/upload-text.png" alt="" style="margin-right:5px;margin-botton:5px; cursor: pointer;">上传文件<input type="file" name="file" id="fileUpload" class="up-input" ref="file" @change="after"> </div>
<div class="box">{{ziptext}}</div>
<el-form-item label="请输入git账号" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input v-model="form.username" ></el-input>
</el-form-item>
<el-form-item label="请输入git密码" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input type="password" v-model="form.password" ></el-input>
</el-form-item>
<el-form-item label="请输入git地址" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input type="textarea" v-model="form.desc" ></el-input>
</el-form-item>
</el-form>
</p>
</div>
<p class="line"></p>
<p class="buttonClick">
<!-- <span class="buttonCancl" @click="cancel">取消</span> -->
<span class="buttonSave" @click="goAdd" :class="{'buttonCancl my':ziptext==''?form.desc == ''?true:false:false}">确定</span>
</p>
</div>
</template>
<script>
export default {
name: 'addRole',
props: ['detailData', 'modalName'],
data () {
return {
form: {},
tableDataAdd: [],
content: '',
target: '',
suffix: '',
technologyId: '',
oldRule: {},
form: {
region:'zip',
desc:''
},
ziptext:'',
formLabelWidth: '120px'
}
},
mounted() {
},
methods: {
testLoading(){
this.$parent.myLoading()
},
add(){
this.form = { region:'zip', desc:''}
// this.dialogFormVisible = true
},
close(){
// this.dialogFormVisible = false
this.form={}
},
after(file){
// var test = document.getElementById('fileUpload').files[0].name
this.ziptext = this.$refs.file.files[0].name
},
goAdd(){
if(this.form.region == 'zip' && this.ziptext != ''){
// this.$parent.reset()
this.$emit('reset')
var fd = new FormData()
fd.append('file',this.$refs.file.files[0])
this.$emit('myLoading')
// this.$parent.myLoading()
this.$server.upZip(fd).then(res =>{
console.log(res)
this.$message({
message: '上传代码成功',
type: 'success'
});
this.$emit('addZip','zip',res.data.path)
// this.$parent.addZip('zip',res.data.path)
this.form = { region:'zip', desc:''}
this.ziptext = ''
})
}else if (this.form.region == 'git' && this.form.desc != '' && this.form.username != '' && this.form.password != ''){
// this.$parent.reset()
this.$emit('reset')
this.$emit('myLoading')
// this.$parent.myLoading()
var obj = {
gitAddress:this.form.desc,
username:this.form.username,
password:this.form.password,
}
var url = this.form.desc
this.$server.upGit(obj).then(res =>{
console.log(res)
this.$message({
message: '上传代码成功',
type: 'success'
});
console.log("上传的git",url)
// this.$parent.addZip('git',res.data,url)
this.$emit('addZip','git',res.data,url)
this.form = { region:'zip', desc:''}
})
}
}
}}
</script>
<style scoped>
.buttonCancl.my{
cursor:default;
}
.upload-text{
position: relative;
cursor: pointer;
}
.up-input{
cursor: pointer;
opacity: 0;
position: absolute;
left: 30%;
top: 0;
display: block;
}
.add-role .new{
display: inline-block;
}
.add-role .new{
right: 220px;
}
.add-role .addVal{
/*width: 390px;*/
width: 710px;
display: flex;
font-size: 18px;
color: #666;
text-align: center;
margin-top: 40px;
}
.add-role .addVal>span{
width: 160px;
display: inline-block;
line-height: 34px;
text-align: right;
}
.add-role .line{
margin: 40px 30px 0 30px;
height: 1px;
background: rgba(72,119,230,0.2);
}
.add-role .buttonClick{
display: flex;
justify-content: space-evenly;
margin-top: 30px;
}
.add-role .company-content{
height: 240px;
}
.add-role .company-content>>>.el-radio{
margin-right: 30px;
margin-bottom: 11px;
width: 49px;
}
.add-role .company-content>>>.el-input__inner, .add-role .company-content>>>.el-input{
width: 220px;
}
</style>
\ No newline at end of file
src/components/assessment/components/uploadq.vue 0 → 100644
浏览文件 @ f6134c0f
<!-- 页面布局 -->
<template>
<div class="upload-add">
<el-dialog title="上传代码" :visible.sync="dialogFormVisible" @close="close" :close-on-click-modal='false'>
<img src="../img/upload-line.png" alt="" style="width:95%;">
<el-form :model="form">
<el-form-item label="上传类型" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="请选择">
<el-option label="压缩包" value="zip"></el-option>
<el-option label="git地址" value="git"></el-option>
</el-select>
</el-form-item>
<div class="upload-text" v-show="form.region == 'zip'"><img src="../img/upload-text.png" alt="" style="margin-right:5px;margin-botton:5px;">上传文件<input type="file" name="file" id="fileUpload" class="up-input" ref="file" @change="after"> </div>
<div class="box">{{ziptext}}</div>
<el-form-item label="请输入git账号" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input v-model="form.username" ></el-input>
</el-form-item>
<el-form-item label="请输入git密码" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input type="password" v-model="form.password" ></el-input>
</el-form-item>
<el-form-item label="请输入git地址" :label-width="formLabelWidth" v-show="form.region == 'git'">
<el-input type="textarea" v-model="form.desc" ></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" >
<div >
<el-button type="primary" @click="goAdd" :class="{'hui':ziptext==''?form.desc == ''?true:false:false}" >确 定</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
//例如：import 《组件名称》 from '《组件路径》';
export default {
name: "uploadAdd",
//import引入的组件需要注入到对象中才能使用
components: {},
data() {
//这里存放数据
return {
dialogFormVisible: false,
form: {
region:'zip',
desc:''
},
ziptext:'',
formLabelWidth: '120px'
};
},
//监听属性 类似于data概念
computed: {},
//监控data中的数据变化
watch: {},
//方法集合
methods: {
testLoading(){
this.$parent.myLoading()
},
add(){
this.form = { region:'zip', desc:''}
this.dialogFormVisible = true
},
close(){
this.dialogFormVisible = false
this.form={}
},
after(file){
// var test = document.getElementById('fileUpload').files[0].name
this.ziptext = this.$refs.file.files[0].name
},
goAdd(){
if(this.form.region == 'zip' && this.ziptext != ''){
this.dialogFormVisible = false
var fd = new FormData()
fd.append('file',this.$refs.file.files[0])
this.$parent.myLoading()
this.$server.upZip(fd).then(res =>{
console.log(res)
this.$message({
message: '上传代码成功',
type: 'success'
});
this.$parent.addZip('zip',res.data.path)
this.form = { region:'zip', desc:''}
this.ziptext = ''
})
}else if (this.form.region == 'git' && this.form.desc != '' && this.form.username != '' && this.form.password != ''){
this.dialogFormVisible = false
this.$parent.myLoading()
var obj = {
gitAddress:this.form.desc,
username:this.form.username,
password:this.form.password,
}
var url = this.form.desc
this.$server.upGit(obj).then(res =>{
console.log(res)
this.$message({
message: '上传代码成功',
type: 'success'
});
console.log("上传的git",url)
this.$parent.addZip('git',res.data,url)
this.form = { region:'zip', desc:''}
})
}
}
},
//生命周期 - 创建完成（可以访问当前this实例）
created() {
},
//生命周期 - 挂载完成（可以访问DOM元素）
mounted() {},
beforeCreate() {}, //生命周期 - 创建之前
beforeMount() {}, //生命周期 - 挂载之前
beforeUpdate() {}, //生命周期 - 更新之前
updated() {}, //生命周期 - 更新之后
beforeDestroy() {}, //生命周期 - 销毁之前
destroyed() {}, //生命周期 - 销毁完成
activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
};
</script>
<style scoped>
</style>
src/components/assessment/homeDetailcopy.vue 0 → 100644
浏览文件 @ f6134c0f
差异被折叠。
src/components/evaluationReport/evaluationReport.vue
浏览文件 @ f6134c0f
......@@ -10,7 +10,7 @@
<el-input v-model="searchVal" size="medium" placeholder="请输入查询内容" @change="search"></el-input>
</span>
<span class="button" @click="search">查询</span>
<span class="button new" title="新增报告"><img src="./img/add.png"></span>
<span class="button new" title="新增报告" @click="add"><img src="./img/add.png"></span>
</p>
<div class="common-table">
<el-table
......@@ -66,6 +66,7 @@
<script>
import $ from 'jquery';
import moment from "moment";
export default {
data () {
return {
......@@ -82,6 +83,17 @@ export default {
this.init();
},
methods: {
add(){
console.log(this.$store.state.userData.userName)
this.$router.push({
name: "assessmentReport",
query: {
username:this.$store.state.userData.userName,
authority: this.$store.state.userData.type,
id: null,
}
});
},
// 初始请求
init() {
let val = {
......@@ -116,11 +128,24 @@ export default {
// 评估
evaluation(row) {
console.log(row)
console.log(this.$store.state.userData)
// return
this.$router.push({name:'assessmentReport', query: {
username: this.$store.state.userData.userName,
id: row.id,
authority: this.$store.state.userData.type
}})
// this.$router.push({name: 'complaintManagementDetail',params:{'value': row}});
},
// 报告
report(row) {
console.log(row)
this.$router.push({name:'reportAssess',query: {
username: row.username,
id:row.id,
authority:this.$store.state.userData.type,
}})
},
// 删除
del(row) {
......@@ -149,14 +174,19 @@ export default {
},
// 时间换算
time(value) {
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
return Y + M + D + ' ' + h + m + s;
// console.log(timestamp)
value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
if (value !== undefined && value !== null) {
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
var day = moment(value).format('YYYY-MM-DD HH:mm:ss');
var day2 = moment(day).utc().format()
// console.log(day)
// console.log(timestamp.length)
return day
} else {
return ''
}
}
},
components: {
......
src/components/header/header.vue
浏览文件 @ f6134c0f
......@@ -26,7 +26,7 @@
</span>
</span>
</div>
<div style="height: 40px;background: #fff;" v-if="this.$route.path !== '/firstHome'">
<div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.path == '/firstHome'?false:true">
<p class="list">
<span class="menuTitle goTitle" @click="go">{{sidebar.name}}</span>
<span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)">
......
src/components/keyTechnology/keyTechnology.vue
浏览文件 @ f6134c0f
......@@ -30,11 +30,11 @@
label="技术建议"
align="center">
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="fund"
label="金额(万元)"
align="center">
</el-table-column>
</el-table-column> -->
<el-table-column
align='center'
prop="support"
......
src/components/reportAssess/reportAssess.vue 0 → 100644
浏览文件 @ f6134c0f
差异被折叠。
src/router/index.js
浏览文件 @ f6134c0f
......@@ -229,6 +229,18 @@ export default new Router({
name: 'UnDependence',
component: resolve => require(['../components/UnDependenceDispose/UnDependence.vue'], resolve)
},
// 报告输入页面
{
path: '/assessmentReport',
name: 'assessmentReport',
component: resolve => require(['../components/assessment/homeDetailcopy.vue'], resolve)
},
// 报告输出页面
{
path: '/reportAssess',
name: 'reportAssess',
component: resolve => require(['../components/reportAssess/reportAssess.vue'], resolve)
},
]
}
......
src/services/server.js
浏览文件 @ f6134c0f
......@@ -352,5 +352,40 @@ const server = {
data: data
})
},
goPg(data){
return axios(assessment + "/inspect/rapidAssessment",{
method:"post",
data:data
})
},
pgName(name){
return axios(assessment + "/evaluation/in/"+ name,{
method:"get",
})
},
getTechnology(data){
return axios(assessment + "/evaluation/eva?id="+data.id+'&name='+data.name,{
method:"get",
})
},
upZip(data){
return axios( assessment + "/inspect/uploads",{
method:"post",
data:data
})
},
upGit(data){
return axios(assessment +"/inspect/gitdownload",{
headers: {
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
},
// application/x-www-form-urlencode
method:"post",
data:qs.stringify(data)
})
},
}
export default server;
src/tools/element.js
浏览文件 @ f6134c0f
import Vue from 'vue'
import { Row, Col, Carousel, CarouselItem, Scrollbar, Input, Button, Table, TableColumn, Pagination, Dialog,
Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload, DatePicker,Checkbox,CheckboxGroup,MessageBox} from 'element-ui'
Message,Select, Option, Form, FormItem, Radio, RadioGroup, Upload, DatePicker,Checkbox,CheckboxGroup,MessageBox,Loading,InputNumber} from 'element-ui'
import './element-variables.scss'
Vue.use(Row);
Vue.use(InputNumber);
Vue.use(Col);
Vue.use(Carousel);
Vue.use(CarouselItem);
......@@ -27,5 +28,6 @@ Vue.use(RadioGroup);
Vue.use(Upload);
Vue.use(DatePicker);
Vue.use(Checkbox);
Vue.use(Loading);
Vue.use(CheckboxGroup);
Vue.prototype.$confirm = MessageBox.confirm;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论