sunxiao 10 ماه پیش
والد
کامیت
01a5dff4f7
2فایلهای تغییر یافته به همراه58 افزوده شده و 32 حذف شده
  1. 5 5
      src/views/daily/config.js
  2. 53 27
      src/views/daily/index.vue

+ 5 - 5
src/views/daily/config.js

@@ -1,7 +1,7 @@
 
 export const schema = {
   js: {
-    title: '一、进水指标',
+    title: '进水指标',
     default: {
       list: [
         {
@@ -52,7 +52,7 @@ export const schema = {
     }
   },
   cs: {
-    title: '二、出水指标',
+    title: '出水指标',
     default: {
       list: [
         {
@@ -103,7 +103,7 @@ export const schema = {
     }
   },
   hyc: {
-    title: '三、生化池运行指标',
+    title: '生化池运行指标',
     hycOne: {
       title: '1#好氧池(生化池)',
       list: [
@@ -200,7 +200,7 @@ export const schema = {
     },
   },
   sl: {
-    title: '四、水量指标',
+    title: '水量指标',
     default: {
       list: [
         {
@@ -222,7 +222,7 @@ export const schema = {
     }
   },
   yxcs: {
-    title: '五、运行参数—生化系统主要参数',
+    title: '运行参数—生化系统主要参数',
     default: {
       list: [
         {

+ 53 - 27
src/views/daily/index.vue

@@ -2,22 +2,46 @@
 import { schema } from './config.js';
 import { postDaily } from '@/api/daily';
 
+const { proxy } = getCurrentInstance();
+
+const isVisible = ref(false);
+const testDate = ref(null);
+
+
 const form = ref({});
 const formInline = ref({});
-const testDate = ref();
+
+
+// proxy.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?').then(function () {
+//     return delRole(roleIds);
+//   }).then(() => {
+//     getList();
+//     proxy.$modal.msgSuccess("删除成功");
+//   }).catch(() => {});
+
+console.log(11111111111111111)
+
+const handleNextStep = () => {
+  console.log( testDate.value )
+  if ( !testDate.value ) {
+    return proxy.$modal.Error("请先选择日报时间");
+  }
+  
+
+  isVisible.value = true;
+}
 
 </script>
 
 <template>
-  <div class="daily-container">
+  <div class="app-container">
 
     <el-card shadow="never" header="选择日报填写日期" class="pre-form">
       <el-form :inline="true" :model="formInline">
         <div class="pre-form_inner">
           <el-form-item label="水厂名称">
-            <el-select v-model="formInline.region" placeholder="请选择水厂" clearable>
-              <el-option label="Zone one" value="shanghai" />
-              <el-option label="Zone two" value="beijing" />
+            <el-select model-value="xy" placeholder="请选择水厂">
+              <el-option label="信义污水厂" value="xy" />
             </el-select>
           </el-form-item>
           <el-form-item label="日报时间">
@@ -27,40 +51,42 @@ const testDate = ref();
       </el-form>
 
       <div class="next-btn">
-        <el-button type="primary">下一步</el-button>
+        <el-button type="primary" @click="handleNextStep">下一步</el-button>
       </div>
-
     </el-card>
 
-    <el-card class="card" shadow="never" :header="obj.title" :key="key" v-for="obj, key in schema">
-      <el-form label-position="right" label-suffix=":">
-        <div v-for="val, k in obj" :key="key + k">
-          <el-divider content-position="left" v-show="val.title">{{ val.title }}</el-divider>
-          <el-row :gutter="100">
-            <el-col :span="8" v-for="item in val.list" :key="item.key">
-              <el-form-item :label-width="150" :label="item.label">
-                <el-input-number v-model="form[item.key]" :controls="false" />
-                <span style="padding-left: 10px; color: #999;">{{ item.unit }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </el-form>
-    </el-card>
+    <div v-show="isVisible">
+      <el-card class="card" shadow="never" :header="obj.title" :key="key" v-for="obj, key in schema">
+        <el-form label-position="right" label-suffix=":">
+          <div v-for="val, k in obj" :key="key + k">
+            <el-divider content-position="left" v-show="val.title">{{ val.title }}</el-divider>
+            <el-row :gutter="100">
+              <el-col :span="8" v-for="item in val.list" :key="item.key">
+                <el-form-item :label-width="150" :label="item.label">
+                  <el-input-number v-model="form[item.key]" :controls="false" />
+                  <span style="padding-left: 10px; color: #999;">{{ item.unit }}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </el-card>
 
-    <div class="btn-group">
-      <el-button>保存</el-button>
-      <el-button type="primary">提交</el-button>
+      <div class="btn-group">
+        <el-button>保存</el-button>
+        <el-button type="primary">提交</el-button>
+      </div>
     </div>
+
   </div>
 
 </template>
 
 <style lang="scss" scoped>
 .daily-container {
-  height: 100%;
+  // height: calc(100vh - 84px);
   padding: 20px;
-  background: #fafbfa;
+  // background: #fafbfa;
 
   .card:not(:last-child) {
     margin-bottom: 20px;