Browse Source

消防设施维护与检测搜索优化

liuQiang 1 year ago
parent
commit
25357de3e5
4 changed files with 663 additions and 628 deletions
  1. 2 2
      .env.dev
  2. 2 1
      src/utils/dict.js
  3. 4 4
      src/views/backend/fpdDetection/index.vue
  4. 655 621
      yarn.lock

+ 2 - 2
.env.dev

@@ -5,8 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 消防安全公共服务平台
 
 # # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://localhost:48081'
-#VUE_APP_BASE_API = 'http://api-security.byants.com'
+#VUE_APP_BASE_API = 'http://localhost:48081'
+VUE_APP_BASE_API = 'http://api-security.byants.com'
 # VUE_APP_BASE_API = 'http://192.168.1.16:48081'
 # 根据服务器或域名修改
 PUBLIC_PATH = ''

+ 2 - 1
src/utils/dict.js

@@ -88,7 +88,8 @@ export const DICT_TYPE = {
     BACKEND_ORG_TYPE: "backend_org_type", //单位类型
     DWXZ:'dwxz',//单位 性质
     SUPERVISION_ORG_TYPE: "supervision_org_type", //监管单位类别
-    BACKEND_EMP_KIND: "backend_emp_kind"
+    BACKEND_EMP_KIND: "backend_emp_kind",
+    BACKEND_DET_RESULT: "det_result"//检测维保结果
         // ========== 数据字典映射 =================
 };
 

+ 4 - 4
src/views/backend/fpdDetection/index.vue

@@ -2,14 +2,14 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="预计检测时间" prop="detdate">
         <el-date-picker v-model="queryParams.detdate" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
                         range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="检测维保结果" prop="detresult">
         <el-select v-model="queryParams.detresult" placeholder="请选择检测维保结果" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_LOGIN_RESULT)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BACKEND_DET_RESULT)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -21,10 +21,10 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['backend:fpd-detection:create']">新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['backend:fpd-detection:export']">导出</el-button>

File diff suppressed because it is too large
+ 655 - 621
yarn.lock


Some files were not shown because too many files changed in this diff