1.中央空调-系统控制添加if条件给子组件

2.修改定时任务、表单构建样式
3.空调风柜系统温度input不可修改

src/assets/styles/element-ui.scss

@@ -1362,7 +1362,8 @@
   border: 1px solid #ff4949;
   background: #ff4949;
 }
-.el-table__body tr.current-row > td.el-table__cell, .el-table__body tr.selection-row > td.el-table__cell{
+.el-table__body tr.current-row > td.el-table__cell,
+.el-table__body tr.selection-row > td.el-table__cell {
   background-color: rgba(0, 71, 125, 0.4) !important;
 }
 .el-loading-mask {

src/components/Crontab/index.vue

@@ -104,21 +104,9 @@
       <CrontabResult :ex="crontabValueString"></CrontabResult>
 
       <div class="pop_btn">
-        <div class="primary-btn">
+        <div class="primary-btn"><el-button size="small" type="primary" @click="submitFill">确定</el-button></div>
-          <el-button size="small" type="primary" @click="submitFill"
+        <div class="warning-btn"><el-button size="small" type="warning" @click="clearCron">重置</el-button></div>
-            >确定</el-button
+        <div class="cancel-btn"><el-button size="small" type="cancel" @click="hidePopup">取消</el-button></div>
-          >
-        </div>
-        <div class="warning-btn">
-          <el-button size="small" type="warning" @click="clearCron"
-            >重置</el-button
-          >
-        </div>
-        <div class="cancel-btn">
-          <el-button size="small" type="cancel" @click="hidePopup"
-            >取消</el-button
-          >
-        </div>
       </div>
     </div>
   </div>

src/views/aircAndWindc/awSysMonitor/index.vue

@@ -125,7 +125,6 @@
               @keyup.enter.native="handleEnter(backAirObj, $event, '℃')"
               @input="handleInput(backAirObj)"
               @blur="handleBlur()"
-              disabled
               v-model="backAirObj.collectValue"
               size="mini"
             >
@@ -138,7 +137,6 @@
               @keyup.enter.native="handleEnter(airSupplyObj, $event, '℃')"
               @input="handleInput(airSupplyObj)"
               @blur="handleBlur()"
-              disabled
               v-model="airSupplyObj.collectValue"
               size="mini"
             >
@@ -201,7 +199,6 @@
                 @keyup.enter.native="handleEnter(waterSupplyObj, $event, '℃')"
                 @input="handleInput(waterSupplyObj)"
                 @blur="handleBlur()"
-                disabled
                 v-model="waterSupplyObj.collectValue"
                 size="mini"
               >
@@ -218,7 +215,6 @@
                 @keyup.enter.native="handleEnter(backwaterObj, $event, '℃')"
                 @input="handleInput(backwaterObj)"
                 @blur="handleBlur()"
-                disabled
                 v-model="backwaterObj.collectValue"
                 size="mini"
               >

src/views/monitor/job/index.vue

@@ -285,7 +285,7 @@
           <el-col :span="24">
             <el-form-item label="cron表达式" prop="cronExpression">
               <el-input
-                style="width: 76%"
+              style="width: 76%;"
                 v-model="form.cronExpression"
                 placeholder="请输入cron执行表达式"
               >
@@ -428,7 +428,7 @@ import Crontab from "@/components/Crontab";
 
 export default {
   components: { Crontab },
-  name: "Job",
+  // name: "Job",
   dicts: ["sys_job_group", "sys_job_status"],
   data() {
     return {

src/views/tool/build/index.vue

@@ -2,7 +2,9 @@
   <div class="container">
     <div class="left-board">
       <div class="logo-wrapper">
-        <div class="logo"><img :src="logo" alt="logo" /> Form Generator</div>
+        <div class="logo">
+          <img :src="logo" alt="logo"> Form Generator
+        </div>
       </div>
       <el-scrollbar class="left-scrollbar">
         <div class="components-list">
@@ -19,9 +21,7 @@
             @end="onEnd"
           >
             <div
-              v-for="(element, index) in inputComponents"
+              v-for="(element, index) in inputComponents" :key="index" class="components-item"
-              :key="index"
-              class="components-item"
               @click="addComponent(element)"
             >
               <div class="components-body">
@@ -58,18 +58,12 @@
             <svg-icon icon-class="component" /> 布局型组件
           </div>
           <draggable
-            class="components-draggable"
+            class="components-draggable" :list="layoutComponents"
-            :list="layoutComponents"
+            :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
+            draggable=".components-item" :sort="false" @end="onEnd"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @end="onEnd"
           >
             <div
-              v-for="(element, index) in layoutComponents"
+              v-for="(element, index) in layoutComponents" :key="index" class="components-item"
-              :key="index"
-              class="components-item"
               @click="addComponent(element)"
             >
               <div class="components-body">
@@ -87,20 +81,10 @@
         <el-button icon="el-icon-download" type="text" @click="download">
           导出vue文件
         </el-button>
-        <el-button
+        <el-button class="copy-btn-main" icon="el-icon-document-copy" type="text" @click="copy">
-          class="copy-btn-main"
-          icon="el-icon-document-copy"
-          type="text"
-          @click="copy"
-        >
           复制代码
         </el-button>
-        <el-button
+        <el-button class="delete-btn" icon="el-icon-delete" type="text" @click="empty">
-          class="delete-btn"
-          icon="el-icon-delete"
-          type="text"
-          @click="empty"
-        >
           清空
         </el-button>
       </div>
@@ -112,12 +96,7 @@
             :disabled="formConf.disabled"
             :label-width="formConf.labelWidth + 'px'"
           >
-            <draggable
+            <draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
-              class="drawing-board"
-              :list="drawingList"
-              :animation="340"
-              group="componentsGroup"
-            >
               <draggable-item
                 v-for="(element, index) in drawingList"
                 :key="element.renderKey"
@@ -152,38 +131,28 @@
       :show-file-name="showFileName"
       @confirm="generate"
     />
-    <input id="copyNode" type="hidden" />
+    <input id="copyNode" type="hidden">
   </div>
 </template>
 
 <script>
-import draggable from "vuedraggable";
+import draggable from 'vuedraggable'
-import beautifier from "js-beautify";
+import beautifier from 'js-beautify'
-import ClipboardJS from "clipboard";
+import ClipboardJS from 'clipboard'
-import render from "@/utils/generator/render";
+import render from '@/utils/generator/render'
-import RightPanel from "./RightPanel";
+import RightPanel from './RightPanel'
-import {
+import { inputComponents, selectComponents, layoutComponents, formConf } from '@/utils/generator/config'
-  inputComponents,
+import { beautifierConf, titleCase } from '@/utils/index'
-  selectComponents,
+import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
-  layoutComponents,
+import { makeUpJs } from '@/utils/generator/js'
-  formConf,
+import { makeUpCss } from '@/utils/generator/css'
-} from "@/utils/generator/config";
+import drawingDefault from '@/utils/generator/drawingDefault'
-import { beautifierConf, titleCase } from "@/utils/index";
+import logo from '@/assets/logo/logo.png'
-import {
+import CodeTypeDialog from './CodeTypeDialog'
-  makeUpHtml,
+import DraggableItem from './DraggableItem'
-  vueTemplate,
-  vueScript,
-  cssStyle,
-} from "@/utils/generator/html";
-import { makeUpJs } from "@/utils/generator/js";
-import { makeUpCss } from "@/utils/generator/css";
-import drawingDefault from "@/utils/generator/drawingDefault";
-import logo from "@/assets/logo/logo.png";
-import CodeTypeDialog from "./CodeTypeDialog";
-import DraggableItem from "./DraggableItem";
 
-let oldActiveId;
+let oldActiveId
-let tempActiveData;
+let tempActiveData
 
 export default {
   components: {
@@ -191,7 +160,7 @@ export default {
     render,
     RightPanel,
     CodeTypeDialog,
-    DraggableItem,
+    DraggableItem
   },
   data() {
     return {
@@ -210,204 +179,198 @@ export default {
       dialogVisible: false,
       generateConf: null,
       showFileName: false,
-      activeData: drawingDefault[0],
+      activeData: drawingDefault[0]
-    };
+    }
   },
   created() {
     // 防止 firefox 下 拖拽 会新打卡一个选项卡
-    document.body.ondrop = (event) => {
+    document.body.ondrop = event => {
-      event.preventDefault();
+      event.preventDefault()
-      event.stopPropagation();
+      event.stopPropagation()
-    };
+    }
   },
   watch: {
     // eslint-disable-next-line func-names
-    "activeData.label": function (val, oldVal) {
+    'activeData.label': function (val, oldVal) {
       if (
-        this.activeData.placeholder === undefined ||
+        this.activeData.placeholder === undefined
-        !this.activeData.tag ||
+        || !this.activeData.tag
-        oldActiveId !== this.activeId
+        || oldActiveId !== this.activeId
       ) {
-        return;
+        return
       }
-      this.activeData.placeholder =
+      this.activeData.placeholder = this.activeData.placeholder.replace(oldVal, '') + val
-        this.activeData.placeholder.replace(oldVal, "") + val;
     },
     activeId: {
       handler(val) {
-        oldActiveId = val;
+        oldActiveId = val
-      },
-      immediate: true,
       },
+      immediate: true
+    }
   },
   mounted() {
-    const clipboard = new ClipboardJS("#copyNode", {
+    const clipboard = new ClipboardJS('#copyNode', {
-      text: (trigger) => {
+      text: trigger => {
-        const codeStr = this.generateCode();
+        const codeStr = this.generateCode()
         this.$notify({
-          title: "成功",
+          title: '成功',
-          message: "代码已复制到剪切板，可粘贴。",
+          message: '代码已复制到剪切板，可粘贴。',
-          type: "success",
+          type: 'success'
-        });
+        })
-        return codeStr;
+        return codeStr
-      },
+      }
-    });
+    })
-    clipboard.on("error", (e) => {
+    clipboard.on('error', e => {
-      this.$message.error("代码复制失败");
+      this.$message.error('代码复制失败')
-    });
+    })
   },
   methods: {
     activeFormItem(element) {
-      this.activeData = element;
+      this.activeData = element
-      this.activeId = element.formId;
+      this.activeId = element.formId
     },
     onEnd(obj, a) {
       if (obj.from !== obj.to) {
-        this.activeData = tempActiveData;
+        this.activeData = tempActiveData
-        this.activeId = this.idGlobal;
+        this.activeId = this.idGlobal
       }
     },
     addComponent(item) {
-      const clone = this.cloneComponent(item);
+      const clone = this.cloneComponent(item)
-      this.drawingList.push(clone);
+      this.drawingList.push(clone)
-      this.activeFormItem(clone);
+      this.activeFormItem(clone)
     },
     cloneComponent(origin) {
-      const clone = JSON.parse(JSON.stringify(origin));
+      const clone = JSON.parse(JSON.stringify(origin))
-      clone.formId = ++this.idGlobal;
+      clone.formId = ++this.idGlobal
-      clone.span = formConf.span;
+      clone.span = formConf.span
-      clone.renderKey = +new Date(); // 改变renderKey后可以实现强制更新组件
+      clone.renderKey = +new Date() // 改变renderKey后可以实现强制更新组件
-      if (!clone.layout) clone.layout = "colFormItem";
+      if (!clone.layout) clone.layout = 'colFormItem'
-      if (clone.layout === "colFormItem") {
+      if (clone.layout === 'colFormItem') {
-        clone.vModel = `field${this.idGlobal}`;
+        clone.vModel = `field${this.idGlobal}`
-        clone.placeholder !== undefined && (clone.placeholder += clone.label);
+        clone.placeholder !== undefined && (clone.placeholder += clone.label)
-        tempActiveData = clone;
+        tempActiveData = clone
-      } else if (clone.layout === "rowFormItem") {
+      } else if (clone.layout === 'rowFormItem') {
-        delete clone.label;
+        delete clone.label
-        clone.componentName = `row${this.idGlobal}`;
+        clone.componentName = `row${this.idGlobal}`
-        clone.gutter = this.formConf.gutter;
+        clone.gutter = this.formConf.gutter
-        tempActiveData = clone;
+        tempActiveData = clone
-      }
+      }
-      return tempActiveData;
+      return tempActiveData
     },
     AssembleFormData() {
       this.formData = {
         fields: JSON.parse(JSON.stringify(this.drawingList)),
-        ...this.formConf,
+        ...this.formConf
-      };
+      }
     },
     generate(data) {
-      const func = this[`exec${titleCase(this.operationType)}`];
+      const func = this[`exec${titleCase(this.operationType)}`]
-      this.generateConf = data;
+      this.generateConf = data
-      func && func(data);
+      func && func(data)
     },
     execRun(data) {
-      this.AssembleFormData();
+      this.AssembleFormData()
-      this.drawerVisible = true;
+      this.drawerVisible = true
     },
     execDownload(data) {
-      const codeStr = this.generateCode();
+      const codeStr = this.generateCode()
-      const blob = new Blob([codeStr], { type: "text/plain;charset=utf-8" });
+      const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
-      this.$download.saveAs(blob, data.fileName);
+      this.$download.saveAs(blob, data.fileName)
     },
     execCopy(data) {
-      document.getElementById("copyNode").click();
+      document.getElementById('copyNode').click()
     },
     empty() {
-      this.$confirm("确定要清空所有组件吗？", "提示", { type: "warning" }).then(
+      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
         () => {
-          this.drawingList = [];
+          this.drawingList = []
         }
-      );
+      )
     },
     drawingItemCopy(item, parent) {
-      let clone = JSON.parse(JSON.stringify(item));
+      let clone = JSON.parse(JSON.stringify(item))
-      clone = this.createIdAndKey(clone);
+      clone = this.createIdAndKey(clone)
-      parent.push(clone);
+      parent.push(clone)
-      this.activeFormItem(clone);
+      this.activeFormItem(clone)
     },
     createIdAndKey(item) {
-      item.formId = ++this.idGlobal;
+      item.formId = ++this.idGlobal
-      item.renderKey = +new Date();
+      item.renderKey = +new Date()
-      if (item.layout === "colFormItem") {
+      if (item.layout === 'colFormItem') {
-        item.vModel = `field${this.idGlobal}`;
+        item.vModel = `field${this.idGlobal}`
-      } else if (item.layout === "rowFormItem") {
+      } else if (item.layout === 'rowFormItem') {
-        item.componentName = `row${this.idGlobal}`;
+        item.componentName = `row${this.idGlobal}`
       }
       if (Array.isArray(item.children)) {
-        item.children = item.children.map((childItem) =>
+        item.children = item.children.map(childItem => this.createIdAndKey(childItem))
-          this.createIdAndKey(childItem)
-        );
       }
-      return item;
+      return item
     },
     drawingItemDelete(index, parent) {
-      parent.splice(index, 1);
+      parent.splice(index, 1)
       this.$nextTick(() => {
-        const len = this.drawingList.length;
+        const len = this.drawingList.length
         if (len) {
-          this.activeFormItem(this.drawingList[len - 1]);
+          this.activeFormItem(this.drawingList[len - 1])
         }
-      });
+      })
     },
     generateCode() {
-      const { type } = this.generateConf;
+      const { type } = this.generateConf
-      this.AssembleFormData();
+      this.AssembleFormData()
-      const script = vueScript(makeUpJs(this.formData, type));
+      const script = vueScript(makeUpJs(this.formData, type))
-      const html = vueTemplate(makeUpHtml(this.formData, type));
+      const html = vueTemplate(makeUpHtml(this.formData, type))
-      const css = cssStyle(makeUpCss(this.formData));
+      const css = cssStyle(makeUpCss(this.formData))
-      return beautifier.html(html + script + css, beautifierConf.html);
+      return beautifier.html(html + script + css, beautifierConf.html)
     },
     download() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
-      this.showFileName = true;
+      this.showFileName = true
-      this.operationType = "download";
+      this.operationType = 'download'
     },
     run() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
-      this.showFileName = false;
+      this.showFileName = false
-      this.operationType = "run";
+      this.operationType = 'run'
     },
     copy() {
-      this.dialogVisible = true;
+      this.dialogVisible = true
-      this.showFileName = false;
+      this.showFileName = false
-      this.operationType = "copy";
+      this.operationType = 'copy'
     },
     tagChange(newTag) {
-      newTag = this.cloneComponent(newTag);
+      newTag = this.cloneComponent(newTag)
-      newTag.vModel = this.activeData.vModel;
+      newTag.vModel = this.activeData.vModel
-      newTag.formId = this.activeId;
+      newTag.formId = this.activeId
-      newTag.span = this.activeData.span;
+      newTag.span = this.activeData.span
-      delete this.activeData.tag;
+      delete this.activeData.tag
-      delete this.activeData.tagIcon;
+      delete this.activeData.tagIcon
-      delete this.activeData.document;
+      delete this.activeData.document
-      Object.keys(newTag).forEach((key) => {
+      Object.keys(newTag).forEach(key => {
-        if (
+        if (this.activeData[key] !== undefined
-          this.activeData[key] !== undefined &&
+          && typeof this.activeData[key] === typeof newTag[key]) {
-          typeof this.activeData[key] === typeof newTag[key]
+          newTag[key] = this.activeData[key]
-        ) {
+        }
-          newTag[key] = this.activeData[key];
+      })
-        }
+      this.activeData = newTag
-      });
+      this.updateDrawingList(newTag, this.drawingList)
-      this.activeData = newTag;
-      this.updateDrawingList(newTag, this.drawingList);
     },
     updateDrawingList(newTag, list) {
-      const index = list.findIndex((item) => item.formId === this.activeId);
+      const index = list.findIndex(item => item.formId === this.activeId)
       if (index > -1) {
-        list.splice(index, 1, newTag);
+        list.splice(index, 1, newTag)
       } else {
-        list.forEach((item) => {
+        list.forEach(item => {
-          if (Array.isArray(item.children))
+          if (Array.isArray(item.children)) this.updateDrawingList(newTag, item.children)
-            this.updateDrawingList(newTag, item.children);
+        })
-        });
+      }
+    }
+  }
 }
-    },
-  },
-};
 </script>
 
-<style lang="scss">
+<style lang='scss'>
 .editor-tabs{
   background: #121315;
   .el-tabs__header{
@@ -483,7 +446,7 @@ export default {
     cursor: pointer;
     font-size: 12px;
     &:hover{
-      background: rgba(210, 23, 23, 0.5);
+      background: rgba(210, 23, 23, 0.5)
     }
   }
   & + .reg-item{
@@ -512,7 +475,7 @@ export default {
     margin-left: 6px;
   }
   .el-icon-plus{
-    color: #409eff;
+    color: #409EFF;
   }
   .el-icon-delete{
     color: #157a0c;
@@ -532,7 +495,7 @@ export default {
 }
 
 $selectedColor: #f6f7ff;
-$lighterBlue: #409eff;
+$lighterBlue: #409EFF;
 
 .container {
   position: relative;
@@ -599,7 +562,7 @@ $lighterBlue: #409eff;
   height: calc(100vh - 42px);
   overflow: hidden;
   border-left: 1px solid #0e5191;
-  border-left: 1px solid #0e5191;
+  border-right: 1px solid #0e5191 ;
   box-sizing: border-box;
 }
 .center-board {
@@ -623,12 +586,12 @@ $lighterBlue: #409eff;
   height: 42px;
   text-align: right;
   padding: 0 15px;
-  box-sizing: border-box;
+  box-sizing: border-box;;
   border: 1px solid  #0e5191 ;
   border-top: none;
   border-left: none;
   .delete-btn{
-    color: #f56c6c;
+    color: #F56C6C;
   }
 }
 .logo-wrapper{
@@ -703,8 +666,7 @@ $lighterBlue: #409eff;
       background: #4b6e91;
       border-radius: 6px;
     }
-    & > .drawing-item-copy,
+    & > .drawing-item-copy, & > .drawing-item-delete{
-    & > .drawing-item-delete {
       display: initial;
     }
     & > .component-name{
@@ -758,20 +720,17 @@ $lighterBlue: #409eff;
     padding: 0 6px;
   }
 }
-.drawing-item,
+.drawing-item, .drawing-row-item{
-.drawing-row-item {
   &:hover {
     & > .el-form-item{
       background: $selectedColor;
       border-radius: 6px;
     }
-    & > .drawing-item-copy,
+    & > .drawing-item-copy, & > .drawing-item-delete{
-    & > .drawing-item-delete {
       display: initial;
     }
   }
-  & > .drawing-item-copy,
+  & > .drawing-item-copy, & > .drawing-item-delete{
-  & > .drawing-item-delete {
     display: none;
     position: absolute;
     top: -10px;
@@ -797,11 +756,11 @@ $lighterBlue: #409eff;
   }
   & > .drawing-item-delete{
     right: 24px;
-    border-color: #f56c6c;
+    border-color: #F56C6C;
-    color: #f56c6c;
+    color: #F56C6C;
     background: #fff;
     &:hover{
-      background: #f56c6c;
+      background: #F56C6C;
       color: #fff;
     }
   }