Merge branch 'zh' of http://xny.yj-3d.com:3000/fengsen/4.0 into zh

src/renderer/components/TS/deduction.vue

@@ -35,7 +35,7 @@
           :class="[(TSTYOBJ.clock.status==TSTYOBJ.timeStatus.PLAY&&TSTYOBJ.store.editorMode==TSTYOBJ.editorMode.PLAYING)?'disabledBtn':'','multiple']"
           @click="openMultiple">
         <!--新增25-->
-        倍数×{{ TSTYOBJ.store.multiplier }}
+        倍数11×{{ TSTYOBJ.store.multiplier }}
       </div>
     </div>
     <div class="layoutBoxs">

src/renderer/components/situationEdit/rightMenu.vue

@@ -157,8 +157,14 @@ export default {
       this.$prompt("请输入名称", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
-        // inputErrorMessage: "邮箱格式不正确"
+        inputValidator: (value) => {
+          // 可选：同时限制不能为空
+          if (!value.trim()) {
+            return '输入内容不能为空！';
+          }
+          // 验证通过返回 true（或不返回内容）
+          return true;
+        }
       })
           .then(({value}) => {
             /*  const newChild = { id: id++, label: 'testtest', children: [] };
@@ -167,7 +173,7 @@ export default {
           }
           data.children.push(newChild);
           */
-            console.log(this.$parent);
+            console.log("value",value);
             addDirectory(
                 (res) => {
                   // console.log(res);

src/renderer/components/situationList/components/newSituation.vue

@@ -72,7 +72,7 @@ export default {
   mounted() {},
   methods: {
     submit() {
-      if (this.form.name==""){
+      if (this.form.name=="" ||(this.form.name.trim()=='')){
         this.$message.warning("请输入名称")
         return
       }
@@ -83,6 +83,7 @@ export default {
       this.form.plan_create_time = new  TSTY.Util().timeToStamp(
         this.form.plan_create_time
       );
+      console.log("新疆")
       addPlan(this.form, (res) => {
         res.create_time_format = new  TSTY.Util().parseTime(
           res.create_time,

src/renderer/components/situationList/index.vue

@@ -26,7 +26,7 @@
         />
       </div>
       <div>
-        <span class="label">仿真时间</span>
+        <span class="label">创建时间</span>
         <el-date-picker
           class="datepicker"
           v-model="value2"
@@ -259,11 +259,12 @@ export default {
       let params = JSON.parse(JSON.stringify(this.searchForm));
       params.startTime == 0 && delete params.startTime;
       params.endTime == 0 && delete params.endTime;
-      this.getList(params,()=>{
-        setTimeout(() => {
-          this.searching = false;
-        }, 500);
-      })
+      console.log(params)
+      // this.getList(params,()=>{
+      //   setTimeout(() => {
+      //     this.searching = false;
+      //   }, 500);
+      // })
    /*   planList(params, (res) => {
         // if()
         this.formatTime(res.list);