youxiw2000 / trash · Commits

Commit ddf73a78d32bb3ae11e6e35f8bdde8fbdb42c28c

Authored by youxiw2000
2 parents 0eabd832 2ec0325c
build: skipped

m

Inline Side-by-side
Showing 8 changed files with 130 additions and 87 deletions
trash-ui/src/views/business/ConstructionCredit/index.vue
  View file @ddf73a7
@@ -177,9 +177,9 @@ @@ -177,9 +177,9 @@
177 import { 177 import {
178 constructionsitesList, 178 constructionsitesList,
179 getDict, 179 getDict,
180 - getArea 180 + getArea,
  181 + updateConstructionsites
181 } from "@/api/dict"; 182 } from "@/api/dict";
182 -import { updateConstructionsites } from "../../../api/dict";  
183 183
184 export default { 184 export default {
185 name: "ConstructionCredit", 185 name: "ConstructionCredit",
trash-ui/src/views/daily/daily/index.vue
  View file @ddf73a7
@@ -83,7 +83,6 @@ @@ -83,7 +83,6 @@
83 @pagination="getList" 83 @pagination="getList"
84 /> 84 />
85 85
86 - <!-- 添加或修改日报对话框 -->  
87 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 86 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
88 <el-form ref="form" :model="form" :rules="rules" label-width="120px"> 87 <el-form ref="form" :model="form" :rules="rules" label-width="120px">
89 <el-form-item label="标题" prop="headline"> 88 <el-form-item label="标题" prop="headline">
trash-ui/src/views/daily/information_sharing/index.vue
  View file @ddf73a7
@@ -93,14 +93,20 @@ @@ -93,14 +93,20 @@
93 /> 93 />
94 94
95 <!-- 添加或修改信息共享对话框 --> 95 <!-- 添加或修改信息共享对话框 -->
96 - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 96 + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
97 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 97 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
98 - <el-form-item label="数据标题" prop="dataHeader">  
99 - <el-input v-model="form.dataHeader" placeholder="请输入数据标题" />  
100 - </el-form-item>  
101 - <el-form-item label="调取部门" prop="retrieveDepartment">  
102 - <el-input v-model="form.retrieveDepartment" placeholder="请输入调取部门" />  
103 - </el-form-item> 98 + <el-row type="flex" justify="center">
  99 + <el-col>
  100 + <el-form-item label="数据标题" prop="dataHeader">
  101 + <el-input v-model="form.dataHeader" placeholder="请输入数据标题" style="width: 200px"/>
  102 + </el-form-item>
  103 + </el-col>
  104 + <el-col>
  105 + <el-form-item label="调取部门" prop="retrieveDepartment">
  106 + <el-input v-model="form.retrieveDepartment" placeholder="请输入调取部门" style="width: 200px"/>
  107 + </el-form-item>
  108 + </el-col>
  109 + </el-row>
104 <el-form-item label="调取时间" prop="retrieveTime"> 110 <el-form-item label="调取时间" prop="retrieveTime">
105 <el-date-picker clearable size="small" style="width: 200px" 111 <el-date-picker clearable size="small" style="width: 200px"
106 v-model="form.retrieveTime" 112 v-model="form.retrieveTime"
trash-ui/src/views/daily/monthly/index.vue
  View file @ddf73a7
@@ -83,31 +83,42 @@ @@ -83,31 +83,42 @@
83 @pagination="getList" 83 @pagination="getList"
84 /> 84 />
85 85
86 - <!-- 添加或修改月报对话框 -->  
87 - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 86 + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
88 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 87 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
89 - <el-form-item label="周期" prop="begintime">  
90 - <el-date-picker clearable size="small" style="width: 200px"  
91 - v-model="form.begintime"  
92 - type="date"  
93 - value-format="yyyy-MM-dd"  
94 - placeholder="选择开始时间">  
95 - </el-date-picker>  
96 - </el-form-item>  
97 - <el-form-item label="至" prop="endtime">  
98 - <el-date-picker clearable size="small" style="width: 200px"  
99 - v-model="form.endtime"  
100 - type="date"  
101 - value-format="yyyy-MM-dd"  
102 - placeholder="选择结束时间">  
103 - </el-date-picker>  
104 - </el-form-item>  
105 - <el-form-item label="标题" prop="headline">  
106 - <el-input v-model="form.headline" placeholder="请输入标题" />  
107 - </el-form-item>  
108 - <el-form-item label="填写人" prop="writer">  
109 - <el-input v-model="form.writer" placeholder="请输入填写人" />  
110 - </el-form-item> 88 + <el-row type="flex" justify="center">
  89 + <el-col>
  90 + <el-form-item label="周期" prop="begintime">
  91 + <el-date-picker clearable size="small" style="width: 200px"
  92 + v-model="form.begintime"
  93 + type="date"
  94 + value-format="yyyy-MM-dd"
  95 + placeholder="选择开始时间">
  96 + </el-date-picker>
  97 + </el-form-item>
  98 + </el-col>
  99 + <el-col>
  100 + <el-form-item label="至" prop="endtime" >
  101 + <el-date-picker clearable size="small" style="width: 200px"
  102 + v-model="form.endtime"
  103 + type="date"
  104 + value-format="yyyy-MM-dd"
  105 + placeholder="选择结束时间">
  106 + </el-date-picker>
  107 + </el-form-item>
  108 + </el-col>
  109 + </el-row>
  110 + <el-row type="flex" justify="center">
  111 + <el-col>
  112 + <el-form-item label="标题" prop="headline">
  113 + <el-input v-model="form.headline" placeholder="请输入标题" style="width: 200px"/>
  114 + </el-form-item>
  115 + </el-col>
  116 + <el-col>
  117 + <el-form-item label="填写人" prop="writer">
  118 + <el-input v-model="form.writer" placeholder="请输入填写人" style="width: 200px"/>
  119 + </el-form-item>
  120 + </el-col>
  121 + </el-row>
111 <el-form-item label="填写时间" prop="writeTime"> 122 <el-form-item label="填写时间" prop="writeTime">
112 <el-date-picker clearable size="small" style="width: 200px" 123 <el-date-picker clearable size="small" style="width: 200px"
113 v-model="form.writeTime" 124 v-model="form.writeTime"
trash-ui/src/views/daily/report/index.vue
  View file @ddf73a7
@@ -85,14 +85,20 @@ @@ -85,14 +85,20 @@
85 /> 85 />
86 86
87 <!-- 添加或修改工作日报对话框 --> 87 <!-- 添加或修改工作日报对话框 -->
88 - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 88 + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
89 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 89 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
90 - <el-form-item label="标题" prop="weeklyTitle">  
91 - <el-input v-model="form.weeklyTitle" placeholder="请输入标题" />  
92 - </el-form-item>  
93 - <el-form-item label="填写人" prop="writer">  
94 - <el-input v-model="form.writer" placeholder="请输入填写人" />  
95 - </el-form-item> 90 + <el-row type="flex" justify="center">
  91 + <el-col>
  92 + <el-form-item label="标题" prop="weeklyTitle">
  93 + <el-input v-model="form.weeklyTitle" placeholder="请输入标题" style="width: 200px"/>
  94 + </el-form-item>
  95 + </el-col>
  96 + <el-col>
  97 + <el-form-item label="填写人" prop="writer">
  98 + <el-input v-model="form.writer" placeholder="请输入填写人" style="width: 200px"/>
  99 + </el-form-item>
  100 + </el-col>
  101 + </el-row>
96 <el-form-item label="填写时间" prop="writeTime"> 102 <el-form-item label="填写时间" prop="writeTime">
97 <el-date-picker clearable size="small" style="width: 200px" 103 <el-date-picker clearable size="small" style="width: 200px"
98 v-model="form.writeTime" 104 v-model="form.writeTime"
trash-ui/src/views/daily/situation/index.vue
  View file @ddf73a7
@@ -95,25 +95,37 @@ @@ -95,25 +95,37 @@
95 <!-- 添加或修改每日普查情况对话框 --> 95 <!-- 添加或修改每日普查情况对话框 -->
96 <el-dialog :title="title" :visible.sync="open" append-to-body> 96 <el-dialog :title="title" :visible.sync="open" append-to-body>
97 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 97 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
98 - <el-form-item label="标题" prop="title">  
99 - <el-input v-model="form.title" placeholder="请输入标题" />  
100 - </el-form-item>  
101 - <el-form-item label="操作人" prop="operator">  
102 - <el-input v-model="form.operator" placeholder="请输入操作人" />  
103 - </el-form-item>  
104 - <el-form-item label="日期" prop="date">  
105 - <el-date-picker clearable size="small" style="width: 200px"  
106 - v-model="form.date"  
107 - type="date"  
108 - value-format="yyyy-MM-dd"  
109 - placeholder="选择日期">  
110 - </el-date-picker>  
111 - </el-form-item>  
112 - <el-form-item label="天气" prop="weather">  
113 - <el-input v-model="form.weather" placeholder="请输入天气" />  
114 - </el-form-item>  
115 - <el-form-item label="全市工地，消纳场开停情况">  
116 - <editor v-model="form.consumptionSiteSituation" :min-height="152"/> 98 + <el-row type="flex" justify="center">
  99 + <el-col>
  100 + <el-form-item label="标题" prop="title">
  101 + <el-input v-model="form.title" placeholder="请输入标题" style="width: 200px"/>
  102 + </el-form-item>
  103 + </el-col>
  104 + <el-col>
  105 + <el-form-item label="操作人" prop="operator">
  106 + <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
  107 + </el-form-item>
  108 + </el-col>
  109 + </el-row>
  110 + <el-row type="flex" justify="center">
  111 + <el-col>
  112 + <el-form-item label="日期" prop="date">
  113 + <el-date-picker clearable size="small" style="width: 200px"
  114 + v-model="form.date"
  115 + type="date"
  116 + value-format="yyyy-MM-dd"
  117 + placeholder="选择日期">
  118 + </el-date-picker>
  119 + </el-form-item>
  120 + </el-col>
  121 + <el-col>
  122 + <el-form-item label="天气" prop="weather">
  123 + <el-input v-model="form.weather" placeholder="请输入天气" style="width: 200px"/>
  124 + </el-form-item>
  125 + </el-col>
  126 + </el-row>
  127 + <el-form-item label="全市工地,消纳场开停情况" >
  128 + <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
117 </el-form-item> 129 </el-form-item>
118 <el-form-item label="车辆数"> 130 <el-form-item label="车辆数">
119 <editor v-model="form.numberOfVehicles" :min-height="192"/> 131 <editor v-model="form.numberOfVehicles" :min-height="192"/>
trash-ui/src/views/daily/toollist/index.vue
  View file @ddf73a7
1 -<template> 1 +<template xmlns:el-col="http://www.w3.org/1999/html">
2 <div class="app-container"> 2 <div class="app-container">
3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" > 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
4 <el-form-item label="标题" prop="title"> 4 <el-form-item label="标题" prop="title">
@@ -95,7 +95,6 @@ @@ -95,7 +95,6 @@
95 @pagination="getList" 95 @pagination="getList"
96 /> 96 />
97 97
98 - <!-- 添加或修改每日工作清单对话框 -->  
99 <el-dialog title="长沙市各区渣土管理普查情况统计表" :visible.sync="open" width="800px" append-to-body center :close-on-click-modal='false'> 98 <el-dialog title="长沙市各区渣土管理普查情况统计表" :visible.sync="open" width="800px" append-to-body center :close-on-click-modal='false'>
100 99
101 <el-form ref="form" :model="form" :rules="rules" label-width="150px"> 100 <el-form ref="form" :model="form" :rules="rules" label-width="150px">
@@ -161,8 +160,6 @@ @@ -161,8 +160,6 @@
161 <el-col :span='12'></el-col> 160 <el-col :span='12'></el-col>
162 </el-row> 161 </el-row>
163 <el-row> 162 <el-row>
164 -  
165 -  
166 <el-form-item label="普查具体情况"> 163 <el-form-item label="普查具体情况">
167 <editor v-model="form.specificSituationOfTheCensus" :min-height="192"/> 164 <editor v-model="form.specificSituationOfTheCensus" :min-height="192"/>
168 </el-form-item> 165 </el-form-item>
trash-ui/src/views/daily/weekly/index.vue
  View file @ddf73a7
@@ -84,30 +84,42 @@ @@ -84,30 +84,42 @@
84 /> 84 />
85 85
86 <!-- 添加或修改周报对话框 --> 86 <!-- 添加或修改周报对话框 -->
87 - <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> 87 + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
88 <el-form ref="form" :model="form" :rules="rules" label-width="80px"> 88 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
89 - <el-form-item label="周期" prop="begintime">  
90 - <el-date-picker clearable size="small" style="width: 200px"  
91 - v-model="form.begintime"  
92 - type="date"  
93 - value-format="yyyy-MM-dd"  
94 - placeholder="选择开始时间">  
95 - </el-date-picker>  
96 - </el-form-item>  
97 - <el-form-item label="至" prop="endtime">  
98 - <el-date-picker clearable size="small" style="width: 200px"  
99 - v-model="form.endtime"  
100 - type="date"  
101 - value-format="yyyy-MM-dd"  
102 - placeholder="选择结束时间">  
103 - </el-date-picker>  
104 - </el-form-item>  
105 - <el-form-item label="标题" prop="headline">  
106 - <el-input v-model="form.headline" placeholder="请输入标题" />  
107 - </el-form-item>  
108 - <el-form-item label="填写人" prop="writer">  
109 - <el-input v-model="form.writer" placeholder="请输入填写人" />  
110 - </el-form-item> 89 + <el-row type="flex" justify="center">
  90 + <el-col>
  91 + <el-form-item label="周期" prop="begintime">
  92 + <el-date-picker clearable size="small" style="width: 200px"
  93 + v-model="form.begintime"
  94 + type="date"
  95 + value-format="yyyy-MM-dd"
  96 + placeholder="选择开始时间">
  97 + </el-date-picker>
  98 + </el-form-item>
  99 + </el-col>
  100 + <el-col>
  101 + <el-form-item label="至" prop="endtime" >
  102 + <el-date-picker clearable size="small" style="width: 200px"
  103 + v-model="form.endtime"
  104 + type="date"
  105 + value-format="yyyy-MM-dd"
  106 + placeholder="选择结束时间">
  107 + </el-date-picker>
  108 + </el-form-item>
  109 + </el-col>
  110 + </el-row>
  111 + <el-row type="flex" justify="center">
  112 + <el-col>
  113 + <el-form-item label="标题" prop="headline">
  114 + <el-input v-model="form.headline" placeholder="请输入标题" style="width: 200px"/>
  115 + </el-form-item>
  116 + </el-col>
  117 + <el-col>
  118 + <el-form-item label="填写人" prop="writer">
  119 + <el-input v-model="form.writer" placeholder="请输入填写人" style="width: 200px"/>
  120 + </el-form-item>
  121 + </el-col>
  122 + </el-row>
111 <el-form-item label="填写时间" prop="writeTime"> 123 <el-form-item label="填写时间" prop="writeTime">
112 <el-date-picker clearable size="small" style="width: 200px" 124 <el-date-picker clearable size="small" style="width: 200px"
113 v-model="form.writeTime" 125 v-model="form.writeTime"