liuyanpeng 2 лет назад
Родитель
Сommit
1c37c41966
5 измененных файлов с 32 добавлено и 44 удалено
  1. 1 1
      package.json
  2. 19 3
      src/client/Login.vue
  3. 1 1
      src/locales/zh-CN.json
  4. 8 36
      src/printer/PrinterConfiguration.vue
  5. 3 3
      src/printer/configData.js

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.35",
+  "version": "4.0.36",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

+ 19 - 3
src/client/Login.vue

@@ -197,14 +197,30 @@
                     </div>
                   </div>
                 </div>
-                <div v-if="showLeanwoText">
-                  <p>{{ $t("lang.login.copyright") }}</p>
-                </div>
               </div>
             </div>
           </section>
         </div>
       </div>
+      <div v-if="showLeanwoText" style="text-align: center">
+        <!-- <p>{{ $t("lang.login.copyright") }}</p> -->
+        <div class="copyright">
+          {{ $t("lang.login.copyright") }}
+          &lt;&lt;&lt;|&gt;&gt;&gt;
+          <a href="https://beian.miit.gov.cn/" target="_blank">沪ICP备11017244号 </a>&nbsp; &nbsp;
+          <a
+            href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011202004082"
+            target="_blank"
+          >沪公网安备 31011202004082号
+          </a>
+          &nbsp; &nbsp;
+          <a
+            href="http://fw.scjgj.sh.gov.cn/lz/licenseLink.do?method=licenceView&amp;entyId=20120314203547743"
+            target="_blank"
+          >工商亮照
+          </a>
+        </div>
+      </div>
     </div>
     <Loading v-if="loading" />
   </div>

+ 1 - 1
src/locales/zh-CN.json

@@ -13,7 +13,7 @@
       "systemManagment": "系统管理",
       "systemConfig": "系统配置",
       "appDownload": "APP下载",
-      "copyright": "©2011 上海联物信息科技有限公司 版权所有.",
+      "copyright": "©2011-现在 上海联物信息科技有限公司. 版权所有.",
       "getVerificationCode": "获取验证码",
       "getVerificationCodeErrorMssage": "用户名或密码不允许为空",
       "verificationCodeCannotBeEmpty": "验证码不允许为空",

+ 8 - 36
src/printer/PrinterConfiguration.vue

@@ -10,6 +10,14 @@
       :data-source="printerDatas"
     >
       <template #bodyCell="{ record, column }">
+        <template v-if="column.key === 'supportRfid'">
+          <span v-if="record.supportRfid === true">
+            是
+          </span>
+          <span v-else>
+            否
+          </span>
+        </template>
         <template v-if="column.key === 'operation'">
           <span>
             <a @click="editPrinter(false, record)">编辑</a>
@@ -83,39 +91,6 @@
               :wrapper-col="{ span: 16 }"
             >
               <a-checkbox v-model:checked="printerState.supportRfid" />
-              <a-checkbox
-                v-if="printerState.supportRfid"
-                v-model:checked="printerState.enableWritePassword"
-                style="margin-left: 40px"
-              >
-                写入密码
-              </a-checkbox>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row v-if="printerState.enableWritePassword" :gutter="24">
-          <a-col :span="11">
-            <a-form-item
-              label="访问密码"
-              :label-col="{ span: 8 }"
-              :wrapper-col="{ span: 16 }"
-            >
-              <a-input
-                v-model:value="printerState.accessPassword"
-                style="width: 220px"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="11">
-            <a-form-item
-              label="杀死密码"
-              :label-col="{ span: 10 }"
-              :wrapper-col="{ span: 16 }"
-            >
-              <a-input
-                v-model:value="printerState.killPassword"
-                style="width: 220px"
-              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -200,9 +175,6 @@ const printerState = ref({
   printerName: '',
   printerType: undefined,
   supportRfid: false,
-  enableWritePassword: false,
-  accessPassword: '',
-  killPassword: '',
   rotateAngel: 0,
   backLength: 0,
   offsetHeight: 0,

+ 3 - 3
src/printer/configData.js

@@ -21,9 +21,9 @@ export const tableColumns =
       width: 150,
     },
     {
-      title: '设备名称',
-      key: 'printerName',
-      dataIndex: 'printerName',
+      title: '是否支持rfid',
+      key: 'supportRfid',
+      dataIndex: 'supportRfid',
       width: 150,
     },
     {