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,8 +77,8 @@
 				baseUrl: '/aqgl/fxsj',
 				/* 查询参数*/
 				queryParams: {
-					sgksrq: new Date().getTime(),
-					sgjsrq: new Date().getTime()
+					ksrq: '',
+					jsrq: ''
 				},
 				/* 表格标题对应参数*/
 				tableTitle: [

src/views/riskPrecontrol/riskAnalysis/index.vue

@@ -10,13 +10,20 @@
           <el-col :span="6" class="search-col">
             <div class="search-item">
               <span class="search-span">岗位:</span>
-              <el-input  style="width:60% ;"></el-input>
+                <el-select v-model="queryParams.gwid" clearable placeholder="请选择">
+                  <el-option
+                    v-for="item in doQueryScgw"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
             </div>
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
-              <span class="search-span">设备设施风险点:</span>
-             <el-input></el-input>
+              <span class="search-span">风险点:</span>
+             <el-input v-model="queryParams.fxd"></el-input>
             </div>
           </el-col>
 
@@ -25,11 +32,11 @@
       <!-- 按钮操作-->
       <el-row class="tool-bar">
         <PrintButton :app='app'></PrintButton>
-        <ViewButton ref="view" :app='app'></ViewButton>
+       <!-- <ViewButton ref="view" :app='app'></ViewButton>
         <AddButton ref="add" :app='app'></AddButton>
         <CopyButton ref="copy" :app='app'></CopyButton>
         <EditButton ref="edit" :app='app'></EditButton>
-        <AttachFileButton :app='app'></AttachFileButton>
+        <AttachFileButton :app='app'></AttachFileButton> -->
         <FieldButton :app='app'></FieldButton>
         <ExcelButton :app='app'></ExcelButton>
         <!-- 额外按钮-->
@@ -76,11 +83,15 @@
     UpdateKzzxRole,
     QtKzzxRole
   } from "common/src/api/system/dmgSystem.js";
+   import {
+      doQueryScgw
+    } from "@/api/riskPrecontrol/screeningCriteria.js";
   /* edit页面*/
   import Edit from './edit'
   import Details from './details.vue'
   import Cycle from './cycle.vue'
-  import Content from './content.vue'
   import PersonLiable from './personLiable.vue'
+  import Content from './content.vue'
+  import PersonLiable from './personLiable.vue'
   import {
     tableMixin
   } from 'common'
@@ -90,11 +101,19 @@
 
     /* 初始额外赋值*/
     async mounted() {
+      await this.$asRun(
+        [doQueryScgw(),
+        res => {
+          var data = res['data']['records'];
+          this.doQueryScgw = data
+          }
+        ]
+        )
       this.$refs['TablePager'].pageQuery()
-      console.log(_)
     },
     data() {
       return {
+        doQueryScgw:[],
         activeName: 'first',
         /*需要的额外参数 */
         showDialog: false,
@@ -105,8 +124,8 @@
         baseUrl: 'kzzx/role',
         /* 查询参数*/
         queryParams: {
-          ksrq: '',
-          jsrq: ''
+          gwid: '',
+          fxd: ''
         },
         /* 表格标题对应参数*/
         tableTitle: [

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"},