safecheck-client 3.0.30-41 → 3.0.30-43

package/src/components/paper/PlanChooser.vue

@@ -82,11 +82,12 @@
       source: `root.getResourceById($${self.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
       userid: self.$login.f.id
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        debugger
       self.checkers = []
+      let arr = []
       //tag
       res.data.forEach((resRow) => {
-        if( resRow.state == '在职'){
+        if(!arr.includes(resRow.name) &&  resRow.state == '在职'){
+          arr.push(resRow.name)
           self.checkers.push({label:resRow.name,value:resRow.id})
         }
       })

package/src/components/pc/Edit.vue

@@ -1,47 +1,81 @@
 <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>
+    <input v-ref:sketchIframe1 type="text" placeholder="Enter text here">
+    <button @click="handleClick">测试</button>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 600px;"></iframe>
+  </div>
 </template>
 
 <script>
-export default {
-    name: 'App',
-    data() {
-        return {
-            inputText: '',
-            showSketchPage: false,
-            sketchPageSrc: '/sketch'
-        };
-    },
-    methods: {
-        handleClick() {
-            this.showSketchPage = true;
-            //this.sketchPageSrc = `/sketch?data=${encodeURIComponent(this.inputText)}`;
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
-            // 使用 $nextTick 确保 iframe 已经加载到 DOM
-            this.$nextTick(() => {
-                const sketchIframe = document.getElementById('sketchIframe').contentWindow;
+export default {
+  title: 'App',
+  data() {
+    return {
+      inputText: '',
+      showSketchPage: false,
+      sketchPageSrc: '/sketch',
+      sketchId:'',
+      title:''
+    };
+  },
+  props: {
+    row: {
+      type: Object
+    }
+  },
+  ready() {
+    var pureHexString = '0x7B2267616467657473223A5B7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A2231222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3534362C2278223A3335342C2279223A3132377D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A36392C226964223A2232222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3839352C2279223A3132397D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A2233222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3130302C2278223A3839382C2279223A3139327D2C7B22616C696173223A22E7A9BFE5A299E6A087E7A4BA222C22636C617373223A22446576696365222C2264223A302C2264657669636554797065223A22E794A8E6B094E8AEBEE5A487222C226469736372696D696E61746F72223A36312C2265223A302C22657874223A22222C2268223A33322C226964223A2234222C226C6162656C223A7B2274223A22E7A9BFE5A299E6A087E7A4BA222C2278223A332C2279223A33327D2C2270223A302C2273223A302C22746167223A22222C2277223A33322C2278223A3934342C2279223A3137387D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A39322C226964223A2235222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3335362C2279223A3132397D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A2236222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3231362C2278223A3335382C2279223A3231357D2C7B226168223A32302C22616C696173223A22E99880E997A8222C226177223A33302C22636C617373223A2256616C7665222C2264223A312C2264657669636554797065223A22E99880E997A8222C2265223A302C22657874223A22222C2268223A33352C226964223A2237222C226C6162656C223A7B2274223A22444E3830E79083E99880222C2278223A332C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3339302C2279223A3139367D2C7B22616C696173223A22E8BF87E6BBA4E599A8222C22636C617373223A22446576696365222C2264223A302C2264657669636554797065223A22E8BF87E6BBA4E599A8222C226469736372696D696E61746F72223A31302C2265223A302C22657874223A22222C2268223A33322C226964223A2238222C226C6162656C223A7B2274223A22E8BF87E6BBA4E599A8222C2278223A332C2279223A33327D2C2270223A302C2273223A302C22746167223A22222C2277223A33322C2278223A3436362C2279223A3230317D2C7B22616C696173223A22E58887E696ADE99880222C22636C617373223A22446576696365222C2264223A302C2264657669636554797065223A22E58887E696ADE99880222C226469736372696D696E61746F72223A31322C2265223A302C22657874223A22222C2268223A33322C226964223A2239222C226C6162656C223A7B2274223A22E58887E696ADE99880222C2278223A332C2279223A33327D2C2270223A302C2273223A302C22746167223A22222C2277223A34312C2278223A3532382C2279223A3230337D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A33312C226964223A223130222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3537352C2279223A3139307D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A223131222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A33322C2278223A3537362C2279223A3138357D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A33372C226964223A223132222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3631322C2279223A3138347D2C7B226168223A32302C22616C696173223A22E78783E6B094E8A1A8222C226173736F636961746564223A747275652C226177223A33302C22636172644E6F223A7B2274223A22E58DA1E58FB7EFBC9A31313731323033313638222C2278223A332C2279223A33327D2C22636C617373223A224D65746572222C2264223A302C2264657669636554797065223A22E78783E6B094E8A1A8222C2265223A302C22657874223A22222C2268223A33352C226964223A223133222C226C6162656C223A7B2278223A302C2279223A32307D2C226D6574657242616C616E6365223A7B2274223A22E4BD99E9A29DEFBC9AE697A0222C2278223A332C2279223A34347D2C226D657465724761736E756D73223A7B2274223A22E680BBE8B4ADE6B094E9878FEFBC9A31303131222C2278223A332C2279223A35367D2C226D657465724964223A22333532353632222C226D657465724E6F223A7B2274223A22E8A1A8E58FB7EFBC9A3131313430323934222C2278223A332C2279223A32307D2C226D65746572546F74616C223A7B2274223A22E680BBE8B4ADE98791E9A29DEFBC9AE697A0222C2278223A332C2279223A35367D2C226D6574657254797065223A7B2274223A22E8A1A8E59E8BEFBC9AE98791E58DA1E6B091E794A8222C2278223A332C2279223A34347D2C2270223A302C2273223A302C22746167223A22222C2274797065223A2273637265656E4D65746572222C2277223A33352C2278223A3631392C2279223A3231377D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A223134222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3130302C2278223A3635362C2279223A3232347D2C7B226168223A32302C22616C696173223A22E99880E997A8222C226177223A33302C22636C617373223A2256616C7665222C2264223A312C2264657669636554797065223A22E99880E997A8222C2265223A302C22657874223A22222C2268223A33352C226964223A223135222C226C6162656C223A7B2274223A22444E3830E79083E99880222C2278223A2D362C2279223A33367D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3730302C2279223A3230357D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A3130302C226964223A223136222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3735392C2279223A3232347D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A223137222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3430352C2278223A3336332C2279223A3332367D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A35312C226964223A223138222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3336312C2279223A3332347D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A22446961676F6E616C222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A3134332C226964223A223231222C226C6162656C223A7B2274223A22222C2278223A302C2279223A37312E357D2C2270223A302C2273223A302C22746167223A22222C2277223A3134362C2278223A3232352C2279223A3337357D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A223232222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3335322C2278223A3232352C2279223A3531327D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A22446961676F6E616C222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A37302C226964223A223233222C226C6162656C223A7B2274223A22222C2278223A302C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A37302C2278223A3238382C2279223A3531367D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A22446961676F6E616C222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A37302C226964223A223234222C226C6162656C223A7B2274223A22222C2278223A302C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A37302C2278223A3339342C2279223A3532327D2C7B226168223A32302C22616C696173223A22E99880E997A8222C226177223A33302C22636C617373223A2256616C7665222C2264223A312C2264657669636554797065223A22E99880E997A8222C2265223A302C22657874223A22222C2268223A33352C226964223A223235222C226C6162656C223A7B2274223A22444E3135E79083E99880222C2278223A332C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3330312C2279223A3533327D2C7B226168223A32302C22616C696173223A22E99880E997A8222C226177223A33302C22636C617373223A2256616C7665222C2264223A302C2264657669636554797065223A22E99880E997A8222C2265223A302C22657874223A22222C2268223A33352C226964223A223236222C226C6162656C223A7B2274223A22444E3135E79083E99880222C2278223A31312C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3430372C2279223A3533337D2C7B22616C696173223A22E99485E78289222C22636C617373223A22446576696365222C2264223A302C2264657669636554797065223A22E794A8E6B094E8AEBEE5A487222C226469736372696D696E61746F72223A31362C2265223A302C22657874223A22222C2268223A35352C226964223A223237222C226C6162656C223A7B2274223A22E6A8A1E59D97E78289222C2278223A2D32352C2279223A32367D2C2270223A302C2273223A302C22746167223A22222C2277223A35322C2278223A3233372C2279223A3534387D2C7B22616C696173223A22E99485E78289222C22636C617373223A22446576696365222C2264223A302C2264657669636554797065223A22E794A8E6B094E8AEBEE5A487222C226469736372696D696E61746F72223A31362C2265223A302C22657874223A22222C2268223A34392C226964223A223238222C226C6162656C223A7B2274223A22E6A8A1E59D97E78289222C2278223A32342C2279223A35337D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3336362C2279223A3535357D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A33352C226964223A223239222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3532382C2279223A3437357D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A372C226964223A223330222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A3230312C2278223A3333322C2279223A3437337D2C7B226168223A32302C22616C696173223A22E99880E997A8222C226177223A33302C22636C617373223A2256616C7665222C2264223A302C2264657669636554797065223A22E99880E997A8222C2265223A302C22657874223A22222C2268223A33352C226964223A223331222C226C6162656C223A7B2274223A22444E3235E79083E99880222C2278223A332C2279223A33357D2C2270223A302C2273223A302C22746167223A22222C2277223A33352C2278223A3435332C2279223A3435367D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A22446961676F6E616C222C2264223A312C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A36352C226964223A223332222C226C6162656C223A7B2274223A22222C2278223A302C2279223A33322E357D2C2270223A302C2273223A302C22746167223A22222C2277223A35312C2278223A3333342C2279223A3431347D2C7B22616C696173223A22E7AEA1E98193222C22636C617373223A2250697065222C2264223A302C2264657669636554797065223A22E7AEA1E98193222C2265223A302C22657874223A22222C2268223A36362C226964223A223334222C226C6162656C223A7B2274223A22222C2278223A31352C2279223A307D2C2270223A302C2273223A302C22736F6674223A302C2274223A31302C22746167223A22222C227472756E6B223A66616C73652C2277223A372C2278223A3338302C2279223A3335317D5D2C2267726F757073223A5B5D2C2268223A3636332C226964223A223334222C22706964223A6E756C6C2C22736B657463684964223A223430323865343438363234643831636230313632613963333137386530306533222C227469746C65223A22E5A5A5E69E97E59BBDE99985E997A8E5BA97222C2277223A313138302C2278223A302C2279223A307D'
+    this.inputText = Buffer.from(pureHexString.substring(2), 'hex').toString()
+    this.handleClick()
+  },
+  methods: {
+    handleClick() {
+      this.showSketchPage = true;
+      //this.sketchPageSrc = `/sketch?data=${encodeURIComponent(this.inputText)}`;
+      // 使用 $nextTick 确保 iframe 已经加载到 DOM
+      this.$nextTick(() => {
+        const sketchIframe = document.getElementById('aaaa2');
 
-                // 监听来自 iframe 的消息
-                window.addEventListener('message', (event) => {
-                    if (event.origin !== window.location.origin) {
-                        return;
-                    }
-                    console.log('Message received from sketch:', event.data);
-                });
+        window.addEventListener('message', (event) => {
+          console.log('Message received from sketch:', event.data);
+          let data = JSON.parse(event.data.param).gadgets
+          if (data.length>0){
+            let jsonstr = 'rn'+this.jsonTo16(event.data.param)
+            console.log(jsonstr)
+            var reqdata = {
+              blob: jsonstr,
+              orgid: this.$login.f.orgid,
+              orgname: this.$login.f.orgname,
+              title: event.data.param.title,
+              sketchId:event.data.param.sketchId
+            }
+            var res = new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata})
+            if (res.data.code === 200) {
+              this.$showMessage('保存成功')
+            } else {
+              this.$showMessage('保存失败')
+            }
+          }
+        });
 
-                // 发送消息到 iframe
-                sketchIframe.onload = () => {
-                    sketchIframe.postMessage(this.inputText, window.location.origin);
-                };
-            }); // 逻辑空着
-        }
+        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+      });
     },
-
+    jsonTo16(jsonStr) {
+      const encoder = new TextEncoder();
+      const arrayBuffer = encoder.encode(jsonStr);
+      const hexCodes = [];
+      const byteArray = new Uint8Array(arrayBuffer);
+      for (let i = 0; i < byteArray.byteLength; i++) {
+        const hex = byteArray[i].toString(16);
+        const paddedHex = hex.padStart(2, '0');
+        hexCodes.push(paddedHex);
+      }
+      return hexCodes.join('');
+    }
+  },
 }
 </script>
 

package/src/components/pc/PaperEdit.vue

@@ -8,22 +8,22 @@
               <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='{}'">
+                       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 '%{}%'">
+                       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 '%{}%'">
+                       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_meternumber"
-                       style="width: 60%" placeholder="客户表号" condition="f_meternumber 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"
@@ -31,7 +31,7 @@
                                    :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>
+                <button class="button_spacing button_search" @click="$parent.$parent.search()">查询</button>
               </div>
             </div>
           </div>
@@ -81,20 +81,20 @@
         </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"></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>
@@ -127,17 +127,23 @@ export default {
         'blod_id': '示意图id',
       },
       showModal: false,
+      rowData:''
     }
   },
   methods: {
-    change() {
+    change(row) {
       this.showModal = true
+      this.rowData = row
+      console.log(this)
     },
     search() {
       this.$refs.paged.$refs.criteria.search()
     },
     cancel() {
       this.showModal = false
+    },
+    selfSearch(args) {
+      this.model.search(args.condition, args.model, args.condValue)
     }
   },