Explorar o código

fix: 修复检查任务级别逻辑并更新配置

- 修复检查任务级别变更时的逻辑问题
- 更新vite配置中的后端接口地址
- 在.gitignore中添加dist.zip
- 调整项目表单初始化时的检查级别默认值
huoyi hai 4 meses
pai
achega
29fcde6e30
Modificáronse 4 ficheiros con 21 adicións e 7 borrados
  1. 1 0
      .gitignore
  2. 13 3
      src/views/check/checkTask/index.vue
  3. 5 2
      src/views/system/project/index.vue
  4. 2 2
      vite.config.js

+ 1 - 0
.gitignore

@@ -1,6 +1,7 @@
1
 .DS_Store
1
 .DS_Store
2
 node_modules/
2
 node_modules/
3
 dist/
3
 dist/
4
+dist.zip
4
 npm-debug.log*
5
 npm-debug.log*
5
 yarn-debug.log*
6
 yarn-debug.log*
6
 yarn-error.log*
7
 yarn-error.log*

+ 13 - 3
src/views/check/checkTask/index.vue

@@ -104,7 +104,7 @@
104
           <el-col :span="12">
104
           <el-col :span="12">
105
             <el-form-item label="检查级别" prop="checkLevel">
105
             <el-form-item label="检查级别" prop="checkLevel">
106
               <el-select v-model="form.checkLevel" placeholder="请选择检查级别" style="width: 100%"
106
               <el-select v-model="form.checkLevel" placeholder="请选择检查级别" style="width: 100%"
107
-                @change="handleCheckLevelChange" :disabled="formDisabled">
107
+                @change="handleCheckLevelChange" :disabled="true">
108
                 <el-option v-for="dict in check_level" :key="dict.value" :label="dict.label" :value="dict.value" />
108
                 <el-option v-for="dict in check_level" :key="dict.value" :label="dict.label" :value="dict.value" />
109
               </el-select>
109
               </el-select>
110
             </el-form-item>
110
             </el-form-item>
@@ -151,7 +151,8 @@
151
           </el-col>
151
           </el-col>
152
           <el-col :span="12" v-if="form.isSelfCheck === 1">
152
           <el-col :span="12" v-if="form.isSelfCheck === 1">
153
             <el-form-item label="自查科室" prop="selfCheckDeptId" :required="true">
153
             <el-form-item label="自查科室" prop="selfCheckDeptId" :required="true">
154
-              <el-select v-model="form.selfCheckDeptId" placeholder="请选择自查科室" style="width: 100%" :disabled="formDisabled">
154
+              <el-select v-model="form.selfCheckDeptId" placeholder="请选择自查科室" style="width: 100%"
155
+                :disabled="formDisabled">
155
                 <el-option v-for="dept in deptOptions" :key="dept.deptId" :label="dept.deptName" :value="dept.deptId" />
156
                 <el-option v-for="dept in deptOptions" :key="dept.deptId" :label="dept.deptName" :value="dept.deptId" />
156
               </el-select>
157
               </el-select>
157
             </el-form-item>
158
             </el-form-item>
@@ -229,7 +230,9 @@ const data = reactive({
229
     timeRange: [],
230
     timeRange: [],
230
     ruleType: "DAY",
231
     ruleType: "DAY",
231
     ruleTypeNum: 1,
232
     ruleTypeNum: 1,
232
-    checkProjectItemList: []
233
+    checkProjectItemList: [],
234
+    checkLevel: null,
235
+    checkedLevel: null,
233
   },
236
   },
234
   checkItemsList: [],
237
   checkItemsList: [],
235
   checkedCodes: [],//回显选中的节点
238
   checkedCodes: [],//回显选中的节点
@@ -239,6 +242,7 @@ const data = reactive({
239
     checkResult: null,
242
     checkResult: null,
240
     problemDescription: null,
243
     problemDescription: null,
241
     attachmentUrl: null,
244
     attachmentUrl: null,
245
+    checkLevel: null,
242
     checkedLevel: null,
246
     checkedLevel: null,
243
     documentCode: null,
247
     documentCode: null,
244
     taskName: null,
248
     taskName: null,
@@ -289,7 +293,11 @@ const data = reactive({
289
 const { queryParams, form, rules, checkItemsList, checkedCodes } = toRefs(data)
293
 const { queryParams, form, rules, checkItemsList, checkedCodes } = toRefs(data)
290
 
294
 
291
 const handleCheckLevelChange = (val) => {
295
 const handleCheckLevelChange = (val) => {
296
+  
292
   if ('STATION_LEVEL' == val) {
297
   if ('STATION_LEVEL' == val) {
298
+    form.value.checkedLevel = 'BRIGADE_LEVEL'
299
+  }
300
+  if ('BRIGADE_LEVEL' == val) {
293
     form.value.checkedLevel = 'DEPARTMENT_LEVEL'
301
     form.value.checkedLevel = 'DEPARTMENT_LEVEL'
294
   }
302
   }
295
   if ('DEPARTMENT_LEVEL' == val) {
303
   if ('DEPARTMENT_LEVEL' == val) {
@@ -417,6 +425,8 @@ function handleAdd() {
417
   reset()
425
   reset()
418
   open.value = true
426
   open.value = true
419
   title.value = "巡检任务新建"
427
   title.value = "巡检任务新建"
428
+  form.value.checkLevel = 'STATION_LEVEL';
429
+  handleCheckLevelChange('STATION_LEVEL')
420
   getCheckItem()
430
   getCheckItem()
421
 }
431
 }
422
 
432
 

+ 5 - 2
src/views/system/project/index.vue

@@ -185,7 +185,9 @@ const base_check_status = ref([{"value": "0","label":"启用"},{"value": "1","la
185
 const enableCategoryOptions = ref(undefined)
185
 const enableCategoryOptions = ref(undefined)
186
 
186
 
187
 const data = reactive({
187
 const data = reactive({
188
-  form: {},
188
+  form: {
189
+
190
+  },
189
   queryParams: {
191
   queryParams: {
190
     pageNum: 1,
192
     pageNum: 1,
191
     pageSize: 10,
193
     pageSize: 10,
@@ -261,7 +263,8 @@ function reset() {
261
     categoryName: null,
263
     categoryName: null,
262
     remark: null,
264
     remark: null,
263
     code: null,
265
     code: null,
264
-    importanceDesc: null
266
+    importanceDesc: null,
267
+    checkLevel: check_level.value && check_level.value.length > 0 ? [check_level.value[0].value] : []
265
   }
268
   }
266
   proxy.resetForm("projectRef")
269
   proxy.resetForm("projectRef")
267
 }
270
 }

+ 2 - 2
vite.config.js

@@ -2,8 +2,8 @@ import { defineConfig, loadEnv } from 'vite'
2
 import path from 'path'
2
 import path from 'path'
3
 import createVitePlugins from './vite/plugins'
3
 import createVitePlugins from './vite/plugins'
4
 
4
 
5
-const baseUrl = 'http://192.168.3.221:8088' // 后端接口
6
-
5
+// const baseUrl = 'http://192.168.3.221:8088' // 后端接口
6
+const baseUrl = 'http://airport.samsundot.com:9021/prod-api'
7
 // https://vitejs.dev/config/
7
 // https://vitejs.dev/config/
8
 export default defineConfig(({ mode, command }) => {
8
 export default defineConfig(({ mode, command }) => {
9
   const env = loadEnv(mode, process.cwd())
9
   const env = loadEnv(mode, process.cwd())