Merge branch 'master' of http://git.in.ahbd.net/aielab/jcxt_qd

src/components/jc.vue

@@ -150,7 +150,7 @@ export default {
     this.lastTime = new Date().getTime() // 网页第一次打开时，记录当前时间
     // 保证admin中的页面刷新后重置到/admin路由下
     if (this.$route.path !== '/jc/workbench') this.$router.push('/jc/workbench')
-let groupname = window.sessionStorage.getItem('groupname')
+    let groupname = window.sessionStorage.getItem('groupname')
     let data1 = []
     let data = [
       {
@@ -247,13 +247,13 @@ let groupname = window.sessionStorage.getItem('groupname')
   },
   mounted:function(){
       this.addTab("首页",'/jc/workbench')
-      this.getOrganization()
+      this.getJcAccount()
   },
   methods: {
-    async getOrganization() {
-        const result = await this.$http.post('getOrganization')
+    async getJcAccount() {
+        const result = await this.$http.post('getJcAccount')
         
-        this.dwname = result.data.data.user_id.name
+        this.dwname = result.data.data.name
         console.log(this.dwname)
     },
     handleOpen (index) {
@@ -441,6 +441,9 @@ let groupname = window.sessionStorage.getItem('groupname')
     /deep/ .el-menu-item is-active{
       color: #3a8ee6;
     }
+    // .el-footer{
+    //   margin-bottom: 1%;
+    // }
     /deep/ #footer {
         // display: flex;
         // flex-direction: row;
@@ -451,7 +454,7 @@ let groupname = window.sessionStorage.getItem('groupname')
         width: 100%;
         text-align: center;
         font-size: .875rem;
-        // height: 6.25rem;
+        height: 6.25rem;
         // // padding-top: 5px;
         // // opacity: 0.6;
         font-weight: 550;

src/components/jc/modifySubjectInformation.vue

@@ -0,0 +1,212 @@
+<template>
+    <div>
+        	<div slot="header" class="clearfix">
+				<el-breadcrumb separator-class="el-icon-arrow-right">
+					<el-breadcrumb-item :to="{ path: '/jc/workbench' }">首页</el-breadcrumb-item>
+					<el-breadcrumb-item>主体信息</el-breadcrumb-item>
+					<el-breadcrumb-item>修改主体信息</el-breadcrumb-item>
+				</el-breadcrumb>
+			</div>
+
+        <div id="ztinformation" style="margin:40px auto; width:60%">
+			<el-form :model="ztinfo" style="width:100%">
+                 <el-row style="text-align: center; font-size: 23px; margin: 40px 0;">
+                        主体信息维护
+                </el-row>
+				<el-form-item label="登录账号:" prop="login_name" class="labelItem">
+					<el-input v-model="ztinfo.login_name" class="input"></el-input>
+				</el-form-item>
+				<el-form-item label="原密码:" prop="pwd" class="labelItem">
+					<el-input v-model="ztinfo.pwd" class="input" show-password></el-input>
+				</el-form-item>
+				<el-form-item label="新密码:" prop="new_password" class="labelItem">
+					<el-input v-model="ztinfo.new_password" class="input"></el-input>
+				</el-form-item>
+				 <el-form-item label="单位名称:" prop="name" class="labelItem">
+					<el-input v-model="ztinfo.name" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="单位地址:" prop="address" class="labelItem">
+					<el-input v-model="ztinfo.address" placeholder="请输入详细地址" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="联系人:" prop="user_lxr" class="labelItem">
+					<el-input v-model="ztinfo.user_lxr" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="联系电话:" prop="phone_lxr" class="labelItem">
+					<el-input v-model="ztinfo.phone_lxr" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="QQ:" prop="qq" class="labelItem">
+					<el-input v-model="ztinfo.qq" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="Email:" prop="email" class="labelItem">
+					<el-input v-model="ztinfo.email" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="依托单位:" prop="dtRelyOnUnit" class="labelItem">
+					<el-input v-model="ztinfo.dtRelyOnUnit" class="input"  ></el-input>
+				</el-form-item>
+				<el-form-item label="机构性质:" prop="jgxz" class="labelItem">
+					<el-input v-model="ztinfo.jgxz" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="统一社会信用代码:" prop="dtCode" class="labelItem">
+					<el-input v-model="ztinfo.dtCode" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="catl证书编号:" prop="catl_code" class="labelItem">
+					<el-input v-model="ztinfo.catl_code" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="catl到期时间:" prop="calt_expiration" class="labelItem" >
+					<el-input v-model="ztinfo.calt_expiration" class="input"></el-input>
+				</el-form-item>
+				<el-form-item label="cma证书编号:" prop="cma_code" class="labelItem">
+					<el-input v-model="ztinfo.cma_code" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="cma到期时间:" prop="cma_code" class="labelItem">
+					<el-input v-model="ztinfo.cma_code" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="农业农村部认可编号:" prop="mara_code" class="labelItem">
+					<el-input v-model="ztinfo.cma_code" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item  label="农业农村部到期时间:" prop="mara_expiration" class="labelItem">
+					<el-input v-model="ztinfo.mara_expiration" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="产品范围:" prop="cpfw" class="labelItem">
+					<el-input v-model="ztinfo.cpfw" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="认证产品数量:" prop="shuliang" class="labelItem">
+					<el-input v-model="ztinfo.shuliang" class="input" ></el-input>
+				</el-form-item>
+				<el-form-item label="认证参数数量:" prop="canshu" class="labelItem">
+					<el-input v-model="ztinfo.canshu" class="input" ></el-input>
+				</el-form-item>
+			</el-form>
+
+			<div class="footer">
+				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="save()">保存</el-button>
+			</div>
+		</div>
+    </div>
+</template>
+
+<script>
+	export default {
+		name: '',
+		data() {
+			return {
+				pageNum:1,
+                pageSize: 2,
+                ztinfo:{
+					user_id: [],
+				}
+					
+				
+			}
+		},
+
+		mounted() {
+		},
+		created(){
+            this.getJcAccount()
+		},
+		
+		// watch: {
+		// 	monitorText(val) {
+		// 		this.$refs.tree.filter(val);
+		// 	}
+		// },
+		
+		methods: {
+            // async getJgOrgs() {
+            //     const result = await this.$http.post('getJgOrgs', {pageNum: this.pageNum,pageSize: this.pageSize})
+            // }
+            async getJcAccount() {
+                const result = await this.$http.post('getJcAccount')
+                console.log(result.data.data)
+                this.ztinfo = result.data.data
+            },
+			async save(){
+			// console.log(111)
+			const result = await this.$http.post('putJcAccount',this.ztinfo)
+			if (result.data.code == 0) {
+					this.$message({
+						type: 'success',
+						message: '修改成功'
+					})
+					this.getJcAccount()
+				}
+				else{
+					this.$message({
+						type: 'error',
+						message: result.data.message
+					})
+				}
+			}
+        },
+	
+	
+	}
+</script>
+
+<style lang="less" scoped>
+// #formzt .el-form{
+//     text-align: center;
+// }
+    /deep/ #ztinformation{
+		.el-form-item__label{
+			width: 14%;
+		}
+		.el-form-item__error{
+		left:135px;
+	}
+		.el-upload__tip{
+			margin-left: 7.5rem;
+		}
+		.el-upload-list__item-name{
+			margin-left: 7.8125rem
+		}
+	
+	}
+	.labelItem /deep/ .el-form-item__label {
+		// width: 80px;
+		text-align: center;
+		vertical-align: middle;
+		float: left;
+		font-size: 13px;
+		color: #606266;
+		// line-height: 40px;
+		padding: 0 2px 0 0;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	/deep/ #ztinformation{
+		.el-form-item{
+			margin-left: 90px;
+		}
+		.input{
+			width: 48%;
+		}
+		.el-form-item__label{
+			width: 9.375rem;
+			text-align: right;
+			margin-right: .9375rem;
+		}
+	}
+	// .labelItem /deep/ .el-form-item__label {
+	// 	// width: 80px;
+	// 	text-align: center;
+	// 	vertical-align: middle;
+	// 	float: left;
+	// 	font-size: 14px;
+	// 	color: #606266;
+	// 	font-weight: bold;
+	// 	// line-height: 40px;
+	// 	padding: 0 20px 0 0;
+	// 	-webkit-box-sizing: border-box;
+	// 	box-sizing: border-box;
+	// }
+    .footer {
+		margin-left: 45%;
+		margin-top: 20px;
+	}
+    // /deep/ .el-form{
+    //     display: flex;
+    //     justify-content: center;
+    // }
+</style>

src/components/jc/routineMonitor.vue

@@ -66,7 +66,7 @@
 				<el-table-column prop="ispublic" label="任务状态" align="center">
 					<template slot-scope="scope">
 						<el-tag type="" v-if="scope.row.ispublic==1">已发布</el-tag>
-						<el-tag type="danger" v-if="scope.row.ispublic==9">抽样中</el-tag>
+						<el-tag type="danger" v-if="scope.row.ispublic==14">抽样中</el-tag>
 						<el-tag type="info" v-if="scope.row.ispublic==13">检测中</el-tag>
 						<el-tag type="success" v-if="scope.row.ispublic==17">检测中</el-tag>
 						<el-tag type="" v-if="scope.row.ispublic==21">已完成</el-tag>
@@ -184,7 +184,7 @@ const HeadersList = [{
 					},
 					{
 						label: '发布单位',
-						prop: 'releaser.name',
+						prop: 'releaser.rymc',
 
 					},
 					// {
@@ -215,17 +215,23 @@ const HeadersList = [{
 					value: '',
 					label: '全部'
 				},{
-					value: '2',
-					label: '已废止'
+					value: '1',
+					label: '已发布'
 				}, {
-					value: '3',
-					label: '已结束，未完成'
+					value: '9',
+					label: '执行中'
 				}, {
-					value: '4',
-					label: '已结束，已完成'
+					value: '13',
+					label: '抽样中'
 				}, {
-					value: '5',
-					label: '执行中'
+					value: '17',
+					label: '检测中'
+				}, {
+					value: '21',
+					label: '已完成'
+				}, {
+					value: '25',
+					label: '未完成'
 				}],
 				// 日期选择器快捷选项
 				pickerOptions: {

src/components/jc/sampleReport.vue

@@ -184,6 +184,7 @@
 				// 样品下拉框
 				sampleList: [],
 				task_id: '',
+				cyd_id: '',
 				undertake_id: '',
 				// 产地
 				options: regionData,
@@ -225,9 +226,9 @@
 		},
 		created() {
 			this.task_id = this.$route.params.task_id
-			this.task_profile_id = this.$route.params.id
+			this.cyd_id = this.$route.params.cyd_id
 			console.log(this.task_id)
-			console.log(this.task_profile_id)
+			console.log(this.cyd_id)
 			this.getCyd()
 		},
 		methods: {
@@ -235,7 +236,7 @@
 			// 获取抽样单信息
 			async getCyd() {
 				const result = await this.$http.post('getCyd', {
-					task_profile_id: this.task_profile_id
+					cyd_id: this.cyd_id
 				})
 				console.log(result.data.data)
 				this.cyd_data = result.data.data

src/components/jc/setTaskcd.vue

@@ -31,13 +31,13 @@
 						<template slot="label">
 							创建单位
 						</template>
-						{{readForm.creater.name}}
+						{{readForm.creater.rymc}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
 							发布单位
 						</template>
-						{{readForm.releaser.name}}
+						{{readForm.releaser.rymc}}
 					</el-descriptions-item>
 					<el-descriptions-item>
 						<template slot="label">
@@ -147,16 +147,19 @@
 						:prop="table.prop" align="center" :width="table.width" :fixed="table.fixed" />
 					<el-table-column label="操作" align="center" fixed="right">
 					<template slot-scope="scope">
-						<el-button style="margin:5px 0" type="primary" size="small" plain @click="input(scope.row.id)" v-if="scope.row.task_profile_status!== '14'">填报抽样单
+						<el-col>
+						<el-button style="margin:5px 0" type="primary" icon="el-icon-edit-outline" size="mini" plain @click="input(scope.row.id)" v-if="scope.row.task_profile_status!== '14'">填报抽样单
 						</el-button>
-						<el-button style="margin-bottom:5px" type="primary" size="small" @click="getCydlist(scope.row.id)">查看抽样单列表
+						</el-col>
+						<el-col>
+						<el-button type="primary" size="mini" @click="getCydlist(scope.row.id)">查看抽样单列表
 						</el-button>
-						<el-button style="margin:5px 5px" type="primary" size="small" plain icon="el-icon-edit-outline" @click="putCydStatus(scope.row.id)" 
+						<el-button style="margin:5px 5px" type="primary" size="mini" plain @click="putCydStatus(scope.row.id)" 
 						v-if="scope.row.task_profile_status == '已查看' || scope.row.task_profile_status == '抽样中'">上报抽样信息
-								</el-button>
+						</el-button>
+						</el-col>
 					</template>
 					</el-table-column>
-					 
 				</el-table>
 
 				<!-- 抽样单列表对话框 -->
@@ -741,7 +744,7 @@
 				],
 				tableHeader2: [{
 						label: '抽样机构',
-						prop: 'sampleOrgId.name',
+						prop: 'sampleOrgId.rymc',
 						// width: 180,
 					}, {
 						label: '检测机构',
@@ -753,7 +756,7 @@
 					},
 					{
 						label: '状态',
-						prop: this.COMMON.changeStatus('task_profile_status')
+						prop: 'task_profile_status'
 					},
 					// {
 					// 	label: '抽样数量',
@@ -1044,6 +1047,10 @@
 				console.log(res.data.rows)
 				// this.changeStatus(res.data.rows[0].task_profile_status)
 				that.underTask = res.data.rows
+				console.log(this.COMMON.changeStatus(that.underTask[0].task_profile_status))
+				for(let i= 0; i < that.underTask.length; i++){
+					that.underTask[i].task_profile_status = this.COMMON.changeStatus(that.underTask[i].task_profile_status)
+				}
 				// for(let i= 0; i < that.underTask.length; i++) {
 				// 	if(that.underTask[i].task_profile_status == '11') {
 				// 		that.underTask[i].task_profile_status = '已查看'

src/components/jc/subjectInformation.vue

@@ -1,201 +1,172 @@
 <template>
-    <div>
-        	<div slot="header" class="clearfix">
-				<el-breadcrumb separator-class="el-icon-arrow-right">
-					<el-breadcrumb-item :to="{ path: '/jc/workbench' }">首页</el-breadcrumb-item>
-					<el-breadcrumb-item>主体信息</el-breadcrumb-item>
-					<el-breadcrumb-item>信息维护</el-breadcrumb-item>
-				</el-breadcrumb>
-			</div>
+  <div>
+    <div slot="header" class="clearfix">
+      <el-breadcrumb separator-class="el-icon-arrow-right">
+        <el-breadcrumb-item :to="{ path: '/jc/workbench' }"
+          >首页</el-breadcrumb-item
+        >
+        <el-breadcrumb-item>主体信息</el-breadcrumb-item>
+        <el-breadcrumb-item>信息维护</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
 
-        <div id="ztinformation" style="margin:40px auto; width:60%">
-			<el-form :model="ztinfo" style="width:100%">
-                 <el-row style="text-align: center; font-size: 23px; margin: 40px 0;">
-                        主体信息维护
-                </el-row>
-				<el-form-item label="单位名称:" prop="user_id.name" class="labelItem">
-					<el-input v-model="ztinfo.user_id.name" class="input"></el-input>
-				</el-form-item>
-				<el-form-item label="单位地址:" prop="address" class="labelItem">	
-						<!-- <el-cascader placeholder="请选择地区" :options="options" v-model="selectedOptions" @change="handleChange" style="width:15%">
-						</el-cascader> -->
-						<el-input v-model="ztinfo.address" placeholder="请输入详细地址" class="input"></el-input>
-				</el-form-item>
-				
-				<!-- <el-form-item label="" prop="inspected_address2" class="labelItem">	
-						<el-input v-model="inspected_Unit.inspected_address" placeholder="请输入详细地址" style="width:42%"></el-input>
-				</el-form-item> -->
-                <el-form-item label="法人代表:" prop="user_fa" class="labelItem">
-					<el-input v-model="ztinfo.user_fa" class="input"></el-input>
-				</el-form-item>
-				<el-form-item label="联系人:" prop="user_id.contact_name" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_name" class="input"></el-input>
-				</el-form-item>
-				<el-form-item label="联系电话:" prop="user_id.contact_phone" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_phone" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="QQ:" prop="user_id.contact_qq" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_qq" class="input"></el-input>
-				</el-form-item>
-				<el-form-item label="Email:" prop="user_id.contact_mail" class="labelItem">
-					<el-input v-model="ztinfo.user_id.contact_mail" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="依托单位:" prop="dtRelyOnUnit" class="labelItem">
-					<el-input v-model="ztinfo.dtRelyOnUnit" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="机构性质:" prop="jgxz" class="labelItem">
-					<el-input v-model="ztinfo.jgxz" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="统一社会信用代码:" prop="dtCode" class="labelItem">
-					<el-input v-model="ztinfo.dtCode" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="所属区域:" prop="ssqy" class="labelItem">
-					<el-input v-model="ztinfo.ssqy" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="邮编:" prop="zipcode" class="labelItem">
-					<el-input v-model="ztinfo.zipcode" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="技术负责人姓名:" prop="user_js" class="labelItem">
-					<el-input v-model="ztinfo.user_js" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="质量负责人姓名:" prop="user_zl" class="labelItem">
-					<el-input v-model="ztinfo.user_zl" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="资质情况:" prop="zizhi" class="labelItem">
-					<el-input v-model="ztinfo.zizhi" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="catl证书编号:" prop="catl_code" class="labelItem">
-					<el-input v-model="ztinfo.catl_code" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="catl到期时间:" prop="calt_expiration" class="labelItem">
-					<el-input v-model="ztinfo.calt_expiration" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="cma证书编号:" prop="cma_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="cma到期时间:" prop="cma_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="农业农村部认可编号:" prop="mara_code" class="labelItem">
-					<el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="农业农村部到期时间:" prop="mara_expiration" class="labelItem">
-					<el-input v-model="ztinfo.mara_expiration" class="input" disabled></el-input>
-				</el-form-item>
-                <el-form-item label="产品范围:" prop="cpfw" class="labelItem">
-					<el-input v-model="ztinfo.cpfw" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="认证产品数量:" prop="shuliang" class="labelItem">
-					<el-input v-model="ztinfo.shuliang" class="input"></el-input>
-				</el-form-item>
-                <el-form-item label="认证参数数量:" prop="canshu" class="labelItem">
-					<el-input v-model="ztinfo.canshu" class="input"></el-input>
-				</el-form-item>
-			</el-form>
+    <div id="ztinformation" style="margin: 40px auto; width: 60%">
+      <el-form :model="ztinfo" style="width: 100%">
+        <el-row style="text-align: center; font-size: 23px; margin: 40px 0">
+          主体信息维护
+        </el-row>
+        <el-form-item label="单位名称:" prop="name" class="labelItem">
+          <el-input v-model="ztinfo.name" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="单位地址:" prop="address" class="labelItem">
+          <el-input v-model="ztinfo.address" placeholder="请输入详细地址" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="联系人:" prop="user_lxr" class="labelItem">
+          <el-input v-model="ztinfo.user_lxr" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话:" prop="phone_lxr" class="labelItem">
+          <el-input v-model="ztinfo.phone_lxr" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="QQ:" prop="qq" class="labelItem">
+          <el-input v-model="ztinfo.qq" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="Email:" prop="email" class="labelItem">
+          <el-input v-model="ztinfo.email" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="依托单位:" prop="dtRelyOnUnit" class="labelItem">
+          <el-input v-model="ztinfo.dtRelyOnUnit" class="input" disabled ></el-input>
+        </el-form-item>
+        <el-form-item label="机构性质:" prop="jgxz" class="labelItem">
+          <el-input v-model="ztinfo.jgxz" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="统一社会信用代码:" prop="dtCode" class="labelItem">
+          <el-input v-model="ztinfo.dtCode" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="catl证书编号:" prop="catl_code" class="labelItem">
+          <el-input v-model="ztinfo.catl_code" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="catl到期时间:" prop="calt_expiration" class="labelItem" >
+          <el-input v-model="ztinfo.calt_expiration" class="input" disabled ></el-input>
+        </el-form-item>
+        <el-form-item label="cma证书编号:" prop="cma_code" class="labelItem">
+          <el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="cma到期时间:" prop="cma_code" class="labelItem">
+          <el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="农业农村部认可编号:" prop="mara_code" class="labelItem">
+          <el-input v-model="ztinfo.cma_code" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item  label="农业农村部到期时间:" prop="mara_expiration" class="labelItem">
+          <el-input v-model="ztinfo.mara_expiration" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="产品范围:" prop="cpfw" class="labelItem">
+          <el-input v-model="ztinfo.cpfw" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="认证产品数量:" prop="shuliang" class="labelItem">
+          <el-input v-model="ztinfo.shuliang" class="input" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="认证参数数量:" prop="canshu" class="labelItem">
+          <el-input v-model="ztinfo.canshu" class="input" disabled></el-input>
+        </el-form-item>
+      </el-form>
 
-			<div class="footer">
-				<el-button type="primary" style="margin-bottom:30px;" size="small" @click="save()">保存</el-button>
-			</div>
-		</div>
+      <div class="footer">
+        <el-button
+          type="primary"
+          style="margin-bottom: 30px"
+          size="small"
+          @click="modify()"
+          >修改主体信息</el-button
+        >
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-	export default {
-		name: '',
-		data() {
-			return {
-				pageNum:1,
-                pageSize: 2,
-                ztinfo:{
-					user_id: [],
-				}
-					
-				
-			}
-		},
+export default {
+  name: "",
+  data() {
+    return {
+      pageNum: 1,
+      pageSize: 2,
+      ztinfo: {
+        user_id: [],
+      },
+    };
+  },
 
-		mounted() {
-		},
-		created(){
-            this.getOrganization()
-		},
-		
-		// watch: {
-		// 	monitorText(val) {
-		// 		this.$refs.tree.filter(val);
-		// 	}
-		// },
-		
-		methods: {
-            // async getJgOrgs() {
-            //     const result = await this.$http.post('getJgOrgs', {pageNum: this.pageNum,pageSize: this.pageSize})
-            // }
-            async getOrganization() {
-                const result = await this.$http.post('getOrganization')
-                console.log(result.data.data)
-                this.ztinfo = result.data.data
-            },
-			async save(){
-			console.log(111)
-			const result = await this.$http.post('putJcjgOrganization',this.ztinfo)
-			if (result.data.code == 0) {
-					this.$message({
-						type: 'success',
-						message: '修改成功'
-					})
-					this.getOrganization()
-				}
-		}
-        },
-	
-	
-	}
-</script>
+  mounted() {},
+  created() {
+    this.getJcAccount();
+  },
+
+  // watch: {
+  // 	monitorText(val) {
+  // 		this.$refs.tree.filter(val);
+  // 	}
+  // },
 
+  methods: {
+    // async getJgOrgs() {
+    //     const result = await this.$http.post('getJgOrgs', {pageNum: this.pageNum,pageSize: this.pageSize})
+    // }
+    async getJcAccount() {
+      const result = await this.$http.post("getJcAccount");
+      console.log(result.data.data);
+      this.ztinfo = result.data.data;
+    },
+    async modify() {
+      this.$router.push({
+        path: "./modifySubjectInformation",
+      });
+    },
+  },
+};
+</script>
 <style lang="less" scoped>
-// #formzt .el-form{
-//     text-align: center;
-// }
-    /deep/ #ztinformation{
-		.el-form-item__label{
-			width: 14%;
-		}
-		.el-form-item__error{
-		left:135px;
+	// #formzt .el-form{
+	//     text-align: center;
+	// }
+	/deep/ #ztinformation {
+	.el-form-item__label {
+		width: 14%;
+	}
+	.el-form-item__error {
+		left: 135px;
+	}
+	.el-upload__tip {
+		margin-left: 7.5rem;
+	}
+	.el-upload-list__item-name {
+		margin-left: 7.8125rem;
 	}
-		.el-upload__tip{
-			margin-left: 7.5rem;
-		}
-		.el-upload-list__item-name{
-			margin-left: 7.8125rem
-		}
-	
 	}
 	.labelItem /deep/ .el-form-item__label {
-		// width: 80px;
-		text-align: center;
-		vertical-align: middle;
-		float: left;
-		font-size: 13px;
-		color: #606266;
-		// line-height: 40px;
-		padding: 0 2px 0 0;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
+	// width: 80px;
+	text-align: center;
+	vertical-align: middle;
+	float: left;
+	font-size: 13px;
+	color: #606266;
+	// line-height: 40px;
+	padding: 0 2px 0 0;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	}
+	/deep/ #ztinformation {
+	.el-form-item {
+		margin-left: 90px;
+	}
+	.input {
+		width: 48%;
+	}
+	.el-form-item__label {
+		width: 9.375rem;
+		text-align: right;
+		margin-right: 0.9375rem;
 	}
-	/deep/ #ztinformation{
-		.el-form-item{
-			margin-left: 90px;
-		}
-		.input{
-			width: 48%;
-		}
-		.el-form-item__label{
-			width: 9.375rem;
-			text-align: right;
-			margin-right: .9375rem;
-		}
 	}
 	// .labelItem /deep/ .el-form-item__label {
 	// 	// width: 80px;
@@ -210,12 +181,12 @@
 	// 	-webkit-box-sizing: border-box;
 	// 	box-sizing: border-box;
 	// }
-    .footer {
-		margin-left: 45%;
-		margin-top: 20px;
+	.footer {
+	margin-left: 45%;
+	margin-top: 20px;
 	}
-    // /deep/ .el-form{
-    //     display: flex;
-    //     justify-content: center;
-    // }
-</style>
+	// /deep/ .el-form{
+	//     display: flex;
+	//     justify-content: center;
+	// }
+</style>

src/components/jc/workbench.vue

@@ -100,7 +100,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 30rem;
+        height: 28rem;
         margin-bottom: 1.25rem;
         .block{
             margin: 1.25rem 1.25rem;

src/main.js

@@ -12,7 +12,7 @@ import axios from 'axios'
 import * as echarts from 'echarts';
 Vue.prototype.$echarts = echarts
 // 导入全局方法
-import global from './assets/common.vue'
+import global from './components/jc/common.vue'
 Vue.prototype.COMMON = global
 // Vue.prototype.mixinx = mixinx
 

src/router/index.js

@@ -271,7 +271,12 @@ const routes = [{
 			path: '/jc/dataStatistics',
 			name:'dataStatistics',
 			component: () => import('../components/jc/dataStatistics')
+		},{
+			path: '/jc/modifySubjectInformation',
+			name:'modifySubjectInformation',
+			component: () => import('../components/jc/modifySubjectInformation')
 		}
+		
 		]
 	},{
 		path: '/pdf',