Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/api/equipment/sbxx.js

@@ -30,7 +30,14 @@ method: 'post',
 data: query||{}
 })
 }
-
+/* 启用、停用 */
+export function setQt(query) {
+  return request({
+    url: '/aqgl/sbgl/sbxx/record/qt',
+    method: 'post',
+    data: query||{}
+  })
+}
 
 /* 使用状态查询 */
 export function initUsed(query) {

src/views/riskPrecontrol/maintenanceRisk/index.vue

@@ -9,13 +9,13 @@
 				<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">开始日期:</span>
-						<el-date-picker v-model="queryParams.sgksrq"></el-date-picker>
+						<el-date-picker v-model="queryParams.ksrq"></el-date-picker>
 					</div>
 				</el-col>
 				<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">结束日期:</span>
-						<el-date-picker v-model="queryParams.sgjsrq" ></el-date-picker>
+						<el-date-picker v-model="queryParams.jsrq" ></el-date-picker>
 					</div>
 				</el-col>
 			</el-row>
@@ -24,11 +24,11 @@
 		<el-row class="tool-bar">
 			<PrintButton :app='app'></PrintButton>
 			<ViewButton ref="view" :app='app'></ViewButton>
-      <AttachFileButton  :app='app'></AttachFileButton>
+
 			<AddButton ref="add" :app='app'></AddButton>
 			<CopyButton ref="copy" :app='app'></CopyButton>
 			<EditButton ref="edit" :app='app'></EditButton>
-
+      <AttachFileButton  :app='app'></AttachFileButton>
 			<FieldButton  :app='app'></FieldButton>
 			<ExcelButton :app='app'></ExcelButton>
 			<!-- 额外按钮-->
@@ -78,8 +78,8 @@
 				baseUrl: '/aqgl/fxsj',
 				/* 查询参数*/
 				queryParams: {
-					sgksrq: new Date().getTime(),
-					sgjsrq: new Date().getTime()
+					ksrq: new Date().getTime(),
+					jsrq: new Date().getTime() + 1000*60*60*24*30
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [

src/views/riskPrecontrol/queryRisk/index.vue

@@ -9,13 +9,13 @@
 				<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">开始日期:</span>
-						<el-date-picker v-model="queryParams.sgksrq"></el-date-picker>
+						<el-date-picker v-model="queryParams.ksrq"></el-date-picker>
 					</div>
 				</el-col>
 				<el-col :span="6" class="search-col">
 					<div class="search-item">
 						<span class="search-span">结束日期:</span>
-						<el-date-picker v-model="queryParams.sgjsrq" ></el-date-picker>
+						<el-date-picker v-model="queryParams.jsrq" ></el-date-picker>
 					</div>
 				</el-col>
 			</el-row>
@@ -77,17 +77,17 @@
 				baseUrl: '/aqgl/fxsj',
 				/* 查询参数*/
 				queryParams: {
-					sgksrq: new Date().getTime(),
-					sgjsrq: new Date().getTime()
+					ksrq: '',
+					jsrq: ''
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [
           {label: "风险类型", prop: "fxlx", fieldType: "ftString",width:192,transform:{
           url:'/aqgl/fxyk/shlx/query',label:'name',value:'id'
-        }},
-          {label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{
-          url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id'
-        }},
+          }},
+            {label: "风险性质", prop: "fxxz", fieldType: "ftString",width:240,transform:{
+            url:'/aqgl/fxyk/fxsj/init/shxz',label:'name',value:'id'
+          }},
           {label: "死亡人数", prop: "swrs", fieldType: "int"},
           {label: "重伤人数", prop: "zsrs", fieldType: "int"},
           {label: "轻伤人数", prop: "qsrs", fieldType: "int"},
@@ -95,11 +95,11 @@
           {label: "损失工作日", prop: "gzrss", fieldType: "float"},
           {label: "部门", prop: "bmid", fieldType: "ftString",width:192,transform:{
           url:'/kzzx/bm/query',label:'bmmc',value:'id'
-        }},
+          }},
           {label: "车间编码", prop: "cjid", fieldType: "ftString",width:192},
           {label: "登记人", prop: "djrid", fieldType: "ftString",width:192,transform:{
           url:'/kzzx/user/query',label:'username',value:'userid'
-        }},
+          }},
           {label: "备注", prop: "bz", fieldType: "ftString",width:300},
           {label: "维护人", prop: "whr", fieldType: "ftString"},
           {label: "维护时间", prop: "whsj", fieldType: "ftDateTime"},

src/views/riskPrecontrol/shlx/edit.vue

@@ -4,7 +4,7 @@
         <el-form slot="form" ref="form" :model="form" label-width="80px" :rules="rules">
             <el-row :gutter="20">
                 <el-col :span="24">
-                    <el-form-item label="类型编码"  ref="code" prop="code">
+                    <el-form-item label="编码"  ref="code" prop="code">
                         <el-input :readonly="readonly"  v-model="form.code" ></el-input>
                     </el-form-item>
                 </el-col>

src/views/riskPrecontrol/shlx/index.vue

@@ -74,7 +74,7 @@
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [
-				{label: "类型编码", prop: "code", fieldType: "ftString",width:120},
+				{label: "编码", prop: "code", fieldType: "ftString",width:120},
 				{label: "名称", prop: "name", fieldType: "ftString",width:300},
 				{label: "备注", prop: "bz", fieldType: "ftString",width:300},
 				{label: "维护人", prop: "whr", fieldType: "ftString"},