浏览代码

车辆冲洗

zhuangyunsheng 2 月之前
父节点
当前提交
5d607f2fc1

+ 1 - 1
src/views/dataMock/carwash/components/record/detail.vue

@@ -24,7 +24,7 @@
                 <el-col :md="12" :xs="24">
                     <el-form-item label="车牌颜色" prop="licensePlateColor">
                         <el-select v-model="form.licensePlateColor" placeholder="请选择车牌颜色">
-                            <el-option v-for="(label, key) in carWashDic.plateColor.slice(1)" :key="key" :label="label" :value="key + 1"></el-option>
+                            <el-option v-for="(label, key) in carWashDic.plateColor" :key="key" :label="label" :value="key"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>

+ 2 - 0
src/views/dataMock/carwash/components/record/index.vue

@@ -71,6 +71,7 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "captureTime_desc",
         projectId: TOOL.data.get("PROJECT_ID"),
         fpiIdNot: 1,
         createTime: [moment().startOf("month").format("YYYY-MM-DD HH:mm:ss"), moment().add(1, "hour").format("YYYY-MM-DD HH:mm:ss")]
@@ -85,6 +86,7 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
     { column: "fpiId", field: visible.value ? "projectId" : "fpiIdNot" },
     visible.value ? { column: "fpiIdNot" } : {},
     { column: "licensePlate" },

+ 1 - 1
src/views/dataMock/carwash/main.js

@@ -8,7 +8,7 @@ export const workerStates = {
 export const carWashDic = {
     carType: ["未知", "大型客车", "货车", "轿车", "面包车", "小货车", "行人", "二轮车", "三轮车", "SUV/MPV", "中型客车", "机动车", "非机动车", "小型轿车", "微型轿车", "皮卡车"],
     carColor: ["未知", "白色", "银色", "灰色", "黑色", "红色", "深蓝色", "蓝色", "黄色", "绿色", "棕色", "粉色", "紫色", "深灰色", "青色", "橙色"],
-    plateColor: [null, "蓝色", "黄色", "黑色", "白色", "绿色"],
+    plateColor: ["未知", "蓝色", "黄色", "黑色", "白色", "绿色"],
     isSupervise: [{ label: "使用中", value: true }, { label: "已拆除", value: false }],
     alarmType: [null, "未冲洗", "冲洗不足", "冲洗完成", "绕道未冲洗", "其他"]
 }

+ 4 - 3
src/views/system/milestone/components/record/detail.vue

@@ -103,9 +103,10 @@ const form = ref({
 });
 const rules = reactive({
     projectId: [{ required: true, message: "请选择所属项目" }],
-    mountedId: [{ required: true, message: "请选择设备安装点" }],
-    createTime: [{ required: true, message: "请选择抓拍时间" }],
-    recordType: [{ required: true, message: "请选择识别结果" }],
+    parentId: [{ required: true, message: "请选择所属节点" }],
+    nodeSeq: [{ required: true, message: "请输入节点序号" }],
+    nodeName: [{ required: true, message: "请输入节点名称" }],
+    nodeStatus: [{ required: true, message: "请选择节点状态" }],
 })
 
 const open = () => visible.value = true;

+ 2 - 2
src/views/system/milestone/components/record/index.vue

@@ -84,7 +84,6 @@ const formConfig = reactive({
     items: [
         mapFormItemSelect("projectId", "所属项目", proConfig),
         mapFormItemInput("nodeName", "节点名称"),
-        mapFormItemSelect("nodeType", "节点类型", selectConfig),
         mapFormItemSelect("nodeStatus", "节点状态", selectConfig),
         mapFormItemDatePicker("planTime", "计划完成时间", datetimerangeConfig),
         mapFormItemDatePicker("actualTime", "实际完成时间", datetimerangeConfig),
@@ -94,7 +93,8 @@ const formConfig = reactive({
 const paramsColums = reactive([
     { column: "projectId", field: visible.value ? "" : "projectIdNot" },
     visible.value ? { column: "projectIdNot" } : {},
-
+    { column: "nodeName" },
+    { column: "nodeStatus" },
     { column: "planFinishTimeBegin", field: "planTime[0]" },
     { column: "planFinishTimeEnd", field: "planTime[1]" },
     { column: "actualFinishTimeBegin", field: "actualTime[0]" },