safecheck-client 3.0.30-50 → 3.0.30-52

package/src/components/pc/Edit.vue

@@ -1,47 +1,123 @@
 <template>
-    <div>
-        <input type="text" v-model="inputText" placeholder="Enter text here">
-        <button @click="handleClick">测试</button>
-        <iframe v-if="showSketchPage" :src="sketchPageSrc" ref="sketchIframe" id="sketchIframe"
-            style="width: 100%; height: 500px;"></iframe>
-    </div>
+  <div>
+    <button @click="handleClick">渲染</button>
+    <button @click="savePaper">保存</button>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 600px;"></iframe>
+  </div>
 </template>
 
 <script>
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import * as util from "../Util"
+
 export default {
-    name: 'App',
-    data() {
-        return {
-            inputText: '',
-            showSketchPage: false,
-            sketchPageSrc: '/sketch'
-        };
+  title: 'App',
+  data() {
+    return {
+      inputText: '',
+      showSketchPage: false,
+      sketchPageSrc: '/sketch',
+      sketchId: '',
+      title: '',
+      paperMessage: ''
+    };
+  },
+  props: {
+    row: {
+      type: Object
+    }
+  },
+  ready() {
+    if (this.row) {
+      try {
+        let hex = Buffer.from(this.row.blob, 'hex').toString('utf8');
+        if (!hex.includes('{')) {
+          this.inputText = Buffer.from(hex, 'hex').toString('utf8');
+        } else {
+          this.inputText = hex;
+        }
+      } catch (e) {
+        this.$showMessage('网络异常请联系管理员')
+      }
+    }
+    this.handleClick()
+  },
+  methods: {
+    handleClick() {
+      this.showSketchPage = true;
+      this.$nextTick(() => {
+        const sketchIframe = document.getElementById('aaaa2');
+
+        window.addEventListener('message', (event) => {
+          if (JSON.parse(event.data.param).gadgets.length > 0) {
+            this.paperMessage = event.data.param;
+          }
+        });
+
+        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+      })
     },
-    methods: {
-        handleClick() {
-            this.showSketchPage = true;
-            //this.sketchPageSrc = `/sketch?data=${encodeURIComponent(this.inputText)}`;
-
-            // 使用 $nextTick 确保 iframe 已经加载到 DOM
-            this.$nextTick(() => {
-                const sketchIframe = document.getElementById('sketchIframe').contentWindow;
-
-                // 监听来自 iframe 的消息
-                window.addEventListener('message', (event) => {
-                    if (event.origin !== window.location.origin) {
-                        return;
-                    }
-                    console.log('Message received from sketch:', event.data);
-                });
-
-                // 发送消息到 iframe
-                sketchIframe.onload = () => {
-                    sketchIframe.postMessage(this.inputText, window.location.origin);
-                };
-            }); // 逻辑空着
+    savePaper() {
+      if (!this.paperMessage) {
+        this.$showMessage('请先点击左上角保存图标')
+        return
+      }
+      let param = JSON.parse(this.paperMessage)
+      if (!param.title) {
+        this.$showMessage('请填写示意图标题')
+        return
+      }
+      param.sketchId = param.sketchId ? param.sketchId : util.generateUUID()
+      let gadgets = param.gadgets
+      if (gadgets.length > 0) {
+        var jsonString = JSON.stringify(param);
+        var reqdata = {
+          blob: Buffer.from(jsonString,'utf8').toString('hex'),
+          orgid: this.$login.f.orgid,
+          orgname: this.$login.f.orgs,
+          title: param.title,
+          sketchId: param.sketchId
         }
+        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
+          if (res.data.code === 200) {
+            this.$showMessage('保存成功')
+          } else {
+            this.$showMessage('保存失败')
+          }
+        })
+      }
     },
+    hexToBytes(hex) {
+      for (var bytes = [], c = 0; c < hex.length; c += 2)
+        bytes.push(parseInt(hex.substring(c, 2), 16));
+      return new Uint8Array(bytes);
+    },
+    decodeHexStringToJSON(hexString) {
+      // 去除前缀 "0x"
+      var cleanHexString = hexString.slice(2);
+
+      // 将十六进制字符串转换为字节数组
+      var byteArray = this.hexToBytes(cleanHexString);
+
+      // 创建 Blob 对象
+      var blob = new Blob([byteArray], {type: 'application/json'});
 
+      // 读取 Blob 为文本
+      return new Promise(function(resolve, reject) {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+          resolve(reader.result);
+        };
+        reader.onerror = function() {
+          reject(reader.error);
+        };
+        reader.readAsText(blob, 'UTF-8');
+      });
+    }
+  },
+  // beforeDestroy() {
+  //   this.savePaper()
+  // }
 }
 </script>
 

package/src/components/pc/PaperEdit.vue

@@ -6,32 +6,37 @@
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">用户分类</label>
-                <input type="text" class="input_search" v-model="model.f_userinfo_code"
-                       style="width: 60%" placeholder="用户分类" condition="f_userinfo_code='{}'">
+                <label class="font_normal_body">用户编号</label>
+                <input type="text" class="input_search" v-model="model.title"
+                       condition="tui.f_userinfo_code like '%{}%'"
+                       style="width: 60%" placeholder="示意图标题" >
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">用气单位</label>
-                <input type="text" class="input_search" v-model="model.f_user_name"
-                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
+                <label class="font_normal_body">示意图标题</label>
+                <input type="text" class="input_search" v-model="model.title"
+                       condition="tcs.title like '%{}%'"
+                       style="width: 60%" placeholder="示意图标题" >
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">示意图</label>
-                <input type="text" class="input_search" v-model="model.f_user_phone"
-                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+                <label class="font_normal_body">示意图id</label>
+                <input type="text" class="input_search" v-model="model.blob_id"
+                       condition="tcs.blob_id like '%{}%'"
+                       style="width: 60%" placeholder="示意图id" >
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">单位编号</label>
-                <input type="text" class="input_search" v-model="model.f_meternumber"
-                       style="width: 60%" placeholder="客户表号" condition="f_meternumber like '%{}%'">
+                <label class="font_normal_body">单位名称</label>
+                <input type="text" class="input_search" v-model="model.gas_point_name"
+                       condition="tcs.gas_point_name like '%{}%'"
+                       style="width: 60%" placeholder="单位名称" >
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
                 <export-excel-safe :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    :choose-col="true"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单"
-                                   template-name='安检计划明细'></export-excel-safe>
-                <button class="button_spacing button_search" @click="$parent.$parent.change()">查询</button>
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="queryPaperEdit"
+                                   template-name='图纸编辑'></export-excel-safe>
+                <button class="button_spacing button_search" @click="$parent.$parent.search()">查询</button>
+                <button class="button_spacing button_search" @click="$parent.$parent.change()">新建</button>
               </div>
             </div>
           </div>
@@ -40,61 +45,58 @@
           <template partial='head'>
             <tr>
               <th>
-                <nobr>是否有示意图</nobr>
+                <nobr>序号</nobr>
               </th>
               <th>
-                <nobr>单位编号</nobr>
+                <nobr>分公司</nobr>
               </th>
               <th>
-                <nobr>单位地址</nobr>
+                <nobr>单位编号</nobr>
               </th>
               <th>
                 <nobr>单位名称</nobr>
               </th>
               <th>
-                <nobr>联系人</nobr>
-              </th>
-              <th>
-                <nobr>分公司</nobr>
+                <nobr>示意图标题</nobr>
               </th>
               <th>
                 <nobr>示意图id</nobr>
               </th>
+
               <th>
                 <nobr>操作</nobr>
               </th>
             </tr>
           </template>
           <template partial='body'>
-
-            <td style="text-align: center">{{ row.uptodate }}</td>
+            <td style="text-align: center">{{ $index+1 }}</td>
+            <td style="text-align: center">{{ row.gas_point_name }}</td>
             <td style="text-align: center">{{ row.gas_point_id }}</td>
             <td style="text-align: center">{{ row.gas_point_name }}</td>
             <td style="text-align: center">{{ row.title }}</td>
-            <td style="text-align: center">{{ row.title12 }}</td>
-            <td style="text-align: center">{{ row.title1 }}</td>
-            <td style="text-align: center">{{ row.blod_id }}</td>
+            <td style="text-align: center">{{ row.blob_id }}</td>
+
             <td style="text-align: center">
-              <button class="button_spacing button_search-1" @click='change(row)'>查看</button>
+              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
             </td>
           </template>
         </data-grid>
       </criteria-paged>
     </div>
+    <modal :show.sync="showModal" v-ref:modal backdrop="false" :width="1200">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          打开图纸编辑
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <edit :row="rowData" v-if="showModal"></edit>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
   </div>
-  <modal :show.sync="showModal" v-ref:modal backdrop="false" :width="1200">
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        打开图纸编辑
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <edit></edit>
-    </div>
-    <div slot="modal-footer" class="modal-footer" style="text-align: center">
-      <button class="button_search" @click="cancel">取消</button>
-    </div>
-  </modal>
 </template>
 
 <script>
@@ -110,34 +112,35 @@ export default {
     return {
       searchData: {
         condition: "1=1",
-        f_plan_id: "",
-        f_approved: '',
-        f_entry_status: '',
-        f_no_checkplan: '',
-        f_filialeid: `('${this.$login.f.orgid}')`
       },
       model: new PagedList('rs/sql/queryPaperEdit', 20, {}),
       excelHeaders: {
-        'uptodate': '是否有示意图',
+        'id': '序号',
+        'orgname': '分公司',
         'gas_point_id': '单位编号',
-        'gas_point_name': '单位地址',
-        'title': '单位名称',
-        'title12': '联系人',
-        'title1': '分公司',
-        'blod_id': '示意图id',
+        'gas_point_name': '单位名称',
+        'title': '示意图标题',
+        'blob_id': '示意图id',
       },
       showModal: false,
+      rowData:''
     }
   },
   methods: {
-    change() {
+    change(row) {
+      this.rowData = row
       this.showModal = true
+      console.log(this)
     },
     search() {
       this.$refs.paged.$refs.criteria.search()
     },
     cancel() {
       this.showModal = false
+    },
+    selfSearch(args) {
+      this.searchData.condition = args.condition
+      this.model.search(args.condition, args.model, args.condValue)
     }
   },