Przeglądaj źródła

泛化列表单选+泛化详情改为限制输入2位小数

zhangliang2 2 lat temu
rodzic
commit
049336ae45

+ 26 - 26
src/views/sceneLibrary/components/generalizationDetail.vue

@@ -801,25 +801,25 @@
 // 2923ab09-f051-4226-8e61-7573c19b523d aliyun-dev
 // 这是 70环境的  Bearer dd26d02c-7284-4080-8d1d-a4d444cb5402
 
-// 校验最多1位小数的非负数
+// 校验最多2位小数的非负数
 let validateNum = (rule, value, callback) => {
-    !/^(0|[1-9][0-9]*)(\.\d{1})?$/.test(value) &&
+    !/^(0|[1-9][0-9]*)(\.\d{2})?$/.test(value) &&
         callback(new Error(rule.message));
     callback();
 };
-// 校验最多1位小数-可为负
+// 校验最多2位小数-可为负
 let validateNumA = (rule, value, callback) => {
-    !/^(-?(0|[1-9][0-9]*))(\.\d{1})?$/.test(value) &&
+    !/^(-?(0|[1-9][0-9]*))(\.\d{2})?$/.test(value) &&
         callback(new Error(rule.message));
     callback();
 };
-// 校验最多1位小数的正数
+// 校验最多2位小数的正数
 let isMoreThan0 = (rule, value, callback) => {
     if (value <= 0) {
         callback(new Error(rule.message));
         return;
     }
-    !/^(0|[1-9][0-9]*)(\.\d{1})?$/.test(value) &&
+    !/^(0|[1-9][0-9]*)(\.\d{2})?$/.test(value) &&
         callback(new Error(rule.message));
     callback();
 };
@@ -904,7 +904,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -912,7 +912,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -920,7 +920,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -928,7 +928,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -936,7 +936,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -944,7 +944,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -952,7 +952,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNum,
-                        message: "请输入最多带有1位小数的非负数",
+                        message: "请输入最多带有2位小数的非负数",
                         trigger: ["blur"],
                     },
                 ],
@@ -960,7 +960,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNum,
-                        message: "请输入最多带有1位小数的非负数",
+                        message: "请输入最多带有2位小数的非负数",
                         trigger: ["blur"],
                     },
                 ],
@@ -968,7 +968,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -984,7 +984,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -992,7 +992,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -1000,7 +1000,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -1008,7 +1008,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -1016,7 +1016,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNumA,
-                        message: "请输入最多带有1位小数的数字",
+                        message: "请输入最多带有2位小数的数字",
                         trigger: ["blur"],
                     },
                 ],
@@ -1024,7 +1024,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -1032,7 +1032,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNum,
-                        message: "请输入最多带有1位小数的非负数",
+                        message: "请输入最多带有2位小数的非负数",
                         trigger: ["blur"],
                     },
                 ],
@@ -1040,7 +1040,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: validateNum,
-                        message: "请输入最多带有1位小数的非负数",
+                        message: "请输入最多带有2位小数的非负数",
                         trigger: ["blur"],
                     },
                 ],
@@ -1048,7 +1048,7 @@ export default {
                     { required: true, message: "请输入", trigger: "blur" },
                     {
                         validator: isMoreThan0,
-                        message: "请输入最多带有1位小数的正数",
+                        message: "请输入最多带有2位小数的正数",
                         trigger: ["blur"],
                     },
                 ],
@@ -1319,7 +1319,7 @@ export default {
                 { required: true, message: "请输入", trigger: "blur" },
                 {
                     validator: validateNum,
-                    message: "请输入最多带有1位小数的非负数",
+                    message: "请输入最多带有2位小数的非负数",
                     trigger: ["blur"],
                 },
             ];
@@ -1328,7 +1328,7 @@ export default {
                 { required: true, message: "请输入", trigger: "blur" },
                 {
                     validator: isMoreThan0,
-                    message: "请输入最多带有1位小数的正数",
+                    message: "请输入最多带有2位小数的正数",
                     trigger: ["blur"],
                 },
             ];

+ 13 - 49
src/views/sceneLibrary/components/generalizationList.vue

@@ -3,45 +3,27 @@
         <search-layout>
             <template slot="searchItem1">
                 <span class="label">场景类型编号</span>
-                <el-input
-                    v-model="searchParams.sceneId"
-                    size="small"
-                    clearable
-                    placeholder="请输入"
-                    maxlength="60"
-                    @keyup.enter.native="doSearch"
-                >
+                <el-input v-model="searchParams.sceneId" size="small" clearable placeholder="请输入" maxlength="60"
+                    @keyup.enter.native="doSearch">
                 </el-input>
             </template>
             <template slot="searchItem2">
                 <span class="label">功能模块</span>
                 <el-select v-model="searchParams.fileName" multiple>
-                    <el-option
-                        v-for="item in fileNameList"
-                        :label="item.caption"
-                        :value="item.code"
-                        :key="item.code"
-                    ></el-option>
+                    <el-option v-for="item in fileNameList" :label="item.caption" :value="item.code" :key="item.code">
+                    </el-option>
                 </el-select>
             </template>
             <template slot="searchItem3">
                 <span class="label">天气</span>
                 <el-select v-model="searchParams.scenarioWeather" multiple>
-                    <el-option
-                        v-for="item in scenarioWeatherList"
-                        :label="item.caption"
-                        :value="item.code"
-                        :key="item.code"
-                    ></el-option>
+                    <el-option v-for="item in scenarioWeatherList" :label="item.caption" :value="item.code"
+                        :key="item.code"></el-option>
                 </el-select>
             </template>
             <template slot="searchItem4">
                 <span class="label">时间</span>
-                <el-time-picker
-                    v-model="searchParams.scenarioTime"
-                    value-format="HH:mm:ss"
-                    placeholder="时间"
-                >
+                <el-time-picker v-model="searchParams.scenarioTime" value-format="HH:mm:ss" placeholder="时间">
                 </el-time-picker>
             </template>
             <template slot="searchBtn1">
@@ -52,22 +34,9 @@
             </template>
         </search-layout>
 
-        <tableList
-            ref="table"
-            style="margin: 0"
-            :columns="columns"
-            :getDataWay="getDataWay"
-            :pagination="pagination"
-            :checkedData="checkedArr"
-            index
-            selection
-        >
-            <el-table-column
-                label="操作"
-                slot="cgInfos"
-                align="center"
-                width="180"
-            >
+        <tableList ref="table" style="margin: 0" :columns="columns" :getDataWay="getDataWay" :pagination="pagination"
+            :checkedData="checkedArr" :singleSelect="true" index selection>
+            <el-table-column label="操作" slot="cgInfos" align="center" width="180">
                 <!-- <template v-slot="scope">
                     <i
                         @click="viewRow(scope.row)"
@@ -79,14 +48,8 @@
             </el-table-column>
         </tableList>
 
-        <el-dialog
-            :title="videoDiaTitle"
-            :visible.sync="dialogVisible"
-            width="690px"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            :before-close="diaClose"
-        >
+        <el-dialog :title="videoDiaTitle" :visible.sync="dialogVisible" width="690px" :close-on-click-modal="false"
+            :close-on-press-escape="false" :before-close="diaClose">
             <div class="videoBox">
                 <video autoplay :src="videoSrc" controls></video>
             </div>
@@ -282,6 +245,7 @@ export default {
 
 <style lang='less' scoped>
 @import "../common/util.less";
+
 .generalizationListPanel {
     .inputBox {
         .label {