inl-ui 0.0.49 → 0.0.50

package/src/pageComponent/views/thingInstance/index.tsx

@@ -768,7 +768,7 @@ const com = defineComponent({
               </div>
             </div>
           </div>
-          <div class="table_wrap flex">
+          <div class="table_wrap flex flex1">
             {!formQuery.thingCode ? (
               // <a-empty
               //   image="/micro-assets/platform-web/empty.png"
@@ -826,6 +826,7 @@ const com = defineComponent({
                                 </a-select>
                                 <a-input
                                   v-model={[formItem.value, "value", ["trim"]]}
+                                  class="searchVal"
                                   allowClear={true}
                                 />
                               </div>
@@ -998,6 +999,7 @@ const com = defineComponent({
                                 </a-select>
                                 <a-input
                                   v-model={[item.value, "value", ["trim"]]}
+                                  class="searchVal"
                                   allowClear={true}
                                 />
                               </div>

package/src/pageComponent/views/thingInstance/less/editThing.less

@@ -45,77 +45,91 @@
   .basic {
     .content {
       margin-bottom: 25px;
-      .grid {
-        display: grid;
-        grid-template-columns: 1fr 1fr 1fr;
-        justify-content: flex-start;
-        align-content: flex-start;
+      // .grid {
+      //   display: grid;
+      //   grid-template-columns: 1fr 1fr 1fr;
+      //   justify-content: flex-start;
+      //   align-content: flex-start;
 
+      //   .element {
+      //     // margin: 8px 0;
+      //     justify-content: flex-end;
+      //     .name {
+      //       line-height: 32px;
+      //       margin-right: 10px;
+      //     }
+      //   }
+      //   &.grid4 {
+      //     grid-template-columns: 1fr 1fr 1fr 1fr;
+      //   }
+      // }
+
+      .contentBody {
+        flex-wrap: wrap;
         .element {
-          // margin: 8px 0;
-          justify-content: flex-end;
+          width: calc(var(--colspan) * 25%);
+          height: 60px;
+          float: left;
           .name {
             line-height: 32px;
             margin-right: 10px;
           }
         }
-        &.grid4 {
-          grid-template-columns: 1fr 1fr 1fr 1fr;
-        }
-      }
-      .pic {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        .tip_pic {
-          word-break: break-all;
-          word-wrap: break-word;
-          color: #fff;
-          margin-top: 10px;
-          font-size: 14px;
-          position: absolute;
-          left: 10px;
-          right: 10px;
-          bottom: 10px;
-          display: none;
-        }
-        .div_pic {
-          width: 240px;
-          word-break: break-all;
-          word-wrap: break-word;
-          position: relative;
-          &:hover .hover_action {
-            display: flex;
-          }
-          &:hover .tip_pic {
-            display: block;
-          }
-          img {
-            width: 240px;
-            height: 240px;
-          }
-          .hover_action {
+
+        .pic {
+          width: 25%;
+          height: 300px;
+          justify-content: center;
+          float: right;
+          .tip_pic {
+            word-break: break-all;
+            word-wrap: break-word;
+            color: #fff;
+            margin-top: 10px;
+            font-size: 14px;
             position: absolute;
-            left: 0;
-            top: 0;
-            width: 240px;
-            height: 240px;
-            background: rgba(#354052, 0.5);
+            left: 10px;
+            right: 10px;
+            bottom: 10px;
             display: none;
-            justify-content: center;
-            align-items: center;
-            transition: all esae 0.2s;
-            .icon {
-              width: 36px;
-              height: 36px;
-              background: rgba(#fff, 0.5);
-              border-radius: 100%;
-              font-size: 20px;
-              color: #fff;
-              line-height: 38px;
-              text-align: center;
-              cursor: pointer;
+          }
+          .div_pic {
+            width: 240px;
+            word-break: break-all;
+            word-wrap: break-word;
+            position: relative;
+            &:hover .hover_action {
+              display: flex;
+            }
+            &:hover .tip_pic {
+              display: block;
+            }
+            img {
+              width: 240px;
+              height: 240px;
+            }
+            .hover_action {
+              position: absolute;
+              left: 0;
+              top: 0;
+              width: 240px;
+              height: 240px;
+              background: rgba(#354052, 0.5);
+              display: none;
+              justify-content: center;
+              align-items: center;
+              transition: all esae 0.2s;
+              .icon {
+                width: 36px;
+                height: 36px;
+                background: rgba(#fff, 0.5);
+                border-radius: 100%;
+                font-size: 20px;
+                color: #fff;
+                line-height: 38px;
+                text-align: center;
+                cursor: pointer;
+              }
             }
           }
         }

package/src/pageComponent/views/thingInstance/less/thingInstance.less

@@ -55,6 +55,16 @@
     .option {
       .searchSelect {
         width: 100px;
+        .ant-select-selector {
+          border-top-right-radius: 0;
+          border-bottom-right-radius: 0;
+          border-right: 0;
+        }
+      }
+
+      .searchVal {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
       }
     }
 

package/src/pageComponent/views/thingModel/component/tabAttr/update.tsx

@@ -222,11 +222,7 @@ export default defineComponent({
                 <a-form-item label="属性编码" name="code">
                   <a-input
                     v-model={[state.formModel.code, "value"]}
-                    disabled={
-                      state.formModel.useStandard ||
-                      (!state.isAdd &&
-                        state.formModel.propertyType === "property")
-                    }
+                    disabled={state.formModel.useStandard || !state.isAdd}
                   />
                 </a-form-item>
                 <a-form-item label="属性名称" name="name">

package/src/pageComponent/views/thingModel/component/tabRelation/update.tsx

@@ -5,6 +5,7 @@ import {
   thingNameList,
   relaTable,
   thingNameListByTable,
+  relaByDic,
 } from "@/api/thingModel";
 import { message } from "ant-design-vue";
 const formItemAll = [
@@ -74,6 +75,7 @@ export default defineComponent({
       aNamethingList: any[];
       zNamethingList: any[];
       relaTable: any[];
+      relaClass: any[];
     }>({
       formModel: {},
       title: "",
@@ -85,6 +87,7 @@ export default defineComponent({
       aNamethingList: [],
       zNamethingList: [],
       relaTable: [],
+      relaClass: [],
     });
     const formItems = computed(() => {
       return formItemAll.filter((col) => {
@@ -137,11 +140,17 @@ export default defineComponent({
         state.relaTable = res.data;
       });
     };
+    const getRelaClass = () => {
+      relaByDic().then((res) => {
+        state.relaClass = res.data;
+      });
+    };
     const open = (isAdd, athingCode, relaType, data = formDefault) => {
       state.title = isAdd ? "新增" : "编辑";
       state.type = relaType;
       state.formModel = { ...state.formModel, ...data, relaType, athingCode };
       getZThingList();
+      getRelaClass();
 
       if (isAdd) {
         if (relaType === "extends") {
@@ -167,10 +176,11 @@ export default defineComponent({
       state.visible = false;
       formRef.value.clearValidate();
       state.formModel = {};
-      state.aNamethingList = []
-      state.zthingList = []
-      state.zNamethingList = []
-      state.relaTable = []
+      state.aNamethingList = [];
+      state.zthingList = [];
+      state.zNamethingList = [];
+      state.relaTable = [];
+      state.relaClass = [];
     };
 
     expose({ open });
@@ -256,6 +266,22 @@ export default defineComponent({
                     onChange={relaRelaTableChange}
                   />
                 </a-form-item>
+              ) : item.key === "relaClass" ? (
+                <a-form-item
+                  label="关系业务类型"
+                  name="relaClass"
+                  rules={[{ required: true, message: "请选择关系表名" }]}
+                >
+                  <a-select
+                    allowClear
+                    show-search
+                    v-model={[state.formModel.relaClass, "value"]}
+                    placeholder="请输入关键字进行选择"
+                    optionFilterProp="name"
+                    fieldNames={{ label: "name", value: "code" }}
+                    options={state.relaClass}
+                  />
+                </a-form-item>
               ) : (
                 <a-form-item
                   label={item.title}

package/src/pageComponent/views/thingModel/index.tsx

@@ -135,7 +135,7 @@ const com = defineComponent({
         });
     };
     const exportFun = async () => {
-      message.info({
+      const hide = message.info({
         duration: 0,
         content: "正在导出，请稍后",
       });
@@ -144,12 +144,13 @@ const com = defineComponent({
         res,
         "物模型数据_" + moment().format("YYYY_MM_DD_HHmm") + ".xls"
       );
+
       setTimeout(() => {
-        message.destroy();
-      }, 666);
+        hide();
+      }, 200);
     };
     const downFun = async () => {
-      message.info({
+      const hide = message.info({
         duration: 0,
         content: "正在下载，请稍后",
       });
@@ -159,20 +160,31 @@ const com = defineComponent({
         "【模板】物模型数据_" + moment().format("YYYY_MM_DD_HHmm") + ".xls"
       );
       setTimeout(() => {
-        message.destroy();
-      }, 666);
+        hide();
+      }, 200);
     };
     const downFile = (res: any, filename: string) => {
-      const blob = new Blob([res], {
-        type: "text/html;charset=UTF-8",
-      });
-      const a = document.createElement("a");
-      a.href = URL.createObjectURL(blob);
-      a.download = filename;
-      a.style.display = "none";
-      document.body.appendChild(a);
-      a.click();
-      a.remove();
+      let reader = new FileReader();
+      reader.readAsText(res, "utf-8");
+      reader.onload = (e) => {
+        try {
+          const result = JSON.parse(reader.result as string);
+          if (result.code && result.code === "M5001") {
+            message.error(result.message);
+          }
+        } catch (error) {
+          const blob = new Blob([res], {
+            type: "text/html;charset=UTF-8",
+          });
+          const a = document.createElement("a");
+          a.href = URL.createObjectURL(blob);
+          a.download = filename;
+          a.style.display = "none";
+          document.body.appendChild(a);
+          a.click();
+          a.remove();
+        }
+      };
     };
     const openModal = () => {
       updateModalRef.value.open(true);

package/src/pageComponent/views/video/assets/styles/video/group.less

@@ -1,7 +1,6 @@
 .group {
   width: 100%;
   height: 100%;
-  padding: 20px;
   box-sizing: border-box;
   background-color: #fff;
   overflow: auto;
@@ -34,11 +33,11 @@
       padding-right: 53px;
       &.border-active {
         font-weight: 500;
-        color: #1e70ff;
+        color: #1d33a2;
         .title-min {
-          border-bottom: 2px solid #1e70ff;
+          border-bottom: 2px solid #1d33a2;
           .name {
-            color: #1e70ff;
+            color: #1d33a2;
           }
         }
       }
@@ -177,3 +176,21 @@
   width: 80%;
   position: relative;
 }
+
+body[data-theme="light"] {
+  .group {
+    .tabs-min {
+      .tab-item {
+        &.border-active {
+          color: #3e7eff;
+          .title-min {
+            border-bottom: 2px solid #3e7eff;
+            .name {
+              color: #3e7eff;
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/src/pageComponent/views/video/assets/styles/video/preview.less

@@ -80,7 +80,6 @@
     background: lightgrey;
     left: 208px;
     top: 200px;
-    padding-top: 6px;
     font-size: 12px;
     z-index: 10;
     cursor: pointer;

package/src/pageComponent/views/video/assets/styles/video/rotation.less

@@ -133,13 +133,6 @@
       margin: 0 10px 10px 0;
     }
   }
-  .center {
-    span {
-      color: #3e7eff;
-      cursor: pointer;
-      margin-right: 10px;
-    }
-  }
 }
 .addPointdialog {
   .videoTree {

package/src/pageComponent/views/video/preview/preview.tsx

@@ -525,7 +525,7 @@ const com = defineComponent({
     return () => (
       <div class="preview flex ">
         <div
-          class={["stretch", hideLeft.value ? "pack" : ""]}
+          class={["stretch flex-center", hideLeft.value ? "pack" : ""]}
           onClick={() => {
             hideLeft.value = !hideLeft.value;
           }}

package/dist/src/pageComponent/views/elcRoom/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("@vue/runtime-core").Plugin;
-export default _default;

package/src/pageComponent/views/elcRoom/index.tsx

@@ -1,106 +0,0 @@
-import { defineComponent, onMounted, reactive, ref } from "vue";
-import utils from "@/utils";
-import { getCabinetRoomList } from "@/api/tupu";
-import elcRoomHt from "@/pageComponent/components/elcRoomHt";
-
-const columns = [
-  {
-    title: "名称",
-    dataIndex: "name",
-    key: "name",
-  },
-  {
-    title: "总回路数",
-    dataIndex: "loopTotal",
-    key: "loopTotal",
-  },
-  {
-    title: "分闸数",
-    dataIndex: "openTotal",
-    key: "openTotal",
-  },
-  {
-    title: "合闸数",
-    dataIndex: "closeTotal",
-    key: "closeTotal",
-  },
-  {
-    title: "断连数",
-    dataIndex: "disconnectionTotal",
-    key: "disconnectionTotal",
-  },
-  // {
-  //   title: "备用数",
-  //   dataIndex: "lockTotal",
-  //   key: "lockTotal",
-  // },
-  {
-    title: "操作",
-    key: "action",
-  },
-];
-const elcRoom = defineComponent({
-  name: "ElcRoom",
-  components: {
-    elcRoomHt,
-  },
-  setup() {
-    const elcRoomList = ref([]);
-    const visible = ref(false);
-    const data = reactive<{
-      roomId: number | null;
-      name: string | null;
-    }>({
-      roomId: null,
-      name: null,
-    });
-    const http = async () => {
-      const res = await getCabinetRoomList();
-      elcRoomList.value = res.data;
-    };
-    onMounted(() => {
-      http();
-    });
-    return () => (
-      <div class="elcRoom">
-        <a-table
-          columns={columns}
-          dataSource={elcRoomList.value}
-          v-slots={{
-            bodyCell: ({ column, record }) => {
-              if (column.key === "action") {
-                return (
-                  <a-button
-                    type="link"
-                    onClick={() => {
-                      data.name = record.name;
-                      data.roomId = record.roomId;
-                      visible.value = true;
-                    }}
-                  >
-                    查看
-                  </a-button>
-                );
-              }
-            },
-          }}
-        ></a-table>
-        <a-modal
-          v-model={[visible.value, "visible"]}
-          onCancel={() => {
-            data.roomId = null;
-            data.name = null;
-          }}
-          width="100%"
-          footer={false}
-          wrap-class-name="elcRoom-full-modal"
-        >
-          {visible.value ? (
-            <elcRoomHt roomId={data.roomId} name={data.name}></elcRoomHt>
-          ) : null}
-        </a-modal>
-      </div>
-    );
-  },
-});
-export default utils.installComponent(elcRoom, "elc-room");